diff options
| author | Jane Liu <janeliulwq@google.com> | 2017-06-09 11:36:37 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-06-09 21:29:11 +0000 |
| commit | 262cf4665df3811ec6e68de48566dfa746609c66 (patch) | |
| tree | 8c157523e77fd6fe4c55cc88024b93be9d33e552 | |
| parent | 59c1ac070d1c8ca70e96805b697c5635ccd70cdf (diff) | |
| download | pdfium-262cf4665df3811ec6e68de48566dfa746609c66.tar.xz | |
Minor changes/addons for annotation APIs
As per Lei's comments while looking back at annotation API CLs to
attempt to fix Bug 747.
Bug=pdfium:737
Change-Id: I96369bf8dcc7afdf49e9a137e7bcba4ff1aeef67
Reviewed-on: https://pdfium-review.googlesource.com/6431
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
| -rw-r--r-- | fpdfsdk/fpdfannot.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/fpdfview_c_api_test.c | 7 | ||||
| -rw-r--r-- | public/fpdf_annot.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/fpdfsdk/fpdfannot.cpp b/fpdfsdk/fpdfannot.cpp index 0c2152a7aa..90927fd396 100644 --- a/fpdfsdk/fpdfannot.cpp +++ b/fpdfsdk/fpdfannot.cpp @@ -359,7 +359,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_SetText(FPDF_ANNOTATION annot, DLLEXPORT unsigned long STDCALL FPDFAnnot_GetText(FPDF_ANNOTATION annot, FPDFANNOT_TEXTTYPE type, - char* buffer, + void* buffer, unsigned long buflen) { CPDF_Dictionary* pAnnotDict = CPDFDictionaryFromFPDFAnnotation(annot); if (!pAnnotDict) diff --git a/fpdfsdk/fpdfview_c_api_test.c b/fpdfsdk/fpdfview_c_api_test.c index 5a65fc4111..ae69d4525b 100644 --- a/fpdfsdk/fpdfview_c_api_test.c +++ b/fpdfsdk/fpdfview_c_api_test.c @@ -35,12 +35,19 @@ fnptr g_c_api_test_fnptr = NULL; // Extern, so can't know it doesn't change. // Function to call from gtest harness to ensure linker resolution. int CheckPDFiumCApi() { //fpdf_annot.h + CHK(FPDFAnnot_IsSupportedSubtype); + CHK(FPDFPage_CreateAnnot); CHK(FPDFPage_GetAnnotCount); CHK(FPDFPage_GetAnnot); CHK(FPDFAnnot_GetSubtype); + CHK(FPDFAnnot_SetColor); CHK(FPDFAnnot_GetColor); + CHK(FPDFAnnot_HasAttachmentPoints); + CHK(FPDFAnnot_SetAttachmentPoints); CHK(FPDFAnnot_GetAttachmentPoints); + CHK(FPDFAnnot_SetRect); CHK(FPDFAnnot_GetRect); + CHK(FPDFAnnot_SetText); CHK(FPDFAnnot_GetText); // fpdf_dataavail.h diff --git a/public/fpdf_annot.h b/public/fpdf_annot.h index 19265d6ddc..adfddec566 100644 --- a/public/fpdf_annot.h +++ b/public/fpdf_annot.h @@ -209,7 +209,7 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFAnnot_SetText(FPDF_ANNOTATION annot, // Returns the length of the contents. DLLEXPORT unsigned long STDCALL FPDFAnnot_GetText(FPDF_ANNOTATION annot, FPDFANNOT_TEXTTYPE type, - char* buffer, + void* buffer, unsigned long buflen); #ifdef __cplusplus |