Tidy public fpdfview.h and fpdf_flatten.h.

public/fpdfview.h

Index: public/fpdfview.h
diff --git a/public/fpdfview.h b/public/fpdfview.h
index 91787dfa2353aac2ef740586b0abd4b65ef65362..597d6e7549de8f835835c86eb84c665b71c1786c 100644
--- a/public/fpdfview.h
+++ b/public/fpdfview.h
@@ -71,8 +71,6 @@ typedef const unsigned short* FPDF_STRING;
 typedef const char* FPDF_STRING;
 #endif
 
-#ifndef _FS_DEF_MATRIX_
-#define _FS_DEF_MATRIX_
 /** @brief Matrix for transformation. */
 typedef struct _FS_MATRIX_
 {
@@ -83,10 +81,7 @@ typedef struct _FS_MATRIX_
     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_
 {
@@ -103,7 +98,6 @@ typedef struct _FS_RECTF_
 }* 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
@@ -114,9 +108,6 @@ typedef const FS_RECTF* FS_LPCRECTF;
 #define STDCALL
 #endif
 
-extern const char g_ExpireDate[];
-extern const char g_ModuleCodes[];
-
 // Exported Functions
 #ifdef __cplusplus
 extern "C" {
@@ -130,10 +121,8 @@ extern "C" {
 //          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:
@@ -157,16 +146,16 @@ DLLEXPORT void STDCALL FPDF_DestroyLibrary();
 //          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.
-* @retval   A handle to the loaded document. If failed, NULL is returned.
-*/
+//

[Lei Zhang, 2015/05/19 19:11:29]

Just delete this line and the last empty comment line?

[Tom Sepez, 2015/05/19 19:40:01]

Done. Also change for consistency.

+// 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.
+// @retval   A handle to the loaded document. If failed, NULL is returned.
+//
 DLLEXPORT FPDF_DOCUMENT STDCALL FPDF_LoadDocument(FPDF_STRING file_path,
     FPDF_BYTESTRING password);
 
@@ -323,7 +312,6 @@ DLLEXPORT double STDCALL FPDF_GetPageHeight(FPDF_PAGE page);
 //
 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.