diff options
Diffstat (limited to 'core/src/fpdfapi')
20 files changed, 30 insertions, 29 deletions
diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp index 914e2bd766..e105402896 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp @@ -6,11 +6,11 @@ #include "cmaps_cns1.h" -#include "../../fpdf_font/font_int.h" -#include "../cmap_int.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(). +#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h" +#include "core/src/fpdfapi/fpdf_font/font_int.h" 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/GB1/cmaps_gb1.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp index 4ddabbf870..949d0a121c 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp @@ -6,11 +6,11 @@ #include "cmaps_gb1.h" -#include "../../fpdf_font/font_int.h" -#include "../cmap_int.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(). +#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h" +#include "core/src/fpdfapi/fpdf_font/font_int.h" 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/Japan1/cmaps_japan1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp index 30c3b3d97c..5978f0c363 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp @@ -6,11 +6,11 @@ #include "cmaps_japan1.h" -#include "../../fpdf_font/font_int.h" -#include "../cmap_int.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(). +#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h" +#include "core/src/fpdfapi/fpdf_font/font_int.h" 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/Korea1/cmaps_korea1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp index d7c5b1b4c5..f6ae70a8dc 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp @@ -6,11 +6,11 @@ #include "cmaps_korea1.h" -#include "../../fpdf_font/font_int.h" -#include "../cmap_int.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(). +#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h" +#include "core/src/fpdfapi/fpdf_font/font_int.h" 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/fpdf_cmaps.cpp b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp index cbae496920..fba3a2b031 100644 --- a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp @@ -6,9 +6,9 @@ #include "cmap_int.h" -#include "../fpdf_font/font_int.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_resource.h" +#include "core/src/fpdfapi/fpdf_font/font_int.h" void FPDFAPI_FindEmbeddedCMap(const char* name, int charset, diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp index 452bf0eaa0..59fa1afb50 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 "../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" +#include "core/src/fpdfapi/fpdf_page/pageint.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_doc.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp index 8944d4eba7..349b007c43 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp @@ -6,9 +6,9 @@ #include <limits.h> -#include "../fpdf_page/pageint.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_page.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" CPDF_Document::CPDF_Document() : CPDF_IndirectObjects(NULL) { m_pRootDict = NULL; diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp index 3ffe482026..33af620dab 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#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" +#include "core/src/fpdfapi/fpdf_page/pageint.h" +#include "core/src/fpdfapi/fpdf_render/render_int.h" CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, FX_DWORD size) { int32_t width; diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index fb0f628147..9f83da062c 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -6,13 +6,17 @@ #include "font_int.h" -#include "../fpdf_page/pageint.h" +#include "core/src/fpdfapi/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" +#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ +#include "core/src/fxge/apple/apple_int.h" +#endif + 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]) == @@ -1049,9 +1053,6 @@ static FX_BOOL FT_UseType1Charmap(FXFT_Face face) { } return TRUE; } -#if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "../../fxge/apple/apple_int.h" -#endif int CPDF_Type1Font::GlyphFromCharCodeExt(FX_DWORD charcode) { if (charcode > 0xff) { return -1; diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 1ecb6a6d12..65b4b781b1 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -6,12 +6,12 @@ #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" +#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h" namespace { diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp index 1e82642c12..2adf9f4e19 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp @@ -6,10 +6,10 @@ #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" +#include "core/src/fpdfapi/fpdf_font/font_int.h" class CPDF_PageModule : public IPDF_PageModule { public: 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 3094e48c0c..5c43b44e76 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp @@ -6,11 +6,11 @@ #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" +#include "core/src/fpdfapi/fpdf_render/render_int.h" void CPDF_GraphicStates::DefaultStates() { m_ColorState.New()->Default(); 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 62da88b9ba..a5a198e7b2 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp @@ -5,10 +5,10 @@ #include <cstring> #include <string> -#include "../../../../testing/fx_string_testhelpers.h" -#include "../../../testing/embedder_test.h" #include "core/include/fpdfapi/fpdf_parser.h" #include "core/include/fxcrt/fx_basic.h" +#include "testing/embedder_test.h" +#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" class FPDFParserDecodeEmbeddertest : public EmbedderTest {}; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 2fa2762906..6e927e1a88 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -10,11 +10,11 @@ #include <utility> #include <vector> -#include "../fpdf_page/pageint.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 "core/src/fpdfapi/fpdf_page/pageint.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/base/stl_util.h" diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp index 78fb3492dc..a2638fe7e1 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp @@ -6,10 +6,10 @@ #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" +#include "core/src/fpdfapi/fpdf_page/pageint.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 e82e45c710..7a28ddc782 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp @@ -6,10 +6,10 @@ #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" +#include "core/src/fpdfapi/fpdf_page/pageint.h" struct CACHEINFO { FX_DWORD time; diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp index 0a45167632..71e847a160 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -6,13 +6,13 @@ #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" +#include "core/src/fpdfapi/fpdf_page/pageint.h" FX_BOOL CPDF_RenderStatus::ProcessImage(CPDF_ImageObject* pImageObj, const CFX_AffineMatrix* pObj2Device) { diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index a7941b4b2d..2cd1f373f8 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -8,13 +8,13 @@ #include <vector> -#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" +#include "core/src/fpdfapi/fpdf_page/pageint.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 4043230003..576c18ebbd 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -6,10 +6,10 @@ #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" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #define SHADING_STEPS 256 static void DrawAxialShading(CFX_DIBitmap* pBitmap, diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp index 4eac73fe62..a714d38615 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -6,10 +6,10 @@ #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" +#include "core/src/fpdfapi/fpdf_page/pageint.h" CPDF_Type3Cache::~CPDF_Type3Cache() { for (const auto& pair : m_SizeMap) { |