From 326a2a78aaf7e0146bfcd283da888c08e34143f8 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 20 Nov 2015 10:47:32 -0800 Subject: Make XFA public more closely match master. There will be significant differences, but these are the minor ones. I removed a comment that doesn't seem to add a lot of value. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1465723002 . --- public/fpdf_dataavail.h | 5 ++--- public/fpdf_doc.h | 12 ------------ public/fpdf_edit.h | 46 --------------------------------------------- public/fpdf_flatten.h | 3 +-- public/fpdf_ppo.h | 4 ---- public/fpdf_progressive.h | 11 ----------- public/fpdf_text.h | 3 --- public/fpdf_transformpage.h | 13 +------------ public/fpdfview.h | 16 +++++----------- 9 files changed, 9 insertions(+), 104 deletions(-) diff --git a/public/fpdf_dataavail.h b/public/fpdf_dataavail.h index 0fadace20d..0f8ff7d6d7 100644 --- a/public/fpdf_dataavail.h +++ b/public/fpdf_dataavail.h @@ -14,9 +14,11 @@ #define PDF_LINEARIZATION_UNKNOWN -1 #define PDF_NOT_LINEARIZED 0 #define PDF_LINEARIZED 1 + #define PDF_DATA_ERROR -1 #define PDF_DATA_NOTAVAIL 0 #define PDF_DATA_AVAIL 1 + #define PDF_FORM_ERROR -1 #define PDF_FORM_NOTAVAIL 0 #define PDF_FORM_AVAIL 1 @@ -72,9 +74,6 @@ typedef void* FPDF_AVAIL; * Comments: * Application must call FPDFAvail_Destroy when done with the * availability provider. -* Notes: -* The method can not support to load a document which consists of -* dynamic XFA fields now. */ DLLEXPORT FPDF_AVAIL STDCALL FPDFAvail_Create(FX_FILEAVAIL* file_avail, FPDF_FILEACCESS* file); diff --git a/public/fpdf_doc.h b/public/fpdf_doc.h index 49793e6b19..de05eb3a59 100644 --- a/public/fpdf_doc.h +++ b/public/fpdf_doc.h @@ -207,10 +207,6 @@ DLLEXPORT unsigned long STDCALL FPDFDest_GetPageIndex(FPDF_DOCUMENT document, // convert coordinates from screen system to page system using // FPDF_DeviceToPage(). // -// Notes: -// The method can not support this feature for the document consists of -// dynamic XFA fields. -// DLLEXPORT FPDF_LINK STDCALL FPDFLink_GetLinkAtPoint(FPDF_PAGE page, double x, double y); @@ -231,11 +227,6 @@ DLLEXPORT FPDF_LINK STDCALL FPDFLink_GetLinkAtPoint(FPDF_PAGE page, // convert coordinates from screen system to page system using // FPDF_DeviceToPage(). // -// Notes: -// The method can not support this feature for the document consists of -// dynamic XFA fields. -// -// DLLEXPORT int STDCALL FPDFLink_GetLinkZOrderAtPoint(FPDF_PAGE page, double x, double y); @@ -275,9 +266,6 @@ DLLEXPORT FPDF_ACTION STDCALL FPDFLink_GetAction(FPDF_LINK link); // linkAnnot[out] - Receive the link handle. // Return value: // TRUE if succceed, else False; -// Notes: -// The method can not support this feature for the document consists of -// dynamic XFA fields. // DLLEXPORT FPDF_BOOL STDCALL FPDFLink_Enumerate(FPDF_PAGE page, int* startPos, diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h index 253f6686d7..64eef263a5 100644 --- a/public/fpdf_edit.h +++ b/public/fpdf_edit.h @@ -40,7 +40,6 @@ extern "C" { // None. // Return value: // A handle to a document. If failed, NULL is returned. -// DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_CreateNewDocument(); ////////////////////////////////////////////////////////////////////// @@ -61,10 +60,6 @@ DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_CreateNewDocument(); // The handle to the page. // Comments: // Loaded page can be deleted by FPDFPage_Delete. -// Notes: -// The method can not support to create a new page for the document -// consists of dynamic XFA fields. -// DLLEXPORT FPDF_PAGE STDCALL FPDFPage_New(FPDF_DOCUMENT document, int page_index, double width, @@ -78,10 +73,6 @@ DLLEXPORT FPDF_PAGE STDCALL FPDFPage_New(FPDF_DOCUMENT document, // page_index - The index of a page. // Return value: // None. -// Notes: -// The method can not support to delete page for the document consists -// of dynamic XFA fields. -// DLLEXPORT void STDCALL FPDFPage_Delete(FPDF_DOCUMENT document, int page_index); // Function: FPDFPage_GetRotation @@ -94,10 +85,6 @@ DLLEXPORT void STDCALL FPDFPage_Delete(FPDF_DOCUMENT document, int page_index); // The PDF page rotation. // Comment: // The PDF page rotation is rotated clockwise. -// Notes: -// The method can not support to get the page rotate for the document -// consists of dynamic XFA fields. -// DLLEXPORT int STDCALL FPDFPage_GetRotation(FPDF_PAGE page); // Function: FPDFPage_SetRotation @@ -111,9 +98,6 @@ DLLEXPORT int STDCALL FPDFPage_GetRotation(FPDF_PAGE page); // None. // Comment: // The PDF page rotation is rotated clockwise. -// Notes: -// The method can not support to set this feature for the document -// consists of dynamic XFA fields. // DLLEXPORT void STDCALL FPDFPage_SetRotation(FPDF_PAGE page, int rotate); @@ -128,10 +112,6 @@ DLLEXPORT void STDCALL FPDFPage_SetRotation(FPDF_PAGE page, int rotate); // FPDFPageObj_NewPathObj. // Return value: // None. -// Notes: -// The method can not support this feature for the document consists of -// dynamic XFA fields. -// DLLEXPORT void STDCALL FPDFPage_InsertObject(FPDF_PAGE page, FPDF_PAGEOBJECT page_obj); @@ -142,10 +122,6 @@ DLLEXPORT void STDCALL FPDFPage_InsertObject(FPDF_PAGE page, // FPDF_LoadPage. // Return value: // The number of the page object. -// Notes: -// The method can not support this feature for the document consists of -// dynamic XFA fields. -// DLLEXPORT int STDCALL FPDFPage_CountObject(FPDF_PAGE page); // Function: FPDFPage_GetObject @@ -156,10 +132,6 @@ DLLEXPORT int STDCALL FPDFPage_CountObject(FPDF_PAGE page); // index - The index of a page object. // Return value: // The handle of the page object. Null for failed. -// Notes: -// The method can not support this feature for the document consists of -// dynamic XFA fields. -// DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPage_GetObject(FPDF_PAGE page, int index); // Function: FPDFPage_HasTransparency @@ -171,10 +143,6 @@ DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPage_GetObject(FPDF_PAGE page, int index); // Return value: // TRUE means that the PDF page does contains transparency. // Otherwise, returns FALSE. -// Notes: -// The method can not support this feature for the document consists of -// dynamic XFA fields. -// DLLEXPORT FPDF_BOOL STDCALL FPDFPage_HasTransparency(FPDF_PAGE page); // Function: FPDFPage_GenerateContent @@ -188,10 +156,6 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_HasTransparency(FPDF_PAGE page); // Before you save the page to a file, or reload the page, you must // call the FPDFPage_GenerateContent function. // Or the changed information will be lost. -// Notes: -// The method can not support this feature for the document consists of -// dynamic XFA fields. -// DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GenerateContent(FPDF_PAGE page); ////////////////////////////////////////////////////////////////////// @@ -244,9 +208,6 @@ DLLEXPORT void STDCALL FPDFPageObj_Transform(FPDF_PAGEOBJECT page_object, // f - The coefficient "f" of the matrix. // Return value: // None. -// Notes: -// The method can not support this feature for the document consists of -// dynamic XFA fields. DLLEXPORT void STDCALL FPDFPage_TransformAnnots(FPDF_PAGE page, double a, double b, @@ -296,9 +257,6 @@ FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document); // shared and cached by the loaded pages, In this case, we need to // clear the cache of image for all the loaded pages. // Pass pages and count to this API to clear the image cache. -// The method can not support this feature for the document consists of -// dynamic XFA fields. -// DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_LoadJpegFile(FPDF_PAGE* pages, int nCount, @@ -337,10 +295,6 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetMatrix(FPDF_PAGEOBJECT image_object, // it to the image object. // Return value: // TRUE if successful, FALSE otherwise. -// Notes; -// The method can not support this feature for the document consists of -// dynamic XFA fields. -// DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetBitmap(FPDF_PAGE* pages, int nCount, FPDF_PAGEOBJECT image_object, diff --git a/public/fpdf_flatten.h b/public/fpdf_flatten.h index 5496846297..af77c29343 100644 --- a/public/fpdf_flatten.h +++ b/public/fpdf_flatten.h @@ -35,8 +35,7 @@ extern "C" { // Comments: // Currently, all failures return FLATTEN_FAIL, with no indication for // the reason -// for the failure. The method does not support flattening any dynamic -// XFA fields. +// for the failure. DLLEXPORT int STDCALL FPDFPage_Flatten(FPDF_PAGE page, int nFlag); #ifdef __cplusplus diff --git a/public/fpdf_ppo.h b/public/fpdf_ppo.h index 9645545bfa..e7d77678f9 100644 --- a/public/fpdf_ppo.h +++ b/public/fpdf_ppo.h @@ -24,10 +24,6 @@ extern "C" { // index - The page index wanted to insert from. // Return value: // TRUE for succeed, FALSE for Failed. -// Notes: -// The method not support this feature for the document consists of -// dynamic XFA fields. -// DLLEXPORT FPDF_BOOL STDCALL FPDF_ImportPages(FPDF_DOCUMENT dest_doc, FPDF_DOCUMENT src_doc, FPDF_BYTESTRING pagerange, diff --git a/public/fpdf_progressive.h b/public/fpdf_progressive.h index 1150349393..f352ff9d00 100644 --- a/public/fpdf_progressive.h +++ b/public/fpdf_progressive.h @@ -72,9 +72,6 @@ typedef struct _IFSDK_PAUSE { // Return value: // Rendering Status. See flags for progressive process status for the // details. -// Notes: -// The method cannot not support to render page which the document -// consists of dynamic XFA fields. // DLLEXPORT int STDCALL FPDF_RenderPageBitmap_Start(FPDF_BITMAP bitmap, FPDF_PAGE page, @@ -98,10 +95,6 @@ DLLEXPORT int STDCALL FPDF_RenderPageBitmap_Start(FPDF_BITMAP bitmap, // Return value: // The rendering status. See flags for progressive process status for // the details. -// Notes: -// The method cannot not support to render page which the document -// consists of dynamic XFA fields. -// DLLEXPORT int STDCALL FPDF_RenderPage_Continue(FPDF_PAGE page, IFSDK_PAUSE* pause); @@ -114,10 +107,6 @@ DLLEXPORT int STDCALL FPDF_RenderPage_Continue(FPDF_PAGE page, // function. // Return value: // NULL -// Notes: -// The method cannot not support to render page which the document -// consists of dynamic XFA fields. -// DLLEXPORT void STDCALL FPDF_RenderPage_Close(FPDF_PAGE page); #ifdef __cplusplus diff --git a/public/fpdf_text.h b/public/fpdf_text.h index df953671b2..32cc131859 100644 --- a/public/fpdf_text.h +++ b/public/fpdf_text.h @@ -25,9 +25,6 @@ extern "C" { // Comments: // Application must call FPDFText_ClosePage to release the text page // information. -// Notes: -// The method can not support to load out FPDF_TEXTPAGE for the -// document consists of dynamic fields. // DLLEXPORT FPDF_TEXTPAGE STDCALL FPDFText_LoadPage(FPDF_PAGE page); diff --git a/public/fpdf_transformpage.h b/public/fpdf_transformpage.h index 21421a18e0..569df2a7e0 100644 --- a/public/fpdf_transformpage.h +++ b/public/fpdf_transformpage.h @@ -24,8 +24,6 @@ typedef void* FPDF_PAGEARCLOADER; * @param[in] right - The right of the rectangle. * @param[in] top - The top of the rectangle. * @retval None. -* @note The method can not support to set this feature for the document which -* consists of dynamic XFA fields. */ DLLEXPORT void STDCALL FPDFPage_SetMediaBox(FPDF_PAGE page, float left, @@ -41,8 +39,6 @@ DLLEXPORT void STDCALL FPDFPage_SetMediaBox(FPDF_PAGE page, * @param[in] right - The right of the rectangle. * @param[in] top - The top of the rectangle. * @retval None. -* @note The method can not support to set this feature for the document which -* consists of dynamic XFA fields. */ DLLEXPORT void STDCALL FPDFPage_SetCropBox(FPDF_PAGE page, float left, @@ -61,8 +57,6 @@ DLLEXPORT void STDCALL FPDFPage_SetCropBox(FPDF_PAGE page, * @param[in] top - Pointer to a double value receiving the top of the * rectangle. * @retval True if success,else fail. -* @note The method can not support to get this feature for the document which -* consists of dynamic XFA fields. */ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GetMediaBox(FPDF_PAGE page, float* left, @@ -81,8 +75,6 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GetMediaBox(FPDF_PAGE page, * @param[in] top - Pointer to a double value receiving the top of the * rectangle. * @retval True if success,else fail. -* @note The method can not support to get this feature for the document which -* consists of dynamic XFA fields. */ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GetCropBox(FPDF_PAGE page, float* left, @@ -99,8 +91,6 @@ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_GetCropBox(FPDF_PAGE page, * @param[in] clipRect - A rectangle page area to be clipped. * @Note. This function will transform the whole page, and would take effect to * all the objects in the page. -* The method can not support to get this feature for the document which -* consists of dynamic XFA fields. */ DLLEXPORT FPDF_BOOL STDCALL FPDFPage_TransFormWithClip(FPDF_PAGE page, FS_MATRIX* matrix, @@ -158,8 +148,7 @@ DLLEXPORT void STDCALL FPDF_DestroyClipPath(FPDF_CLIPPATH clipPath); * @param[in] clipPath - A handle to the clip path. * @Note. A clip path will be inserted before the page content stream or content * array. In this way, the page content will be clipped -* by this clip path. The method can not support this feature for the document -* consists of dynamic XFA fields. +* by this clip path. */ DLLEXPORT void STDCALL FPDFPage_InsertClipPath(FPDF_PAGE page, FPDF_CLIPPATH clipPath); diff --git a/public/fpdfview.h b/public/fpdfview.h index fb514864a2..d5c5a32542 100644 --- a/public/fpdfview.h +++ b/public/fpdfview.h @@ -180,8 +180,8 @@ typedef struct FPDF_LIBRARY_CONFIG_ { // Comments: // You have to call this function before you can call any PDF // processing functions. -DLLEXPORT void STDCALL -FPDF_InitLibraryWithConfig(const FPDF_LIBRARY_CONFIG* config); +DLLEXPORT void STDCALL FPDF_InitLibraryWithConfig( + const FPDF_LIBRARY_CONFIG* config); // Function: FPDF_DestroyLibary // Release all resources allocated by the FPDFSDK library. @@ -222,9 +222,9 @@ DLLEXPORT void STDCALL FPDF_SetSandBoxPolicy(FPDF_DWORD policy, // Loaded document can be closed by FPDF_CloseDocument(). // If this function fails, you can use FPDF_GetLastError() to retrieve // the reason why it failed. -// The application should call ::FPDF_LoadXFA function after PDF -// document loaded -// to support XFA fields in fpdfformfill.h file. +// Notes: +// The application should call FPDF_LoadXFA function after PDF +// document loaded to support XFA fields in fpdfformfill.h file. DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadDocument(FPDF_STRING file_path, FPDF_BYTESTRING password); @@ -529,9 +529,6 @@ DLLEXPORT int STDCALL FPDF_GetPageSizeByIndex(FPDF_DOCUMENT document, // defined above. // Return value: // None. -// Notes: -// FPDF_RenderPage can not be used if the document contains dynamic -// form fields. DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, FPDF_PAGE page, int start_x, @@ -564,9 +561,6 @@ DLLEXPORT void STDCALL FPDF_RenderPage(HDC dc, // defined above. // Return value: // None. -// Notes: -// FPDF_RenderPageBitmap can not be used if the document contains -// dynamic form fields. DLLEXPORT void STDCALL FPDF_RenderPageBitmap(FPDF_BITMAP bitmap, FPDF_PAGE page, int start_x, -- cgit v1.2.3