Merge to XFA: Tidy public fpdfview.h and fpdf_flatten.h.

public/fpdfview.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 // NOTE: External docs refer to this file as "fpdfview.h", so do not rename
 // despite lack of consitency with other public files.
 
 #ifndef PUBLIC_FPDFVIEW_H_
@@ skipping 82 matching lines @@
 //       however, special care needs to be taken if you expect to process Unicode larger than 0xffff.
 // For Linux/Unix programmers: most compiler/library environment uses 4 bytes for a Unicode character,
 //      you have to convert between FPDF_WIDESTRING and system wide string by yourself.
 
 #ifdef _WIN32_WCE
 typedef const unsigned short* FPDF_STRING;
 #else
 typedef const char* FPDF_STRING;
 #endif
 
-#ifndef _FS_DEF_MATRIX_
-#define _FS_DEF_MATRIX_
 /** @brief Matrix for transformation. */
 typedef struct _FS_MATRIX_
 {
     float   a;  /**< @brief Coefficient a.*/
     float   b;  /**< @brief Coefficient b.*/
     float   c;  /**< @brief Coefficient c.*/
     float   d;  /**< @brief Coefficient d.*/
     float   e;  /**< @brief Coefficient e.*/
     float   f;  /**< @brief Coefficient f.*/
 } FS_MATRIX;
-#endif
 
-#ifndef _FS_DEF_RECTF_
-#define _FS_DEF_RECTF_
 /** @brief Rectangle area(float) in device or page coordination system. */
 typedef struct _FS_RECTF_
 {
     /**@{*/
     /** @brief The x-coordinate of the left-top corner. */
     float   left;
     /** @brief The y-coordinate of the left-top corner. */
     float   top;
     /** @brief The x-coordinate of the right-bottom corner. */
     float   right;
     /** @brief The y-coordinate of the right-bottom corner. */
     float   bottom;
     /**@}*/
 }* FS_LPRECTF, FS_RECTF;
 /** @brief Const Pointer to ::FS_RECTF structure.*/
 typedef const FS_RECTF* FS_LPCRECTF;
-#endif
 
 #if defined(_WIN32) && defined(FPDFSDK_EXPORTS)
 // On Windows system, functions are exported in a DLL
 #define DLLEXPORT __declspec( dllexport )
 #define STDCALL __stdcall
 #else
 #define DLLEXPORT
 #define STDCALL
 #endif
 
-extern const char g_ExpireDate[];
-extern const char g_ModuleCodes[];
-
 // Exported Functions
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 // Function: FPDF_InitLibrary
 //          Initialize the FPDFSDK library
 // Parameters:
 //          None
 // Return value:
 //          None.
 // Comments:
 //          You have to call this function before you can call any PDF processing functions.
-
 DLLEXPORT void STDCALL FPDF_InitLibrary();
 
-
 // Function: FPDF_DestroyLibary
 //          Release all resources allocated by the FPDFSDK library.
 // Parameters:
 //          None.
 // Return value:
 //          None.
 // Comments:
 //          You can call this function to release all memory blocks allocated by the library.
 //          After this function called, you should not call any PDF processing functions.
 DLLEXPORT void STDCALL FPDF_DestroyLibrary();
 
 //Policy for accessing the local machine time.
 #define FPDF_POLICY_MACHINETIME_ACCESS  0
 
 // Function: FPDF_SetSandBoxPolicy
 //          Set the policy for the sandbox environment.
 // Parameters:
 //          policy      -   The specified policy for setting, for example:FPDF_POLICY_MACHINETIME_ACCESS.
 //          enable      -   True for enable, False for disable the policy.
 // Return value:
 //          None.
 DLLEXPORT void  STDCALL FPDF_SetSandBoxPolicy(FPDF_DWORD policy, FPDF_BOOL enable);
 
-/**
-* Open and load a PDF document.
-* @param[in] file_path  -   Path to the PDF file (including extension).
-* @param[in] password   -   A string used as the password for PDF file.
-*                           If no password needed, empty or NULL can be used.
-* @note     Loaded document can be closed by FPDF_CloseDocument.
-*           If this function fails, you can use FPDF_GetLastError() to retrieve
-*           the reason why it fails.
-*           The application should call ::FPDF_LoadXFA function after PDF document loaded
-*           to support XFA fields in fpdfformfill.h file.
-*
-* @retval   A handle to the loaded document. If failed, NULL is returned.
-*/
+// Function: FPDF_LoadDocument
+//          Open and load a PDF document.
+// Parameters:
+//          file_path [in] -  Path to the PDF file (including extension).
+//          password [in]  -  A string used as the password for PDF file.
+//                            If no password needed, empty or NULL can be used.
+// Return value:
+//          A handle to the loaded document, or NULL on failure.
+// Comments:
+//          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.
 DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadDocument(FPDF_STRING file_path,
     FPDF_BYTESTRING password);
 
 // Function: FPDF_LoadMemDocument
 //          Open and load a PDF document from memory.
 // Parameters:
 //          data_buf    -   Pointer to a buffer containing the PDF document.
 //          size        -   Number of bytes in the PDF document.
 //          password    -   A string used as the password for PDF file.
 //                          If no password needed, empty or NULL can be used.
@@ skipping 218 matching lines @@
 // Parameters:
 //          document    -   Handle to document. Returned by FPDF_LoadDocument function.
 //          page_index  -   Page index, zero for the first page.
 //          width       -   Pointer to a double value receiving the page width (in points).
 //          height      -   Pointer to a double value receiving the page height (in points).
 // Return value:
 //          Non-zero for success. 0 for error (document or page not found).
 //
 DLLEXPORT int STDCALL FPDF_GetPageSizeByIndex(FPDF_DOCUMENT document, int page_index, double* width, double* height);
 
-
 // Page rendering flags. They can be combined with bit OR.
 #define FPDF_ANNOT          0x01        // Set if annotations are to be rendered.
 #define FPDF_LCD_TEXT       0x02        // Set if using text rendering optimized for LCD display.
 #define FPDF_NO_NATIVETEXT  0x04        // Don't use the native text output available on some platforms
 #define FPDF_GRAYSCALE      0x08        // Grayscale output.
 #define FPDF_DEBUG_INFO     0x80        // Set if you want to get some debug info.
                                         // Please discuss with Foxit first if you need to collect debug info.
 #define FPDF_NO_CATCH       0x100       // Set if you don't want to catch exception.
 #define FPDF_RENDER_LIMITEDIMAGECACHE   0x200   // Limit image cache size.
 #define FPDF_RENDER_FORCEHALFTONE       0x400   // Always use halftone for image stretching.
@@ skipping 313 matching lines @@
 
 // Function: FPDF_BStr_Clear
 //          Helper function to clear a byte string.
 DLLEXPORT FPDF_RESULT STDCALL FPDF_BStr_Clear(FPDF_BSTR* str);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  // PUBLIC_FPDFVIEW_H_