diff options
Diffstat (limited to 'core/src')
53 files changed, 267 insertions, 150 deletions
diff --git a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h b/core/src/fpdfapi/fpdf_cmaps/cmap_int.h index c7dcfc9bf1..1d3ed144e6 100644 --- a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h +++ b/core/src/fpdfapi/fpdf_cmaps/cmap_int.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPDFAPI_CMAP_INT_H_ -#define _FPDFAPI_CMAP_INT_H_ +#ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ +#define CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ + struct FXCMAP_CMap { typedef enum { None, Single, Range, Reverse } MapType; const char* m_Name; @@ -17,4 +18,5 @@ struct FXCMAP_CMap { int m_DWordCount; int m_UseOffset; }; -#endif + +#endif // CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ diff --git a/core/src/fpdfapi/fpdf_edit/editint.h b/core/src/fpdfapi/fpdf_edit/editint.h index 73b28e3735..faa23f929d 100644 --- a/core/src/fpdfapi/fpdf_edit/editint.h +++ b/core/src/fpdfapi/fpdf_edit/editint.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPDF_EDITINT_ -#define _FPDF_EDITINT_ +#ifndef CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_ +#define CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_ + class CPDF_ObjectStream { public: @@ -56,4 +57,5 @@ protected: CPDF_ObjectStream m_ObjStream; CFX_ByteTextBuf m_Buffer; }; -#endif + +#endif // CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_ diff --git a/core/src/fpdfapi/fpdf_font/common.h b/core/src/fpdfapi/fpdf_font/common.h index 4b37a44ccc..923a394662 100644 --- a/core/src/fpdfapi/fpdf_font/common.h +++ b/core/src/fpdfapi/fpdf_font/common.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef COMMON_H -#define COMMON_H +#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_ +#define CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_ + typedef signed char TT_int8_t; typedef unsigned char TT_uint8_t; typedef signed short TT_int16_t; @@ -14,4 +15,5 @@ typedef FX_INT32 TT_int32_t; typedef FX_DWORD TT_uint32_t; typedef FX_INT64 TT_int64_t; typedef FX_UINT64 TT_uint64_t; -#endif + +#endif // CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_ diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h index 56454286df..697ccffafd 100644 --- a/core/src/fpdfapi/fpdf_font/font_int.h +++ b/core/src/fpdfapi/fpdf_font/font_int.h @@ -3,6 +3,8 @@ // found in the LICENSE file. // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_ +#define CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_ typedef void* FXFT_Library; class CPDF_CMapManager @@ -170,3 +172,5 @@ public: CPDF_FontCharMap(CPDF_Font* pFont); CPDF_Font* m_pFont; }; + +#endif // CORE_SRC_FPDFAPI_FPDF_FONT_FONT_INT_H_ diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h index d231c13ca2..adfff6756a 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h @@ -4,11 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef TTGSUBTable_H -#define TTGSUBTable_H +#ifndef CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_ +#define CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_ + #include "../../../include/fxge/fx_freetype.h" #include "../../../include/fxcrt/fx_basic.h" #include "common.h" + class CFX_GlyphMap { public: @@ -420,5 +422,5 @@ public: private: ~CFX_GSUBTable() { } }; -#endif +#endif // CORE_SRC_FPDFAPI_FPDF_FONT_TTGSUBTABLE_H_ diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 93f34e51a2..7c527150b3 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PAGEINT_H_ -#define _PAGEINT_H_ +#ifndef CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_ +#define CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_ #include "../../../include/fpdfapi/fpdf_pageobj.h" + #define PARSE_STEP_LIMIT 100 #define STREAM_PARSE_BUFSIZE 20480 class CPDF_QuickFontCache; @@ -465,4 +466,4 @@ protected: CFX_MapByteStringToPtr m_NamingCache; }; -#endif // _PAGEINT_H_ +#endif // CORE_SRC_FPDFAPI_FPDF_PAGE_PAGEINT_H_ diff --git a/core/src/fpdfapi/fpdf_parser/filters_int.h b/core/src/fpdfapi/fpdf_parser/filters_int.h index d1dedc482c..1139371fda 100644 --- a/core/src/fpdfapi/fpdf_parser/filters_int.h +++ b/core/src/fpdfapi/fpdf_parser/filters_int.h @@ -4,6 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_FILTERS_INT_H_ +#define CORE_SRC_FPDFAPI_FPDF_PARSER_FILTERS_INT_H_ + class CPDF_DecryptFilter : public CFX_DataFilter { public: @@ -117,3 +120,5 @@ public: CFX_BinaryBuf& dest_buf); FX_BOOL ReadLine(FX_LPCBYTE src_buf, int bitsize, int& bitpos); }; + +#endif // CORE_SRC_FPDFAPI_FPDF_PARSER_FILTERS_INT_H_ diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index 086a1c24b2..cf2074f5bd 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPDF_PAGEOBJ_H_ +#ifndef CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_ +#define CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_ + #include "../../../include/fpdfapi/fpdf_pageobj.h" -#endif + class CPDF_QuickStretcher; #define TYPE3_MAX_BLUES 16 class CPDF_Type3Glyphs @@ -465,3 +467,5 @@ struct _CPDF_UniqueKeyGen { FX_CHAR m_Key[128]; int m_KeyLen; }; + +#endif // CORE_SRC_FPDFAPI_FPDF_RENDER_RENDER_INT_H_ diff --git a/core/src/fpdfdoc/pdf_vt.h b/core/src/fpdfdoc/pdf_vt.h index f910dfd372..9c38ffc00c 100644 --- a/core/src/fpdfdoc/pdf_vt.h +++ b/core/src/fpdfdoc/pdf_vt.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PDF_VT_H_ -#define _PDF_VT_H_ +#ifndef CORE_SRC_FPDFDOC_PDF_VT_H_ +#define CORE_SRC_FPDFDOC_PDF_VT_H_ class CPVT_Size; class CPVT_FloatRect; @@ -640,4 +640,4 @@ private: CPDF_VariableText * m_pVT; }; -#endif // _PDF_VT_H_ +#endif // CORE_SRC_FPDFDOC_PDF_VT_H_ diff --git a/core/src/fpdfdoc/tagged_int.h b/core/src/fpdfdoc/tagged_int.h index 7efd682887..75004e51fa 100644 --- a/core/src/fpdfdoc/tagged_int.h +++ b/core/src/fpdfdoc/tagged_int.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPDF_TAGGED_INT_H_ -#define _FPDF_TAGGED_INT_H_ +#ifndef CORE_SRC_FPDFDOC_TAGGED_INT_H_ +#define CORE_SRC_FPDFDOC_TAGGED_INT_H_ #include "../../include/fpdfdoc/fpdf_tagged.h" @@ -91,4 +91,5 @@ protected: friend class CPDF_StructTreeImpl; }; -#endif + +#endif // CORE_SRC_FPDFDOC_TAGGED_INT_H_ diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index d0a434300b..59dcd329b3 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PDF_TEXT_INT_H_ -#define _PDF_TEXT_INT_H_ +#ifndef CORE_SRC_FPDFTEXT_TEXT_INT_H_ +#define CORE_SRC_FPDFTEXT_TEXT_INT_H_ + class CPDF_TextParseOptions { public: @@ -212,4 +213,5 @@ private: FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_LPWSTR pDst); void NormalizeString(CFX_WideString& str); void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest); -#endif + +#endif // CORE_SRC_FPDFTEXT_TEXT_INT_H_ diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h index abbe105305..e1e6bf7099 100644 --- a/core/src/fpdftext/txtproc.h +++ b/core/src/fpdftext/txtproc.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _PDF_TXTPROC_H_ -#define _PDF_TXTPROC_H_ +#ifndef CORE_SRC_FPDFTEXT_TXTPROC_H_ +#define CORE_SRC_FPDFTEXT_TXTPROC_H_ + class CTextColumn { public: @@ -67,4 +68,5 @@ private: CTextColumn* FindColumn(FX_FLOAT xpos); void BreakSpace(CPDF_TextObject* pTextObj); }; -#endif + +#endif // CORE_SRC_FPDFTEXT_TXTPROC_H_ diff --git a/core/src/fx_jpeglib.h b/core/src/fx_jpeglib.h index 028a5ee8b9..b098008e6c 100644 --- a/core/src/fx_jpeglib.h +++ b/core/src/fx_jpeglib.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_SRC_JPEGLIB_H_ -#define _FX_SRC_JPEGLIB_H_ -#include "./fxcodec/libjpeg/jpeglib.h" -#endif +#ifndef CORE_SRC_FX_JPEGLIB_H_ +#define CORE_SRC_FX_JPEGLIB_H_ + +#include "fxcodec/libjpeg/jpeglib.h" + +#endif // CORE_SRC_FX_JPEGLIB_H_ diff --git a/core/src/fx_zlib.h b/core/src/fx_zlib.h index cc5560bf05..8ce27748a2 100644 --- a/core/src/fx_zlib.h +++ b/core/src/fx_zlib.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_SRC_ZLIB_H_ -#define _FX_SRC_ZLIB_H_ -#include "./fxcodec/fx_zlib/zlib_v128/zlib.h" -#endif +#ifndef CORE_SRC_FX_ZLIB_H_ +#define CORE_SRC_FX_ZLIB_H_ + +#include "fxcodec/fx_zlib/zlib_v128/zlib.h" + +#endif // CORE_SRC_FX_ZLIB_H_ diff --git a/core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h b/core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h index da480f22a0..5725a57e75 100644 --- a/core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h +++ b/core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h @@ -4,10 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_OPENJPEG_H_ -#define _FX_OPENJPEG_H_ +#ifndef CORE_SRC_FXCODEC_FX_LIBOPENJPEG_INCLUDE_FX_OPENJPEG_H_ +#define CORE_SRC_FXCODEC_FX_LIBOPENJPEG_INCLUDE_FX_OPENJPEG_H_ + #ifdef _MSC_VER #define _CRT_SECURE_NO_WARNINGS #endif + #include "../libopenjpeg20/openjpeg.h" -#endif + +#endif // CORE_SRC_FXCODEC_FX_LIBOPENJPEG_INCLUDE_FX_OPENJPEG_H_ diff --git a/core/src/fxcodec/fx_zlib/include/fx_zlib.h b/core/src/fxcodec/fx_zlib/include/fx_zlib.h index 955481ce7b..54a674db44 100644 --- a/core/src/fxcodec/fx_zlib/include/fx_zlib.h +++ b/core/src/fxcodec/fx_zlib/include/fx_zlib.h @@ -4,7 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#ifndef CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_ +#define CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_ + #ifdef _MSC_VER #define _CRT_SECURE_NO_WARNINGS #endif #include "../zlib_v128/zlib.h" + +#endif // CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_ diff --git a/core/src/fxcodec/lcms2/include/fx_lcms2.h b/core/src/fxcodec/lcms2/include/fx_lcms2.h index e6413188d8..ca1ed2a2b2 100644 --- a/core/src/fxcodec/lcms2/include/fx_lcms2.h +++ b/core/src/fxcodec/lcms2/include/fx_lcms2.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_LCMS2_H_ -#define _FX_LCMS2_H_ +#ifndef CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_ +#define CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_ + #include "../lcms2-2.6/include/lcms2.h" -#endif + +#endif // CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_ diff --git a/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h b/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h index 4ab5775718..92fd8a6362 100644 --- a/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h +++ b/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_LCMS2_H_ -#define _FX_LCMS2_H_ +#ifndef CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_ +#define CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_ + #include "../lcms2-2.6/include/lcms2_plugin.h" -#endif + +#endif // CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_ diff --git a/core/src/fxcrt/extension.h b/core/src/fxcrt/extension.h index 115b15b674..8d02e329ad 100644 --- a/core/src/fxcrt/extension.h +++ b/core/src/fxcrt/extension.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXCRT_EXTENSION_IMP_ -#define _FXCRT_EXTENSION_IMP_ +#ifndef CORE_SRC_FXCRT_EXTENSION_H_ +#define CORE_SRC_FXCRT_EXTENSION_H_ #include "fx_safe_types.h" @@ -474,4 +474,5 @@ FX_BOOL FX_GenerateCryptoRandom(FX_LPDWORD pBuffer, FX_INT32 iCount); #ifdef __cplusplus } #endif -#endif + +#endif // CORE_SRC_FXCRT_EXTENSION_H_ diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h index eb05801849..cf221301f2 100644 --- a/core/src/fxcrt/fx_arabic.h +++ b/core/src/fxcrt/fx_arabic.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_ARABIC_IMP -#define _FX_ARABIC_IMP +#ifndef CORE_SRC_FXCRT_FX_ARABIC_H_ +#define CORE_SRC_FXCRT_FX_ARABIC_H_ + typedef struct _FX_ARABICCHARRANGE { FX_WCHAR wStart; FX_WCHAR wEnd; @@ -206,4 +207,5 @@ private: FX_INT32 m_iLastStart; FX_INT32 m_iLastCount; }; -#endif + +#endif // CORE_SRC_FXCRT_FX_ARABIC_H_ diff --git a/core/src/fxcrt/fx_safe_types.h b/core/src/fxcrt/fx_safe_types.h index 5772fd0e3c..35a906cf27 100644 --- a/core/src/fxcrt/fx_safe_types.h +++ b/core/src/fxcrt/fx_safe_types.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef FX_SAFE_TYPES_H_ -#define FX_SAFE_TYPES_H_ +#ifndef CORE_SRC_FXCRT_FX_SAFE_TYPES_H_ +#define CORE_SRC_FXCRT_FX_SAFE_TYPES_H_ #include <stdlib.h> // For size_t. @@ -14,4 +14,4 @@ typedef pdfium::base::CheckedNumeric<FX_INT32> FX_SAFE_INT32; typedef pdfium::base::CheckedNumeric<size_t> FX_SAFE_SIZE_T; typedef pdfium::base::CheckedNumeric<FX_FILESIZE> FX_SAFE_FILESIZE; -#endif // FX_SAFE_TYPES_H_ +#endif // CORE_SRC_FXCRT_FX_SAFE_TYPES_H_ diff --git a/core/src/fxcrt/fxcrt_platforms.h b/core/src/fxcrt/fxcrt_platforms.h index dbfa58be1a..be51724352 100644 --- a/core/src/fxcrt/fxcrt_platforms.h +++ b/core/src/fxcrt/fxcrt_platforms.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXCRT_PLATFORMS_ -#define _FXCRT_PLATFORMS_ +#ifndef CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_ +#define CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_ + #include "extension.h" + #if _FX_OS_ == _FX_ANDROID_ void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString &bsMode); void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_WideString &wsMode); @@ -32,4 +34,5 @@ protected: FXSYS_FILE* m_hFile; }; #endif -#endif + +#endif // CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_ diff --git a/core/src/fxcrt/fxcrt_posix.h b/core/src/fxcrt/fxcrt_posix.h index 89162cd037..8c716cd6d6 100644 --- a/core/src/fxcrt/fxcrt_posix.h +++ b/core/src/fxcrt/fxcrt_posix.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXCRT_LINUX_ -#define _FXCRT_LINUX_ +#ifndef CORE_SRC_FXCRT_FXCRT_POSIX_H_ +#define CORE_SRC_FXCRT_FXCRT_POSIX_H_ + #include "extension.h" + #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || _FXM_PLATFORM_ == _FXM_PLATFORM_ANDROID_ class CFXCRT_FileAccess_Posix : public IFXCRT_FileAccess { @@ -30,4 +32,5 @@ protected: FX_INT32 m_nFD; }; #endif -#endif + +#endif // CORE_SRC_FXCRT_FXCRT_POSIX_H_ diff --git a/core/src/fxcrt/fxcrt_windows.h b/core/src/fxcrt/fxcrt_windows.h index 92646b2757..1919f3e4d7 100644 --- a/core/src/fxcrt/fxcrt_windows.h +++ b/core/src/fxcrt/fxcrt_windows.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXCRT_WINDOWS_ -#define _FXCRT_WINDOWS_ +#ifndef CORE_SRC_FXCRT_FXCRT_WINDOWS_H_ +#define CORE_SRC_FXCRT_FXCRT_WINDOWS_H_ + #include "extension.h" + #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess { @@ -30,4 +32,5 @@ protected: FX_LPVOID m_hFile; }; #endif -#endif + +#endif // CORE_SRC_FXCRT_FXCRT_WINDOWS_H_ diff --git a/core/src/fxcrt/plex.h b/core/src/fxcrt/plex.h index f8f01948e5..a4ac4f7c48 100644 --- a/core/src/fxcrt/plex.h +++ b/core/src/fxcrt/plex.h @@ -3,6 +3,8 @@ // found in the LICENSE file. // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#ifndef CORE_SRC_FXCRT_PLEX_H_ +#define CORE_SRC_FXCRT_PLEX_H_ struct CFX_Plex { CFX_Plex* pNext; @@ -13,3 +15,5 @@ struct CFX_Plex { static CFX_Plex* Create(CFX_Plex*& head, FX_DWORD nMax, FX_DWORD cbElement); void FreeDataChain(); }; + +#endif // CORE_SRC_FXCRT_PLEX_H_ diff --git a/core/src/fxcrt/xml_int.h b/core/src/fxcrt/xml_int.h index f0a2485163..7cfeec95f7 100644 --- a/core/src/fxcrt/xml_int.h +++ b/core/src/fxcrt/xml_int.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXCRT_XML_INT_ -#define _FXCRT_XML_INT_ +#ifndef CORE_SRC_FXCRT_XML_INT_H_ +#define CORE_SRC_FXCRT_XML_INT_H_ + class CXML_DataBufAcc : public IFX_BufferRead { public: @@ -158,4 +159,5 @@ public: void InsertCDATASegment(CFX_UTF8Decoder& decoder, CXML_Element* pElement); }; void FX_XML_SplitQualifiedName(FX_BSTR bsFullName, CFX_ByteStringC &bsSpace, CFX_ByteStringC &bsName); -#endif + +#endif // CORE_SRC_FXCRT_XML_INT_H_ diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h index c87fc246be..f4b9368eff 100644 --- a/core/src/fxge/agg/include/fx_agg_driver.h +++ b/core/src/fxge/agg/include/fx_agg_driver.h @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_AGG_DEVICE_DRIVER_ -#define _FX_AGG_DEVICE_DRIVER_ +#ifndef FX_AGG_DRIVER_H_ +#define FX_AGG_DRIVER_H_ + #include "fxfx_agg_path_storage.h" #include "fxfx_agg_rasterizer_scanline_aa.h" + class CAgg_PathData { public: @@ -118,4 +120,5 @@ public: CFX_DIBitmap* m_pOriDevice; FX_BOOL m_bGroupKnockout; }; -#endif + +#endif // FX_AGG_DRIVER_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_basics.h b/core/src/fxge/agg/include/fxfx_agg_basics.h index 57fbd2ebb9..e27a843bba 100644 --- a/core/src/fxge/agg/include/fxfx_agg_basics.h +++ b/core/src/fxge/agg/include/fxfx_agg_basics.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_BASICS_H_ -#define _FXFX_AGG_BASICS_H_ +#ifndef FXFX_AGG_BASICS_H_ +#define FXFX_AGG_BASICS_H_ + #include "../agg23/agg_basics.h" -#endif + +#endif // FXFX_AGG_BASICS_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h b/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h index 948b619355..2b64bf900a 100644 --- a/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h +++ b/core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_CLIP_LIANG_BARSKY_H_ -#define _FXFX_AGG_CLIP_LIANG_BARSKY_H_ +#ifndef FXFX_AGG_CLIP_LIANG_BARSKY_H_ +#define FXFX_AGG_CLIP_LIANG_BARSKY_H_ + #include "../agg23/agg_clip_liang_barsky.h" -#endif + +#endif // FXFX_AGG_CLIP_LIANG_BARSKY_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_conv_dash.h b/core/src/fxge/agg/include/fxfx_agg_conv_dash.h index 5f80a06e19..fb1e42dae9 100644 --- a/core/src/fxge/agg/include/fxfx_agg_conv_dash.h +++ b/core/src/fxge/agg/include/fxfx_agg_conv_dash.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_CONV_DASH_H_ -#define _FXFX_AGG_CONV_DASH_H_ +#ifndef FXFX_AGG_CONV_DASH_H_ +#define FXFX_AGG_CONV_DASH_H_ + #include "../agg23/agg_conv_dash.h" -#endif + +#endif // FXFX_AGG_CONV_DASH_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h b/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h index de38386ea2..531df5012e 100644 --- a/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h +++ b/core/src/fxge/agg/include/fxfx_agg_conv_stroke.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_CONV_STROKE_H_ -#define _FXFX_AGG_CONV_STROKE_H_ +#ifndef FXFX_AGG_CONV_STROKE_H_ +#define FXFX_AGG_CONV_STROKE_H_ + #include "../agg23/agg_conv_stroke.h" -#endif + +#endif // FXFX_AGG_CONV_STROKE_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_curves.h b/core/src/fxge/agg/include/fxfx_agg_curves.h index 54efaa2b26..1879958eca 100644 --- a/core/src/fxge/agg/include/fxfx_agg_curves.h +++ b/core/src/fxge/agg/include/fxfx_agg_curves.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_CURVERS_H_ -#define _FXFX_AGG_CURVERS_H_ +#ifndef FXFX_AGG_CURVES_H_ +#define FXFX_AGG_CURVES_H_ + #include "../agg23/agg_curves.h" -#endif + +#endif // FXFX_AGG_CURVES_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_path_storage.h b/core/src/fxge/agg/include/fxfx_agg_path_storage.h index 9168eb26a8..ab7a85bca5 100644 --- a/core/src/fxge/agg/include/fxfx_agg_path_storage.h +++ b/core/src/fxge/agg/include/fxfx_agg_path_storage.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_PATH_STORAGE_H_ -#define _FXFX_AGG_PATH_STORAGE_H_ +#ifndef FXFX_AGG_PATH_STORAGE_H_ +#define FXFX_AGG_PATH_STORAGE_H_ + #include "../agg23/agg_path_storage.h" -#endif + +#endif // FXFX_AGG_PATH_STORAGE_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h b/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h index 3f61cec51a..a445298f81 100644 --- a/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h +++ b/core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ -#define _FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ +#ifndef FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ +#define FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ + #include "../agg23/agg_rasterizer_scanline_aa.h" -#endif + +#endif // FXFX_AGG_RASTERIZER_SCANLINE_AA_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h b/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h index 11d8cbb0a8..1775dabe3e 100644 --- a/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h +++ b/core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_RENDER_SCANLINE_H_ -#define _FXFX_AGG_RENDER_SCANLINE_H_ +#ifndef FXFX_AGG_RENDER_SCANLINE_H_ +#define FXFX_AGG_RENDER_SCANLINE_H_ + #include "../agg23/agg_renderer_scanline.h" -#endif + +#endif // FXFX_AGG_RENDER_SCANLINE_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h b/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h index eb6886e8de..0eb48b84c0 100644 --- a/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h +++ b/core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_RENDERING_BUFFER_H_ -#define _FXFX_AGG_RENDERING_BUFFER_H_ +#ifndef FXFX_AGG_RENDERING_BUFFER_H_ +#define FXFX_AGG_RENDERING_BUFFER_H_ + #include "../agg23/agg_rendering_buffer.h" -#endif + +#endif // FXFX_AGG_RENDERING_BUFFER_H_ diff --git a/core/src/fxge/agg/include/fxfx_agg_scanline_u.h b/core/src/fxge/agg/include/fxfx_agg_scanline_u.h index cc7d2e7f75..c850f621a3 100644 --- a/core/src/fxge/agg/include/fxfx_agg_scanline_u.h +++ b/core/src/fxge/agg/include/fxfx_agg_scanline_u.h @@ -4,7 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FXFX_AGG_SCANLINE_U_H_ -#define _FXFX_AGG_SCANLINE_U_H_ +#ifndef FXFX_AGG_SCANLINE_U_H_ +#define FXFX_AGG_SCANLINE_U_H_ + #include "../agg23/agg_scanline_u.h" -#endif + +#endif // FXFX_AGG_SCANLINE_U_H_ diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h index 4285e13554..135c830c95 100644 --- a/core/src/fxge/android/fpf_skiafont.h +++ b/core/src/fxge/android/fpf_skiafont.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPF_SKIA_FONT_H_ -#define _FPF_SKIA_FONT_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_ +#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_ + #if _FX_OS_ == _FX_ANDROID_ class CFPF_SkiaFontDescriptor; class CFPF_SkiaFontMgr; @@ -54,4 +55,5 @@ protected: FX_DWORD m_dwRefCount; }; #endif -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONT_H_ diff --git a/core/src/fxge/android/fpf_skiafontmgr.h b/core/src/fxge/android/fpf_skiafontmgr.h index 1ec4a1d678..3c072fa186 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.h +++ b/core/src/fxge/android/fpf_skiafontmgr.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPF_SKIA_FONTMGR_H_ -#define _FPF_SKIA_FONTMGR_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ +#define CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ + #if _FX_OS_ == _FX_ANDROID_ #define FPF_SKIAFONTTYPE_Unknown 0 #define FPF_SKIAFONTTYPE_Path 1 @@ -114,4 +115,5 @@ protected: CFX_MapPtrToPtr m_FamilyFonts; }; #endif -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FPF_SKIAFONTMGR_H_ diff --git a/core/src/fxge/android/fpf_skiamodule.h b/core/src/fxge/android/fpf_skiamodule.h index 7f5375172a..f97aa95d23 100644 --- a/core/src/fxge/android/fpf_skiamodule.h +++ b/core/src/fxge/android/fpf_skiamodule.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FPF_MODULE_H_ -#define _FPF_MODULE_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_ +#define CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_ + #if _FX_OS_ == _FX_ANDROID_ class CFPF_SkiaFontMgr; class CFPF_SkiaDeviceModule : public IFPF_DeviceModule @@ -19,4 +20,5 @@ protected: CFPF_SkiaFontMgr *m_pFontMgr; }; #endif -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FPF_SKIAMODULE_H_ diff --git a/core/src/fxge/android/fx_android_font.h b/core/src/fxge/android/fx_android_font.h index b6bfdf9396..fb7ff7cd92 100644 --- a/core/src/fxge/android/fx_android_font.h +++ b/core/src/fxge/android/fx_android_font.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_ANDROID_FONT_H_ -#define _FX_ANDROID_FONT_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_ +#define CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_ + #if _FX_OS_ == _FX_ANDROID_ class IFPF_FontMgr; class CFX_AndroidFontInfo : public IFX_SystemFontInfo @@ -33,4 +34,5 @@ protected: IFPF_FontMgr *m_pFontMgr; }; #endif -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FX_ANDROID_FONT_H_ diff --git a/core/src/fxge/android/fx_fpf.h b/core/src/fxge/android/fx_fpf.h index 1108fffed4..beef3c7233 100644 --- a/core/src/fxge/android/fx_fpf.h +++ b/core/src/fxge/android/fx_fpf.h @@ -4,11 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_FPF_H_ -#define _FX_FPF_H_ +#ifndef CORE_SRC_FXGE_ANDROID_FX_FPF_H_ +#define CORE_SRC_FXGE_ANDROID_FX_FPF_H_ + #include "../../../include/fxcrt/fx_ext.h" -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxge/fx_freetype.h" #include "../../../include/fxge/fpf.h" +#include "../../../include/fxge/fx_freetype.h" +#include "../../../include/fxge/fx_ge.h" #include "fx_android_font.h" -#endif + +#endif // CORE_SRC_FXGE_ANDROID_FX_FPF_H_ diff --git a/core/src/fxge/apple/apple_int.h b/core/src/fxge/apple/apple_int.h index 6d8260c60f..5b083d83eb 100644 --- a/core/src/fxge/apple/apple_int.h +++ b/core/src/fxge/apple/apple_int.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _APPLE_INT_H_ -#define _APPLE_INT_H_ +#ifndef CORE_SRC_FXGE_APPLE_APPLE_INT_H_ +#define CORE_SRC_FXGE_APPLE_APPLE_INT_H_ + #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #if _FX_OS_ == _FX_MACOSX_ #include <Carbon/Carbon.h> @@ -243,4 +244,5 @@ FX_DWORD FX_IOSGetMatchFamilyNameHashcode(FX_LPCSTR pFontName); FX_UINT32 FX_IOSGetFamilyNamesCount(); FX_LPCSTR FX_IOSGetFamilyName( FX_UINT32 uIndex); #endif -#endif + +#endif // CORE_SRC_FXGE_APPLE_APPLE_INT_H_ diff --git a/core/src/fxge/dib/dib_int.h b/core/src/fxge/dib/dib_int.h index 844c3566ce..c82a0378b8 100644 --- a/core/src/fxge/dib/dib_int.h +++ b/core/src/fxge/dib/dib_int.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _DIB_INT_H_ -#define _DIB_INT_H_ +#ifndef CORE_SRC_FXGE_DIB_DIB_INT_H_ +#define CORE_SRC_FXGE_DIB_DIB_INT_H_ class CPDF_FixedMatrix { @@ -90,4 +90,4 @@ public: int m_State; }; -#endif // _DIB_INT_H_ +#endif // CORE_SRC_FXGE_DIB_DIB_INT_H_ diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h index 7f30b9c802..c08b3e0630 100644 --- a/core/src/fxge/ge/text_int.h +++ b/core/src/fxge/ge/text_int.h @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _TEXT_INT_H_ -#define _TEXT_INT_H_ +#ifndef CORE_SRC_FXGE_GE_TEXT_INT_H_ +#define CORE_SRC_FXGE_GE_TEXT_INT_H_ struct _CFX_UniqueKeyGen { void Generate(int count, ...); @@ -121,4 +121,5 @@ private: CFX_Font* m_pFont;
FX_DWORD m_nEncodingID;
};
-#endif // _TEXT_INT_H_ + +#endif // CORE_SRC_FXGE_GE_TEXT_INT_H_ diff --git a/core/src/fxge/skia/fx_skia_blitter_new.h b/core/src/fxge/skia/fx_skia_blitter_new.h index 84fe89dce6..1193e64c1c 100644 --- a/core/src/fxge/skia/fx_skia_blitter_new.h +++ b/core/src/fxge/skia/fx_skia_blitter_new.h @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef _FX_SKIABLITTER_H_ -#define _FX_SKIABLITTER_H_ -//#define _SKIA_SUPPORT_ +#ifndef CORE_SRC_FXGE_SKIA_FX_SKIA_BLITTER_NEW_H_ +#define CORE_SRC_FXGE_SKIA_FX_SKIA_BLITTER_NEW_H_ + #if defined(_SKIA_SUPPORT_) class CFX_SkiaRenderer : public SkBlitter { @@ -226,4 +226,5 @@ public: int m_dstHeight; }; #endif -#endif + +#endif // CORE_SRC_FXGE_SKIA_FX_SKIA_BLITTER_NEW_H_ diff --git a/core/src/fxge/skia/fx_skia_device.h b/core/src/fxge/skia/fx_skia_device.h index e92af2269e..7ae019c124 100644 --- a/core/src/fxge/skia/fx_skia_device.h +++ b/core/src/fxge/skia/fx_skia_device.h @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef _FX_SKIA_DEVICE_DRIVER_ -#define _FX_SKIA_DEVICE_DRIVER_ -//#define _SKIA_SUPPORT_ +#ifndef CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_ +#define CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_ + #if defined(_SKIA_SUPPORT_) class CFX_SkiaDeviceDriver : public IFX_RenderDeviceDriver { @@ -86,5 +86,6 @@ public: CFX_AggDeviceDriver* m_pAggDriver; }; -#endif -#endif// _FX_SKIA_DEVICE_DRIVER_
\ No newline at end of file +#endif // defined(_SKIA_SUPPORT_) + +#endif // CORE_SRC_FXGE_SKIA_FX_SKIA_DEVICE_H_ diff --git a/core/src/fxge/win32/dwrite_int.h b/core/src/fxge/win32/dwrite_int.h index 2eecc7c76b..d95f115fbc 100644 --- a/core/src/fxge/win32/dwrite_int.h +++ b/core/src/fxge/win32/dwrite_int.h @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _FX_DIRECT_WRITE_ -#define _FX_DIRECT_WRITE_ +#ifndef CORE_SRC_FXGE_WIN32_DWRITE_INT_H_ +#define CORE_SRC_FXGE_WIN32_DWRITE_INT_H_ + #ifndef DECLSPEC_UUID #if (_MSC_VER >= 1100) && defined (__cplusplus) #define DECLSPEC_UUID(x) __declspec(uuid(x)) @@ -56,4 +57,5 @@ protected: void* m_pDwFontContext; void* m_pDwTextRenderer; }; -#endif + +#endif // CORE_SRC_FXGE_WIN32_DWRITE_INT_H_ diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h index bc3eb878d9..7c5c0720b1 100644 --- a/core/src/fxge/win32/win32_int.h +++ b/core/src/fxge/win32/win32_int.h @@ -3,6 +3,8 @@ // found in the LICENSE file. // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#ifndef CORE_SRC_FXGE_WIN32_WIN32_INT_H_ +#define CORE_SRC_FXGE_WIN32_WIN32_INT_H_ struct WINDIB_Open_Args_; class CGdiplusExt @@ -236,3 +238,5 @@ protected: CFX_PSRenderer m_PSRenderer; }; void _Color2Argb(FX_ARGB& argb, FX_DWORD color, int alpha_flag, void* pIccTransform); + +#endif // CORE_SRC_FXGE_WIN32_WIN32_INT_H_ diff --git a/core/src/reflow/autoreflow.h b/core/src/reflow/autoreflow.h index 6a137e9ae2..95aebcfcdc 100644 --- a/core/src/reflow/autoreflow.h +++ b/core/src/reflow/autoreflow.h @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _AUTOREFLOW_H -#define _AUTOREFLOW_H +#ifndef CORE_SRC_REFLOW_AUTOREFLOW_H_ +#define CORE_SRC_REFLOW_AUTOREFLOW_H_ + #include "../../include/reflow/reflowengine.h" #include "reflowedpage.h" + class CPDF_AutoReflowElement; class CPDF_AutoReflowLayoutProvider; typedef CFX_ArrayTemplate<CPDF_AutoReflowElement*> CAR_ElmPtrArray; @@ -119,4 +121,5 @@ public: CFX_PtrArray m_cellArray; int m_Step; }; -#endif + +#endif // CORE_SRC_REFLOW_AUTOREFLOW_H_ diff --git a/core/src/reflow/layoutprovider_taggedpdf.h b/core/src/reflow/layoutprovider_taggedpdf.h index b573c3e5bf..3e11f17067 100644 --- a/core/src/reflow/layoutprovider_taggedpdf.h +++ b/core/src/reflow/layoutprovider_taggedpdf.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef LayoutProvider_TaggedPDF_H -#define LayoutProvider_TaggedPDF_H +#ifndef CORE_SRC_REFLOW_LAYOUTPROVIDER_TAGGEDPDF_H_ +#define CORE_SRC_REFLOW_LAYOUTPROVIDER_TAGGEDPDF_H_ + #include "../../include/reflow/reflowengine.h" + class CPDF_LayoutElement : public IPDF_LayoutElement { public: @@ -79,4 +81,5 @@ protected: CPDF_StructTree* m_pPageTree; int m_TopElementIndex; }; -#endif + +#endif // CORE_SRC_REFLOW_LAYOUTPROVIDER_TAGGEDPDF_H_ diff --git a/core/src/reflow/reflowedpage.h b/core/src/reflow/reflowedpage.h index 5ca7a8d947..3fef553d7a 100644 --- a/core/src/reflow/reflowedpage.h +++ b/core/src/reflow/reflowedpage.h @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _REFLOWED_PAGE_H -#define _REFLOWED_PAGE_H +#ifndef CORE_SRC_REFLOW_REFLOWEDPAGE_H_ +#define CORE_SRC_REFLOW_REFLOWEDPAGE_H_ + #include "../../include/reflow/reflowengine.h" + #define GET_SIGNED(a) ( (a)>0 ? a/a : (a==0 ? 0 : -a/a) ) class CRF_Data; class CRF_LineData; @@ -368,4 +370,5 @@ public: FX_ARGB m_stroke_argb; int m_fill_mode; }; -#endif + +#endif // CORE_SRC_REFLOW_REFLOWEDPAGE_H_ diff --git a/core/src/reflow/reflowedtextpage.h b/core/src/reflow/reflowedtextpage.h index 397428d178..288ceed48b 100644 --- a/core/src/reflow/reflowedtextpage.h +++ b/core/src/reflow/reflowedtextpage.h @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef _REFLOWED_TEXT_PAGE_H -#define _REFLOWED_TEXT_PAGE_H +#ifndef CORE_SRC_REFLOW_REFLOWEDTEXTPAGE_H_ +#define CORE_SRC_REFLOW_REFLOWEDTEXTPAGE_H_ + #include "../../include/reflow/reflowengine.h" #include "../../src/reflow/reflowedpage.h" + typedef CFX_SegmentedArray<CRF_CharData*> CRF_CharDataPtrArray; typedef CFX_SegmentedArray<FX_INT32> CFX_CountBSINT32Array; class CRF_TextPage : public IPDF_TextPage @@ -68,4 +70,5 @@ private: CFX_RectArray m_rectArray; CFX_CountBSINT32Array* m_CountBSArray; }; -#endif + +#endif // CORE_SRC_REFLOW_REFLOWEDTEXTPAGE_H_ |