diff options
Diffstat (limited to 'core/src/fpdfapi')
52 files changed, 212 insertions, 148 deletions
diff --git a/core/src/fpdfapi/fpdf_basic_module.cpp b/core/src/fpdfapi/fpdf_basic_module.cpp index 37ad62f402..a2a7e09a57 100644 --- a/core/src/fpdfapi/fpdf_basic_module.cpp +++ b/core/src/fpdfapi/fpdf_basic_module.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcodec/fx_codec.h" -#include "../../include/fpdfapi/fpdf_module.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fpdfapi/fpdf_module.h" namespace { diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp index 94617a4ab9..914e2bd766 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../include/fpdfapi/fpdf_resource.h" -#include "../../../../include/fpdfapi/fpdf_module.h" -#include "../../../../include/fxcrt/fx_basic.h" // For FX_ArraySize(). +#include "cmaps_cns1.h" + #include "../../fpdf_font/font_int.h" #include "../cmap_int.h" -#include "cmaps_cns1.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize(). static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = { {"B5pc-H", FXCMAP_CMap::Range, g_FXCMAP_B5pc_H_0, 247, FXCMAP_CMap::None, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h index 93cfd2d10d..8edd85c633 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_ #define CORE_SRC_FPDFAPI_FPDF_CMAPS_CNS1_CMAPS_CNS1_H_ -#include "../../../../include/fxcrt/fx_system.h" // For FX_WORD. +#include "core/include/fxcrt/fx_system.h" // For FX_WORD. extern const FX_WORD g_FXCMAP_B5pc_H_0[]; extern const FX_WORD g_FXCMAP_B5pc_V_0[]; diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp index bf79ced6e6..4ddabbf870 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../include/fpdfapi/fpdf_resource.h" -#include "../../../../include/fpdfapi/fpdf_module.h" -#include "../../../../include/fxcrt/fx_basic.h" // For FX_ArraySize(). +#include "cmaps_gb1.h" + #include "../../fpdf_font/font_int.h" #include "../cmap_int.h" -#include "cmaps_gb1.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize(). static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = { {"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h index c74ed71b06..beae68d382 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_ #define CORE_SRC_FPDFAPI_FPDF_CMAPS_GB1_CMAPS_GB1_H_ -#include "../../../../include/fxcrt/fx_system.h" // For FX_WORD. +#include "core/include/fxcrt/fx_system.h" // For FX_WORD. extern const FX_WORD g_FXCMAP_GB_EUC_H_0[]; extern const FX_WORD g_FXCMAP_GB_EUC_V_0[]; diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp index 1c788dc27a..30c3b3d97c 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../include/fpdfapi/fpdf_resource.h" -#include "../../../../include/fpdfapi/fpdf_module.h" -#include "../../../../include/fxcrt/fx_basic.h" // For FX_ArraySize(). +#include "cmaps_japan1.h" + #include "../../fpdf_font/font_int.h" #include "../cmap_int.h" -#include "cmaps_japan1.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize(). static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = { {"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h index f45f104edf..471dd36065 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_ #define CORE_SRC_FPDFAPI_FPDF_CMAPS_JAPAN1_CMAPS_JAPAN1_H_ -#include "../../../../include/fxcrt/fx_system.h" // For FX_WORD. +#include "core/include/fxcrt/fx_system.h" // For FX_WORD. extern const FX_WORD g_FXCMAP_83pv_RKSJ_H_1[]; extern const FX_WORD g_FXCMAP_90ms_RKSJ_H_2[]; diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp index 17435941d1..d7c5b1b4c5 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../include/fpdfapi/fpdf_resource.h" -#include "../../../../include/fpdfapi/fpdf_module.h" -#include "../../../../include/fxcrt/fx_basic.h" // For FX_ArraySize(). +#include "cmaps_korea1.h" + #include "../../fpdf_font/font_int.h" #include "../cmap_int.h" -#include "cmaps_korea1.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize(). static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = { {"KSC-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_KSC_EUC_H_0, 467, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h index 853e695343..646a9b9cf1 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_ #define CORE_SRC_FPDFAPI_FPDF_CMAPS_KOREA1_CMAPS_KOREA1_H_ -#include "../../../../include/fxcrt/fx_system.h" // For FX_WORD. +#include "core/include/fxcrt/fx_system.h" // For FX_WORD. extern const FX_WORD g_FXCMAP_KSC_EUC_H_0[]; extern const FX_WORD g_FXCMAP_KSC_EUC_V_0[]; diff --git a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h b/core/src/fpdfapi/fpdf_cmaps/cmap_int.h index 7d51cee4cf..a486ac3d4a 100644 --- a/core/src/fpdfapi/fpdf_cmaps/cmap_int.h +++ b/core/src/fpdfapi/fpdf_cmaps/cmap_int.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ #define CORE_SRC_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ -#include "../../../include/fxcrt/fx_system.h" // For FX_WORD. +#include "core/include/fxcrt/fx_system.h" // For FX_WORD. struct FXCMAP_CMap { enum MapType { None, Single, Range, Reverse }; diff --git a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp index 252a4d6e4f..cbae496920 100644 --- a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_resource.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../fpdf_font/font_int.h" #include "cmap_int.h" +#include "../fpdf_font/font_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_resource.h" + void FPDFAPI_FindEmbeddedCMap(const char* name, int charset, int coding, diff --git a/core/src/fpdfapi/fpdf_edit/editint.h b/core/src/fpdfapi/fpdf_edit/editint.h index 445ea83967..e80fdd3e64 100644 --- a/core/src/fpdfapi/fpdf_edit/editint.h +++ b/core/src/fpdfapi/fpdf_edit/editint.h @@ -7,6 +7,13 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_ #define CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_ +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_stream.h" +#include "core/include/fxcrt/fx_system.h" + +class CPDF_Creator; +class CPDF_Object; + class CPDF_ObjectStream { public: CPDF_ObjectStream(); diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp index 383284e6f9..452bf0eaa0 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_serial.h" -#include "../../../include/fpdfapi/fpdf_module.h" #include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_serial.h" CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& ar, CFX_AffineMatrix& matrix) { ar << matrix.a << " " << matrix.b << " " << matrix.c << " " << matrix.d << " " diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp index fec4e4f8e1..88cdf2c5dc 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcrt/fx_ext.h" -#include "../../../include/fpdfapi/fpdf_serial.h" -#include "../../../include/fpdfapi/fpdf_parser.h" #include "editint.h" +#include "core/include/fxcrt/fx_ext.h" +#include "core/include/fpdfapi/fpdf_serial.h" +#include "core/include/fpdfapi/fpdf_parser.h" + #define PDF_OBJECTSTREAM_MAXLENGTH (256 * 1024) #define PDF_XREFSTREAM_MAXSIZE 10000 diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp index 9c1c292fb7..8944d4eba7 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../fpdf_page/pageint.h" #include <limits.h> + +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" + CPDF_Document::CPDF_Document() : CPDF_IndirectObjects(NULL) { m_pRootDict = NULL; m_pInfoDict = NULL; diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp index 1dd0ae6170..2ec5727444 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fpdfapi/fpdf_render.h" #include "../fpdf_page/pageint.h" #include "../fpdf_render/render_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxcodec/fx_codec.h" + CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, FX_DWORD size) { int32_t width; int32_t height; diff --git a/core/src/fpdfapi/fpdf_font/common.h b/core/src/fpdfapi/fpdf_font/common.h index 38fe396c00..2888bc455e 100644 --- a/core/src/fpdfapi/fpdf_font/common.h +++ b/core/src/fpdfapi/fpdf_font/common.h @@ -7,6 +7,8 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_ #define CORE_SRC_FPDFAPI_FPDF_FONT_COMMON_H_ +#include "core/include/fxcrt/fx_system.h" + typedef signed char TT_int8_t; typedef unsigned char TT_uint8_t; typedef signed short TT_int16_t; diff --git a/core/src/fpdfapi/fpdf_font/font_int.h b/core/src/fpdfapi/fpdf_font/font_int.h index c7a00dccc9..5418ffd2c9 100644 --- a/core/src/fpdfapi/fpdf_font/font_int.h +++ b/core/src/fpdfapi/fpdf_font/font_int.h @@ -9,8 +9,8 @@ #include <map> -#include "../../../include/fxcrt/fx_basic.h" -#include "../../../include/fpdfapi/fpdf_resource.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxcrt/fx_basic.h" class CPDF_CID2UnicodeMap; class CPDF_CMap; diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index 07f9dda653..fb0f628147 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -4,14 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_resource.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../fpdf_page/pageint.h" #include "font_int.h" +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxge/fx_freetype.h" + FX_BOOL FT_UseTTCharmap(FXFT_Face face, int platform_id, int encoding_id) { for (int i = 0; i < FXFT_Get_Face_CharmapCount(face); i++) { if (FXFT_Get_Charmap_PlatformID(FXFT_Get_Face_Charmaps(face)[i]) == diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp index 92d1719efe..f6d1e2ab92 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fpdfapi/fpdf_resource.h" -#include "../../../include/fxge/fx_freetype.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxge/fx_freetype.h" static const struct _UnicodeAlt { FX_WORD m_Unicode; diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 43125d717a..bf67aab3e0 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -4,14 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_resource.h" -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_cmaps/cmap_int.h" #include "font_int.h" +#include "../fpdf_cmaps/cmap_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_resource.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" + namespace { const FX_CHAR* const g_CharsetNames[CIDSET_NUM_SETS] = diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp index 1ee25995c2..0087bfad56 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_freetype.h" -#include "../../../include/fxge/fx_ge.h" -#include "third_party/base/nonstd_unique_ptr.h" #include "ttgsubtable.h" +#include "core/include/fxge/fx_freetype.h" +#include "core/include/fxge/fx_ge.h" +#include "third_party/base/nonstd_unique_ptr.h" + CFX_GlyphMap::CFX_GlyphMap() {} CFX_GlyphMap::~CFX_GlyphMap() {} extern "C" { diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.h b/core/src/fpdfapi/fpdf_font/ttgsubtable.h index 5cf0e2413f..dee7a08857 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.h @@ -7,9 +7,12 @@ #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 <map> + #include "common.h" +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxge/fx_font.h" +#include "core/include/fxge/fx_freetype.h" class CFX_GlyphMap { public: diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp index 162acfa898..eaa8ef1127 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" #include "pageint.h" + +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" + CPDF_PageObject* CPDF_PageObject::Create(int type) { switch (type) { case PDFPAGE_TEXT: diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index e4bb1a3d10..934d102564 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -4,12 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fxcodec/fx_codec.h" #include "pageint.h" + #include <limits.h> +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fxcodec/fx_codec.h" + namespace { void sRGB_to_AdobeCMYK(FX_FLOAT R, diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp index 8656b72023..1e82642c12 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fdrm/fx_crypt.h" -#include "../fpdf_font/font_int.h" #include "pageint.h" +#include "../fpdf_font/font_int.h" +#include "core/include/fdrm/fx_crypt.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" + class CPDF_PageModule : public IPDF_PageModule { public: CPDF_PageModule() diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp index 0b9f043eb2..81d31a7eae 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp @@ -4,13 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "pageint.h" + #include <limits.h> + #include <vector> -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fxcrt/fx_safe_types.h" -#include "pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fxcrt/fx_safe_types.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/base/numerics/safe_conversions_impl.h" diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp index 78d3d26188..3094e48c0c 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp @@ -4,13 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../fpdf_render/render_int.h" #include "pageint.h" +#include "../fpdf_render/render_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" + void CPDF_GraphicStates::DefaultStates() { m_ColorState.New()->Default(); } diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp index 06e2d2c187..9c16173a6f 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp @@ -4,9 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" #include "pageint.h" + +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" + CPDF_ImageObject::CPDF_ImageObject() { m_pImage = NULL; m_Type = PDFPAGE_IMAGE; diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp index e095414ffe..163b6e9d53 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_serial.h" #include "pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_serial.h" + #define REQUIRE_PARAMS(count) \ if (m_ParamCount != count) { \ return; \ diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index 9adfdb21a4..0c48b5a137 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -4,12 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fxcodec/fx_codec.h" #include "pageint.h" + #include <limits.h> +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fxcodec/fx_codec.h" + namespace { const char kPathOperatorSubpath = 'm'; diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp index 81b69bcb24..0880388541 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_module.h" #include "pageint.h" + +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" + void CPDF_PathObject::CopyData(const CPDF_PageObject* pSrc) { const CPDF_PathObject* pSrcObj = (const CPDF_PathObject*)pSrc; m_Path = pSrcObj->m_Path; diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp index b669b3b5d2..0c6b476db2 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" #include "pageint.h" +#include "core/include/fpdfapi/fpdf_page.h" + namespace { const int kSingleCoordinatePair = 1; diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index 3b2aef55af..96c70c2245 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -9,8 +9,8 @@ #include <map> -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" #include "third_party/base/nonstd_unique_ptr.h" class CPDF_AllStates; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp index e68fcb6800..ff0519c9b5 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp @@ -5,9 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include <limits.h> -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fxcodec/fx_codec.h" + +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxcodec/fx_codec.h" #define _STREAM_MAX_SIZE_ 20 * 1024 * 1024 diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp index bcade63831..279151a87a 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp @@ -6,9 +6,9 @@ #include <string> #include "../../../../testing/fx_string_testhelpers.h" -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fxcrt/fx_basic.h" #include "../../../testing/embedder_test.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxcrt/fx_basic.h" #include "testing/gtest/include/gtest/gtest.h" class FPDFParserDecodeEmbeddertest : public EmbedderTest {}; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp index f01e21293c..95d7c84ace 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "core/include/fpdfapi/fpdf_parser.h" #include "testing/gtest/include/gtest/gtest.h" -#include "../../../include/fpdfapi/fpdf_parser.h" - TEST(fpdf_parser_decode, HexDecode) { { // Empty src string. diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp index 3b77fb275b..2e38837137 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_parser.h" CPDF_Document::CPDF_Document(CPDF_Parser* pParser) : CPDF_IndirectObjects(pParser) { diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp index 125b7e0bf5..363864e588 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp @@ -4,9 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "core/include/fpdfapi/fpdf_parser.h" + #include <time.h> -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fdrm/fx_crypt.h" + +#include "core/include/fdrm/fx_crypt.h" + const uint8_t defpasscode[32] = { 0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, 0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08, 0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68, diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp index c766dd397f..d22711c6e4 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_serial.h" +#include "core/include/fpdfapi/fpdf_serial.h" + CFDF_Document::CFDF_Document() : CPDF_IndirectObjects(NULL) { m_pRootDict = NULL; m_pFile = NULL; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index cfd76aef40..c36e1466a2 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fxcrt/fx_string.h" +#include "core/include/fpdfapi/fpdf_parser.h" + +#include "core/include/fxcrt/fx_string.h" // static int CPDF_Object::s_nCurRefDepth = 0; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 96f15ecb9d..2fa2762906 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -4,16 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "parser_int.h" + #include <set> #include <utility> #include <vector> -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fxcrt/fx_safe_types.h" #include "../fpdf_page/pageint.h" -#include "parser_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxcrt/fx_safe_types.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/base/stl_util.h" diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp index b86c20e9da..8e953a6ee3 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxcrt/fx_stream.h" #include "testing/gtest/include/gtest/gtest.h" - -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fxcrt/fx_stream.h" #include "testing/utils/path_service.h" class CPDF_TestParser : public CPDF_Parser { diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp index 335101e85b..89a5deb62d 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_parser.h" +#include "core/include/fpdfapi/fpdf_parser.h" // Indexed by 8-bit character code, contains either: // 'W' - for whitespace: NUL, TAB, CR, LF, FF, 0x80, 0xff diff --git a/core/src/fpdfapi/fpdf_parser/parser_int.h b/core/src/fpdfapi/fpdf_parser/parser_int.h index 5e4dffa8b7..fba6663238 100644 --- a/core/src/fpdfapi/fpdf_parser/parser_int.h +++ b/core/src/fpdfapi/fpdf_parser/parser_int.h @@ -7,7 +7,14 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_PARSER_INT_H_ #define CORE_SRC_FPDFAPI_FPDF_PARSER_PARSER_INT_H_ +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_stream.h" + +class CFX_BitStream; class CPDF_DataAvail; +class CPDF_Dictionary; +class CPDF_Stream; +class IFX_DownloadHints; class CPDF_HintTables { public: @@ -17,6 +24,7 @@ class CPDF_HintTables { m_nFirstPageSharedObjs(0), m_szFirstPageObjOffset(0) {} ~CPDF_HintTables(); + FX_BOOL GetPagePos(int index, FX_FILESIZE& szPageStartPos, FX_FILESIZE& szPageLength, @@ -44,4 +52,5 @@ class CPDF_HintTables { CFX_FileSizeArray m_szPageOffsetArray; CFX_FileSizeArray m_szSharedObjOffsetArray; }; + #endif // CORE_SRC_FPDFAPI_FPDF_PARSER_PARSER_INT_H_ diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp index 7b37b1b9bd..e5b4b66721 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxge/fx_ge.h" + CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc) : m_pPDFDoc(pPDFDoc), m_pFontCache(new CFX_FontCache) {} diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp index 8da176e040..e82e45c710 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp @@ -4,11 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" + +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxge/fx_ge.h" + struct CACHEINFO { FX_DWORD time; CPDF_Stream* pStream; diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp index 0acaeba14c..b51520aa84 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -4,15 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxcrt/fx_safe_types.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxcrt/fx_safe_types.h" +#include "core/include/fxge/fx_ge.h" + FX_BOOL CPDF_RenderStatus::ProcessImage(CPDF_ImageObject* pImageObj, const CFX_AffineMatrix* pObj2Device) { CPDF_ImageRenderer render; diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index ea8ceee9d3..1cce90a243 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -4,16 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "render_int.h" + #include <vector> -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxcrt/fx_safe_types.h" -#include "../../../include/fxge/fx_ge.h" #include "../fpdf_page/pageint.h" -#include "render_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxcrt/fx_safe_types.h" +#include "core/include/fxge/fx_ge.h" #include "third_party/base/nonstd_unique_ptr.h" namespace { diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp index 467ffc900c..4043230003 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -4,11 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../../../include/fxge/fx_ge.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" + +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxge/fx_ge.h" + #define SHADING_STEPS 256 static void DrawAxialShading(CFX_DIBitmap* pBitmap, CFX_AffineMatrix* pObject2Bitmap, diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp index c8d86e072d..4eac73fe62 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fpdfapi/fpdf_render.h" -#include "../../../include/fpdfapi/fpdf_pageobj.h" -#include "../fpdf_page/pageint.h" #include "render_int.h" +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxge/fx_ge.h" + CPDF_Type3Cache::~CPDF_Type3Cache() { for (const auto& pair : m_SizeMap) { delete pair.second; diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index a0eda2858e..ed44c26d41 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -9,10 +9,12 @@ #include <map> -#include "../../../include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_pageobj.h" +#include "core/include/fpdfapi/fpdf_render.h" #include "third_party/base/nonstd_unique_ptr.h" class CFX_GlyphBitmap; +class CPDF_ImageCache; class CPDF_QuickStretcher; #define TYPE3_MAX_BLUES 16 |