diff options
140 files changed, 320 insertions, 322 deletions
diff --git a/core/include/fdrm/fx_crypt.h b/core/include/fdrm/fx_crypt.h index e3b21c5175..259dc85477 100644 --- a/core/include/fdrm/fx_crypt.h +++ b/core/include/fdrm/fx_crypt.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FDRM_FX_CRYPT_H_ #define CORE_INCLUDE_FDRM_FX_CRYPT_H_ -#include "../fxcrt/fx_system.h" +#include "core/include/fxcrt/fx_system.h" #ifdef __cplusplus extern "C" { diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h index e9c38306b7..5e99753d74 100644 --- a/core/include/fpdfapi/fpdf_module.h +++ b/core/include/fpdfapi/fpdf_module.h @@ -7,8 +7,8 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_ -#include "../fxcrt/fx_coordinates.h" -#include "../fxcrt/fx_system.h" +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" #include "third_party/base/nonstd_unique_ptr.h" class CCodec_ModuleMgr; diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h index b754ab2b2b..f910cc188e 100644 --- a/core/include/fpdfapi/fpdf_objects.h +++ b/core/include/fpdfapi/fpdf_objects.h @@ -7,8 +7,8 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_OBJECTS_H_ -#include "../fxcrt/fx_coordinates.h" -#include "../fxcrt/fx_system.h" +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_system.h" class CPDF_Array; class CPDF_Boolean; diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h index 5f716b2c2e..27e40f4486 100644 --- a/core/include/fpdfapi/fpdf_page.h +++ b/core/include/fpdfapi/fpdf_page.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_PAGE_H_ -#include "../fxge/fx_dib.h" +#include "core/include/fxge/fx_dib.h" #include "fpdf_parser.h" #include "fpdf_resource.h" diff --git a/core/include/fpdfapi/fpdf_pageobj.h b/core/include/fpdfapi/fpdf_pageobj.h index a3695f7e7b..886930ffe7 100644 --- a/core/include/fpdfapi/fpdf_pageobj.h +++ b/core/include/fpdfapi/fpdf_pageobj.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_PAGEOBJ_H_ -#include "../fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" #include "fpdf_resource.h" class CPDF_ClipPath; diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index d6f0506fc4..1ce43532f3 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ -#include "../fxcrt/fx_system.h" +#include "core/include/fxcrt/fx_system.h" #include "fpdf_objects.h" #include "public/fpdf_dataavail.h" #include "third_party/base/nonstd_unique_ptr.h" diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h index 02aaba62b2..06f5dbef11 100644 --- a/core/include/fpdfapi/fpdf_render.h +++ b/core/include/fpdfapi/fpdf_render.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_ -#include "../fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" #include "fpdf_page.h" #include "third_party/base/nonstd_unique_ptr.h" diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h index 233f07c57a..ccecce83eb 100644 --- a/core/include/fpdfapi/fpdf_resource.h +++ b/core/include/fpdfapi/fpdf_resource.h @@ -9,8 +9,8 @@ #include <map> -#include "../fxcrt/fx_system.h" -#include "../fxge/fx_font.h" +#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxge/fx_font.h" #include "fpdf_parser.h" class CFX_CTTGSUBTable; diff --git a/core/include/fpdfapi/fpdfapi.h b/core/include/fpdfapi/fpdfapi.h index c2938a5dc4..c4a62d3aea 100644 --- a/core/include/fpdfapi/fpdfapi.h +++ b/core/include/fpdfapi/fpdfapi.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDFAPI_H_ #define CORE_INCLUDE_FPDFAPI_FPDFAPI_H_ -#include "../fxge/fx_ge.h" +#include "core/include/fxge/fx_ge.h" #include "fpdf_module.h" #include "fpdf_pageobj.h" #include "fpdf_render.h" diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h index 305834e96a..6d0478c23f 100644 --- a/core/include/fpdfdoc/fpdf_ap.h +++ b/core/include/fpdfdoc/fpdf_ap.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FPDFDOC_FPDF_AP_H_ #define CORE_INCLUDE_FPDFDOC_FPDF_AP_H_ -#include "../fpdfapi/fpdf_parser.h" +#include "core/include/fpdfapi/fpdf_parser.h" #include "fpdf_vt.h" class IPVT_FontMap { diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index 01750d82d6..478d6fbbdd 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -10,8 +10,8 @@ #include <map> #include <vector> -#include "../fpdfapi/fpdf_parser.h" -#include "../fpdfapi/fpdf_render.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fpdfapi/fpdf_render.h" #include "third_party/base/nonstd_unique_ptr.h" class CFieldTree; diff --git a/core/include/fpdfdoc/fpdf_vt.h b/core/include/fpdfdoc/fpdf_vt.h index 141b3c6a1c..91a93884e8 100644 --- a/core/include/fpdfdoc/fpdf_vt.h +++ b/core/include/fpdfdoc/fpdf_vt.h @@ -7,8 +7,8 @@ #ifndef CORE_INCLUDE_FPDFDOC_FPDF_VT_H_ #define CORE_INCLUDE_FPDFDOC_FPDF_VT_H_ -#include "../fpdfapi/fpdf_parser.h" -#include "../fxge/fx_dib.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxge/fx_dib.h" class IPDF_VariableText; class IPDF_VariableText_Iterator; diff --git a/core/include/fpdftext/fpdf_text.h b/core/include/fpdftext/fpdf_text.h index 006499218e..1671861fbb 100644 --- a/core/include/fpdftext/fpdf_text.h +++ b/core/include/fpdftext/fpdf_text.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_ #define CORE_INCLUDE_FPDFTEXT_FPDF_TEXT_H_ -#include "../fpdfapi/fpdf_parser.h" +#include "core/include/fpdfapi/fpdf_parser.h" class CPDF_Page; class CPDF_PageObjects; diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index 68628fd016..54ea64544a 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -10,7 +10,7 @@ #include <map> #include <vector> -#include "../fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" #include "fx_codec_def.h" #include "third_party/base/nonstd_unique_ptr.h" diff --git a/core/include/fxge/fpf.h b/core/include/fxge/fpf.h index e65fae0bbd..11e2bf1e40 100644 --- a/core/include/fxge/fpf.h +++ b/core/include/fxge/fpf.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FXGE_FPF_H_ #define CORE_INCLUDE_FXGE_FPF_H_ -#include "../fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_coordinates.h" class IFPF_FontMgr; diff --git a/core/include/fxge/fx_dib.h b/core/include/fxge/fx_dib.h index e22ab58065..e57b3c9a83 100644 --- a/core/include/fxge/fx_dib.h +++ b/core/include/fxge/fx_dib.h @@ -7,8 +7,8 @@ #ifndef CORE_INCLUDE_FXGE_FX_DIB_H_ #define CORE_INCLUDE_FXGE_FX_DIB_H_ -#include "../fxcrt/fx_basic.h" -#include "../fxcrt/fx_coordinates.h" +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_coordinates.h" enum FXDIB_Format { FXDIB_Invalid = 0, diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 4d81ac4b50..42b0e902c6 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -9,7 +9,7 @@ #include <map> -#include "../fxcrt/fx_system.h" +#include "core/include/fxcrt/fx_system.h" #include "fx_dib.h" #include "third_party/base/nonstd_unique_ptr.h" 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 132b1d146c..543f8f6323 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) { diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index 43d9f4cabc..eeaac886dd 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -11,8 +11,8 @@ #include <list> #include <map> -#include "../jbig2/JBig2_Context.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/src/fxcodec/jbig2/JBig2_Context.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. diff --git a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp index 8c4a5b2705..fe552d2ed1 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp @@ -7,8 +7,8 @@ #include <limits> #include "codec_int.h" +#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" -#include "../../../testing/fx_string_testhelpers.h" static const OPJ_OFF_T kSkipError = static_cast<OPJ_OFF_T>(-1); static const OPJ_SIZE_T kReadError = static_cast<OPJ_SIZE_T>(-1); diff --git a/core/src/fxcrt/fx_basic_bstring_unittest.cpp b/core/src/fxcrt/fx_basic_bstring_unittest.cpp index f56e89f664..614206bb60 100644 --- a/core/src/fxcrt/fx_basic_bstring_unittest.cpp +++ b/core/src/fxcrt/fx_basic_bstring_unittest.cpp @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../../testing/fx_string_testhelpers.h" #include "core/include/fxcrt/fx_string.h" +#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" TEST(fxcrt, ByteStringOperatorSubscript) { diff --git a/core/src/fxcrt/fx_basic_wstring_unittest.cpp b/core/src/fxcrt/fx_basic_wstring_unittest.cpp index 511d8f20c7..8ce778920f 100644 --- a/core/src/fxcrt/fx_basic_wstring_unittest.cpp +++ b/core/src/fxcrt/fx_basic_wstring_unittest.cpp @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../../testing/fx_string_testhelpers.h" #include "core/include/fxcrt/fx_basic.h" +#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" TEST(fxcrt, WideStringOperatorSubscript) { diff --git a/core/src/fxcrt/fx_system_unittest.cpp b/core/src/fxcrt/fx_system_unittest.cpp index aba20e07f0..d9f4cc645e 100644 --- a/core/src/fxcrt/fx_system_unittest.cpp +++ b/core/src/fxcrt/fx_system_unittest.cpp @@ -4,8 +4,8 @@ #include <string> -#include "../../../testing/fx_string_testhelpers.h" #include "core/include/fxcrt/fx_system.h" +#include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" // Unit test covering cases where PDFium replaces well-known library diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp index 5b5100bcc5..78186a8f96 100644 --- a/core/src/fxge/agg/src/fx_agg_driver.cpp +++ b/core/src/fxge/agg/src/fx_agg_driver.cpp @@ -6,10 +6,10 @@ #include "core/src/fxge/agg/include/fx_agg_driver.h" -#include "../../dib/dib_int.h" -#include "../../ge/text_int.h" #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxge/fx_ge.h" +#include "core/src/fxge/dib/dib_int.h" +#include "core/src/fxge/ge/text_int.h" #include "third_party/agg23/agg_conv_dash.h" #include "third_party/agg23/agg_conv_stroke.h" #include "third_party/agg23/agg_curves.h" diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp index c289b93041..8346873408 100644 --- a/core/src/fxge/apple/fx_apple_platform.cpp +++ b/core/src/fxge/apple/fx_apple_platform.cpp @@ -9,12 +9,12 @@ #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "../dib/dib_int.h" -#include "../ge/text_int.h" #include "apple_int.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge_apple.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" +#include "core/src/fxge/dib/dib_int.h" +#include "core/src/fxge/ge/text_int.h" void CFX_AggDeviceDriver::InitPlatform() { CQuartz2D& quartz2d = diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp index 67b438fc28..e933695a86 100644 --- a/core/src/fxge/apple/fx_quartz_device.cpp +++ b/core/src/fxge/apple/fx_quartz_device.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../dib/dib_int.h" -#include "../ge/text_int.h" #include "core/include/fxcrt/fx_ext.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" +#include "core/src/fxge/dib/dib_int.h" +#include "core/src/fxge/ge/text_int.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ #include "apple_int.h" diff --git a/core/src/fxge/ge/fx_ge_fontmap.cpp b/core/src/fxge/ge/fx_ge_fontmap.cpp index edfce47c35..c41f448e89 100644 --- a/core/src/fxge/ge/fx_ge_fontmap.cpp +++ b/core/src/fxge/ge/fx_ge_fontmap.cpp @@ -6,9 +6,9 @@ #include <limits> -#include "../fontdata/chromefontdata/chromefontdata.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" #include "text_int.h" #include "third_party/base/stl_util.h" diff --git a/core/src/fxge/win32/fx_win32_device.cpp b/core/src/fxge/win32/fx_win32_device.cpp index 696e5f0179..b7b625341e 100644 --- a/core/src/fxge/win32/fx_win32_device.cpp +++ b/core/src/fxge/win32/fx_win32_device.cpp @@ -9,12 +9,12 @@ #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ #include <crtdbg.h> -#include "../dib/dib_int.h" -#include "../ge/text_int.h" #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge_win32.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" +#include "core/src/fxge/dib/dib_int.h" +#include "core/src/fxge/ge/text_int.h" #include "dwrite_int.h" #include "win32_int.h" diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp index 4f17274a21..cb7b590f7c 100644 --- a/core/src/fxge/win32/fx_win32_print.cpp +++ b/core/src/fxge/win32/fx_win32_print.cpp @@ -10,10 +10,10 @@ #include <windows.h> -#include "../dib/dib_int.h" -#include "../ge/text_int.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge_win32.h" +#include "core/src/fxge/dib/dib_int.h" +#include "core/src/fxge/ge/text_int.h" #include "win32_int.h" #define SIZETHRESHOLD 1000 diff --git a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h index 3e1331839e..0215b868dd 100644 --- a/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h +++ b/fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_ #define FPDFSDK_INCLUDE_FORMFILLER_FFL_CBA_FONTMAP_H_ -#include "../pdfwindow/PWL_FontMap.h" +#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h" class CPDF_Dictionary; class CPDFSDK_Annot; diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h index acbf52eddf..1f517d56e9 100644 --- a/fpdfsdk/include/formfiller/FormFiller.h +++ b/fpdfsdk/include/formfiller/FormFiller.h @@ -7,11 +7,11 @@ #ifndef FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_ #define FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_ -#include "../fsdk_mgr.h" -#include "../fxedit/fx_edit.h" -#include "../pdfwindow/IPDFWindow.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfdoc/fpdf_doc.h" #include "core/include/fpdfdoc/fpdf_vt.h" +#include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/include/pdfwindow/IPDFWindow.h" #endif // FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_ diff --git a/fpdfsdk/include/fxedit/fxet_stub.h b/fpdfsdk/include/fxedit/fxet_stub.h index b752bff7f2..a5a512bb1c 100644 --- a/fpdfsdk/include/fxedit/fxet_stub.h +++ b/fpdfsdk/include/fxedit/fxet_stub.h @@ -7,10 +7,10 @@ #ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_ #define FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_ -#include "../fx_systemhandler.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/fpdfdoc/fpdf_vt.h" +#include "fpdfsdk/include/fx_systemhandler.h" #endif // FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_ diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h index fb2ccb5b98..fe9723b913 100644 --- a/fpdfsdk/include/pdfwindow/PDFWindow.h +++ b/fpdfsdk/include/pdfwindow/PDFWindow.h @@ -7,11 +7,11 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_ -#include "../fx_systemhandler.h" -#include "../fxedit/fx_edit.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfdoc/fpdf_doc.h" #include "core/include/fpdfdoc/fpdf_vt.h" +#include "fpdfsdk/include/fx_systemhandler.h" +#include "fpdfsdk/include/fxedit/fx_edit.h" #include "public/fpdf_fwlevent.h" #endif // FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h index b4f019bf2d..284de9ed7f 100644 --- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_ -#include "../fxedit/fx_edit.h" #include "PWL_Wnd.h" #include "core/include/fxcrt/fx_string.h" +#include "fpdfsdk/include/fxedit/fx_edit.h" class CPWL_Caret; class CPWL_Edit; diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h index c7d4490280..c17483439c 100644 --- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_ -#include "../fxedit/fx_edit.h" +#include "fpdfsdk/include/fxedit/fx_edit.h" #include "public/fpdf_sysfontinfo.h" class CPDF_Document; diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h index 942a568836..9d5827cd26 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_ -#include "../fxedit/fx_edit.h" #include "PWL_Wnd.h" +#include "fpdfsdk/include/fxedit/fx_edit.h" class CPDF_ListCtrl; class CPWL_List_Notify; diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h index f8f1358577..9658341162 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h @@ -7,10 +7,10 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_ -#include "../fxedit/fx_edit.h" #include "PWL_Wnd.h" #include "core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point. #include "core/include/fpdfdoc/fpdf_vt.h" // For CPVT_WordRange. +#include "fpdfsdk/include/fxedit/fx_edit.h" class CFX_PathData; struct CPWL_Color; diff --git a/fpdfsdk/include/pdfwindow/PWL_Wnd.h b/fpdfsdk/include/pdfwindow/PWL_Wnd.h index 7216bf508a..37ddefbbce 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Wnd.h +++ b/fpdfsdk/include/pdfwindow/PWL_Wnd.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_WND_H_ -#include "../fx_systemhandler.h" #include "core/include/fpdfdoc/fpdf_doc.h" #include "core/include/fxcrt/fx_basic.h" +#include "fpdfsdk/include/fx_systemhandler.h" class CPWL_MsgControl; class CPWL_ScrollBar; diff --git a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp index 147a0588cc..97b061f56a 100644 --- a/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp +++ b/fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" CBA_FontMap::CBA_FontMap(CPDFSDK_Annot* pAnnot, IFX_SystemHandler* pSystemHandler) diff --git a/fpdfsdk/src/formfiller/FFL_CheckBox.cpp b/fpdfsdk/src/formfiller/FFL_CheckBox.cpp index 42c6251d68..b0fc906f98 100644 --- a/fpdfsdk/src/formfiller/FFL_CheckBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_CheckBox.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_CheckBox.h" +#include "fpdfsdk/include/formfiller/FFL_CheckBox.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" /* ------------------------------- CFFL_CheckBox ------------------------------- */ diff --git a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp index b4619cb32d..d4a93aaf3c 100644 --- a/fpdfsdk/src/formfiller/FFL_ComboBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ComboBox.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_IFormFiller.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" -#include "../../include/formfiller/FFL_ComboBox.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_ComboBox.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" /* ------------------------------- CFFL_ComboBox ------------------------------- */ diff --git a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp index add110378a..048ebafa12 100644 --- a/fpdfsdk/src/formfiller/FFL_FormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_FormFiller.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" #define GetRed(rgb) ((uint8_t)(rgb)) #define GetGreen(rgb) ((uint8_t)(((FX_WORD)(rgb)) >> 8)) diff --git a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp index df3d04869c..a12d84e88a 100644 --- a/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp +++ b/fpdfsdk/src/formfiller/FFL_IFormFiller.cpp @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_IFormFiller.h" -#include "../../include/formfiller/FFL_CheckBox.h" -#include "../../include/formfiller/FFL_ComboBox.h" -#include "../../include/formfiller/FFL_ListBox.h" -#include "../../include/formfiller/FFL_PushButton.h" -#include "../../include/formfiller/FFL_RadioButton.h" -#include "../../include/formfiller/FFL_TextField.h" +#include "fpdfsdk/include/formfiller/FFL_CheckBox.h" +#include "fpdfsdk/include/formfiller/FFL_ComboBox.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_ListBox.h" +#include "fpdfsdk/include/formfiller/FFL_PushButton.h" +#include "fpdfsdk/include/formfiller/FFL_RadioButton.h" +#include "fpdfsdk/include/formfiller/FFL_TextField.h" #define FFL_MAXLISTBOXHEIGHT 140.0f diff --git a/fpdfsdk/src/formfiller/FFL_ListBox.cpp b/fpdfsdk/src/formfiller/FFL_ListBox.cpp index 343683016f..53a7570716 100644 --- a/fpdfsdk/src/formfiller/FFL_ListBox.cpp +++ b/fpdfsdk/src/formfiller/FFL_ListBox.cpp @@ -4,13 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_ListBox.h" -//#include "../../include/formfiller/FFL_Module.h" -#include "../../include/formfiller/FFL_IFormFiller.h" -//#include "../../include/formfiller/FFL_Undo.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_ListBox.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" #define FFL_DEFAULTLISTBOXFONTSIZE 12.0f diff --git a/fpdfsdk/src/formfiller/FFL_PushButton.cpp b/fpdfsdk/src/formfiller/FFL_PushButton.cpp index 533d786177..66ae68b211 100644 --- a/fpdfsdk/src/formfiller/FFL_PushButton.cpp +++ b/fpdfsdk/src/formfiller/FFL_PushButton.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_PushButton.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_PushButton.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" /* ------------------------------- CFFL_PushButton * ------------------------------- */ diff --git a/fpdfsdk/src/formfiller/FFL_RadioButton.cpp b/fpdfsdk/src/formfiller/FFL_RadioButton.cpp index 7c4f9a9e49..572cfeb29a 100644 --- a/fpdfsdk/src/formfiller/FFL_RadioButton.cpp +++ b/fpdfsdk/src/formfiller/FFL_RadioButton.cpp @@ -4,10 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FormFiller.h" -#include "../../include/formfiller/FFL_FormFiller.h" -#include "../../include/formfiller/FFL_RadioButton.h" -//#include "../include/FFL_Undo.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_RadioButton.h" +#include "fpdfsdk/include/formfiller/FormFiller.h" /* ------------------------------- CFFL_RadioButton * ------------------------------- */ diff --git a/fpdfsdk/src/formfiller/FFL_TextField.cpp b/fpdfsdk/src/formfiller/FFL_TextField.cpp index 6a786901ca..253671d554 100644 --- a/fpdfsdk/src/formfiller/FFL_TextField.cpp +++ b/fpdfsdk/src/formfiller/FFL_TextField.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/formfiller/FFL_TextField.h" -#include "../../include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h" +#include "fpdfsdk/include/formfiller/FFL_TextField.h" /* ------------------------------- CFFL_TextField * ------------------------------- */ diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index b8eca30315..0bd5add9a7 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -6,9 +6,9 @@ #include "public/fpdf_dataavail.h" -#include "../include/fsdk_define.h" -#include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" +#include "../include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fsdk_define.h" #include "public/fpdf_formfill.h" class CFPDF_FileAvailWrap : public IFX_FileAvail { diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp index 77b0d0164f..db84f97c6d 100644 --- a/fpdfsdk/src/fpdf_ext.cpp +++ b/fpdfsdk/src/fpdf_ext.cpp @@ -7,8 +7,8 @@ #include "public/fpdf_ext.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fsdk_define.h" #include "core/include/fxcrt/fx_xml.h" +#include "fpdfsdk/include/fsdk_define.h" #define FPDFSDK_UNSUPPORT_CALL 100 diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index a816750912..3943e9d636 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -6,7 +6,7 @@ #include "public/fpdf_flatten.h" -#include "../include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_define.h" typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray; typedef CFX_ArrayTemplate<CPDF_Rect> CPDF_RectArray; diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp index 0628c6268e..b6fd8e071e 100644 --- a/fpdfsdk/src/fpdf_progressive.cpp +++ b/fpdfsdk/src/fpdf_progressive.cpp @@ -6,8 +6,8 @@ #include "public/fpdf_progressive.h" -#include "../include/fsdk_define.h" -#include "../include/fsdk_rendercontext.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_rendercontext.h" #include "public/fpdfview.h" // These checks are here because core/ and public/ cannot depend on each other. diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index 9c388292a8..71fa94472c 100644 --- a/fpdfsdk/src/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp @@ -6,8 +6,8 @@ #include "public/fpdf_sysfontinfo.h" -#include "../include/fsdk_define.h" -#include "../include/pdfwindow/PWL_FontMap.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h" class CFX_ExternalFontInfo final : public IFX_SystemFontInfo { public: diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index 134117dcd3..50a3a3266d 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -6,7 +6,7 @@ #include "public/fpdf_transformpage.h" -#include "../include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_define.h" namespace { diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index 72231eb1cc..abe2a32ca4 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -6,7 +6,7 @@ #include "public/fpdf_doc.h" -#include "../include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_define.h" namespace { diff --git a/fpdfsdk/src/fpdfeditimg.cpp b/fpdfsdk/src/fpdfeditimg.cpp index c4fa2d654e..de5c72f659 100644 --- a/fpdfsdk/src/fpdfeditimg.cpp +++ b/fpdfsdk/src/fpdfeditimg.cpp @@ -6,7 +6,7 @@ #include "public/fpdf_edit.h" -#include "../include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_define.h" DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index bb87c4caeb..7c757cb3b6 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -6,10 +6,10 @@ #include "public/fpdf_edit.h" -#include "../include/fsdk_define.h" -#include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" +#include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fsdk_define.h" #include "public/fpdf_formfill.h" #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index 9dab5fdb5d..11290eef8b 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -9,8 +9,8 @@ #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" -#include "../include/fsdk_define.h" -#include "../include/fsdk_mgr.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" #include "public/fpdfview.h" #include "third_party/base/nonstd_unique_ptr.h" diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index 87c7bcdb6a..e085568cbd 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -7,7 +7,7 @@ #include "public/fpdf_ppo.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_define.h" class CPDF_PageOrganizer { public: diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index ee8d02b026..8f9ee7794d 100644 --- a/fpdfsdk/src/fpdfsave.cpp +++ b/fpdfsdk/src/fpdfsave.cpp @@ -9,7 +9,7 @@ #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_util.h" -#include "../include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_define.h" #include "public/fpdf_edit.h" #include "public/fpdf_formfill.h" diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 799decf607..78ef65f018 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -10,13 +10,13 @@ #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" #include "../include/fpdfxfa/fpdfxfa_util.h" -#include "../include/fsdk_define.h" -#include "../include/fsdk_mgr.h" -#include "../include/fsdk_rendercontext.h" -#include "../include/javascript/IJavaScript.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxcrt/fx_safe_types.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/include/fsdk_rendercontext.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "public/fpdf_ext.h" #include "public/fpdf_formfill.h" #include "public/fpdf_progressive.h" diff --git a/fpdfsdk/src/fsdk_actionhandler.cpp b/fpdfsdk/src/fsdk_actionhandler.cpp index 9d510b74c2..451381b289 100644 --- a/fpdfsdk/src/fsdk_actionhandler.cpp +++ b/fpdfsdk/src/fsdk_actionhandler.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fsdk_mgr.h" -#include "../include/fsdk_actionhandler.h" -#include "../include/javascript/IJavaScript.h" +#include "fpdfsdk/include/fsdk_actionhandler.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" CPDFSDK_ActionHandler::CPDFSDK_ActionHandler() : m_pFormActionHandler(new CPDFSDK_FormActionHandler) { diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp index bdfda15453..f34db5cacc 100644 --- a/fpdfsdk/src/fsdk_annothandler.cpp +++ b/fpdfsdk/src/fsdk_annothandler.cpp @@ -6,12 +6,12 @@ #include <algorithm> -#include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_util.h" -#include "../include/fsdk_mgr.h" -#include "../include/formfiller/FFL_FormFiller.h" -#include "../include/fsdk_annothandler.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/fsdk_annothandler.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(CPDFDoc_Environment* pApp) { m_pApp = pApp; diff --git a/fpdfsdk/src/fsdk_baseannot.cpp b/fpdfsdk/src/fsdk_baseannot.cpp index 45f359a9d2..090a50fe62 100644 --- a/fpdfsdk/src/fsdk_baseannot.cpp +++ b/fpdfsdk/src/fsdk_baseannot.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fsdk_mgr.h" -#include "../include/fsdk_baseannot.h" +#include "fpdfsdk/include/fsdk_baseannot.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" int _gAfxGetTimeZoneInSeconds(FX_CHAR tzhour, uint8_t tzminute) { return (int)tzhour * 3600 + (int)tzminute * (tzhour >= 0 ? 60 : -60); diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 06ed0f4c22..ea5ccd71b2 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/formfiller/FFL_FormFiller.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_util.h" -#include "../include/fsdk_actionhandler.h" -#include "../include/fsdk_baseannot.h" -#include "../include/fsdk_baseform.h" -#include "../include/fsdk_define.h" -#include "../include/fsdk_mgr.h" -#include "../include/javascript/IJavaScript.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/fsdk_actionhandler.h" +#include "fpdfsdk/include/fsdk_baseannot.h" +#include "fpdfsdk/include/fsdk_baseform.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "third_party/base/nonstd_unique_ptr.h" #define IsFloatZero(f) ((f) < 0.01 && (f) > -0.01) diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 9bbf7aae3f..aac1673346 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -6,11 +6,11 @@ #include <algorithm> -#include "../include/fsdk_mgr.h" +#include "fpdfsdk/include/fsdk_mgr.h" -#include "../include/formfiller/FFL_FormFiller.h" -#include "../include/fsdk_define.h" -#include "../include/javascript/IJavaScript.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "public/fpdf_ext.h" #include "third_party/base/nonstd_unique_ptr.h" diff --git a/fpdfsdk/src/fsdk_rendercontext.cpp b/fpdfsdk/src/fsdk_rendercontext.cpp index e282d01db7..3b671caea6 100644 --- a/fpdfsdk/src/fsdk_rendercontext.cpp +++ b/fpdfsdk/src/fsdk_rendercontext.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/fsdk_rendercontext.h" +#include "fpdfsdk/include/fsdk_rendercontext.h" void CRenderContext::Clear() { m_pDevice = NULL; diff --git a/fpdfsdk/src/fxedit/fxet_ap.cpp b/fpdfsdk/src/fxedit/fxet_ap.cpp index 4e92099417..bdce7c05db 100644 --- a/fpdfsdk/src/fxedit/fxet_ap.cpp +++ b/fpdfsdk/src/fxedit/fxet_ap.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxedit/fxet_stub.h" -#include "../../include/fxedit/fx_edit.h" -#include "../../include/fxedit/fxet_edit.h" +#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/include/fxedit/fxet_edit.h" +#include "fpdfsdk/include/fxedit/fxet_stub.h" CFX_ByteString GetPDFWordString(IFX_Edit_FontMap* pFontMap, int32_t nFontIndex, diff --git a/fpdfsdk/src/fxedit/fxet_edit.cpp b/fpdfsdk/src/fxedit/fxet_edit.cpp index 218ed16165..cca0319eb5 100644 --- a/fpdfsdk/src/fxedit/fxet_edit.cpp +++ b/fpdfsdk/src/fxedit/fxet_edit.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxedit/fxet_stub.h" -#include "../../include/fxedit/fxet_edit.h" +#include "fpdfsdk/include/fxedit/fxet_edit.h" +#include "fpdfsdk/include/fxedit/fxet_stub.h" #define FX_EDIT_UNDO_MAXITEM 10000 diff --git a/fpdfsdk/src/fxedit/fxet_list.cpp b/fpdfsdk/src/fxedit/fxet_list.cpp index ff4723e514..19d41ccf41 100644 --- a/fpdfsdk/src/fxedit/fxet_list.cpp +++ b/fpdfsdk/src/fxedit/fxet_list.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxedit/fxet_stub.h" -#include "../../include/fxedit/fxet_edit.h" -#include "../../include/fxedit/fxet_list.h" +#include "fpdfsdk/include/fxedit/fxet_edit.h" +#include "fpdfsdk/include/fxedit/fxet_list.h" +#include "fpdfsdk/include/fxedit/fxet_stub.h" /* ------------------------------- CFX_ListItem * ---------------------------------- */ diff --git a/fpdfsdk/src/fxedit/fxet_module.cpp b/fpdfsdk/src/fxedit/fxet_module.cpp index 5c0086ae21..12f2c86e03 100644 --- a/fpdfsdk/src/fxedit/fxet_module.cpp +++ b/fpdfsdk/src/fxedit/fxet_module.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxedit/fxet_stub.h" -#include "../../include/fxedit/fxet_edit.h" -#include "../../include/fxedit/fxet_list.h" +#include "fpdfsdk/include/fxedit/fxet_edit.h" +#include "fpdfsdk/include/fxedit/fxet_list.h" +#include "fpdfsdk/include/fxedit/fxet_stub.h" /* ---------------------- IFX_Edit ---------------------- */ diff --git a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp index 9c18943a81..88f97da7f8 100644 --- a/fpdfsdk/src/fxedit/fxet_pageobjs.cpp +++ b/fpdfsdk/src/fxedit/fxet_pageobjs.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxedit/fxet_stub.h" -#include "../../include/fxedit/fx_edit.h" -#include "../../include/fxedit/fxet_edit.h" +#include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/include/fxedit/fxet_edit.h" +#include "fpdfsdk/include/fxedit/fxet_stub.h" #define FX_EDIT_UNDERLINEHALFWIDTH 0.5f #define FX_EDIT_CROSSOUTHALFWIDTH 0.5f diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/src/javascript/Consts.cpp index d71c71129d..7f6b8f8c6a 100644 --- a/fpdfsdk/src/javascript/Consts.cpp +++ b/fpdfsdk/src/javascript/Consts.cpp @@ -6,10 +6,10 @@ #include "Consts.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Define.h" #include "JS_Object.h" #include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ------------------------------ border ------------------------------ */ diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index 4bd0fd7430..a8da302700 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -6,8 +6,6 @@ #include "Document.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Field.h" #include "Icon.h" #include "JS_Context.h" @@ -17,6 +15,8 @@ #include "JS_Runtime.h" #include "JS_Value.h" #include "app.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" #include "third_party/base/numerics/safe_math.h" diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp index 6287850bb6..4119b8c32e 100644 --- a/fpdfsdk/src/javascript/Field.cpp +++ b/fpdfsdk/src/javascript/Field.cpp @@ -6,8 +6,6 @@ #include "Field.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Document.h" #include "Icon.h" #include "JS_Context.h" @@ -18,6 +16,8 @@ #include "JS_Value.h" #include "PublicMethods.h" #include "color.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ---------------------- Field ---------------------- */ diff --git a/fpdfsdk/src/javascript/Field.h b/fpdfsdk/src/javascript/Field.h index 4899ee2a96..cd817956d4 100644 --- a/fpdfsdk/src/javascript/Field.h +++ b/fpdfsdk/src/javascript/Field.h @@ -9,8 +9,8 @@ #include <string> // For std::wstring. -#include "../../include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. #include "JS_Define.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. class CPDFSDK_Widget; class Document; diff --git a/fpdfsdk/src/javascript/Icon.cpp b/fpdfsdk/src/javascript/Icon.cpp index 5dfa7a08d4..bce66c0d99 100644 --- a/fpdfsdk/src/javascript/Icon.cpp +++ b/fpdfsdk/src/javascript/Icon.cpp @@ -6,10 +6,10 @@ #include "Icon.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Define.h" #include "JS_Object.h" #include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ---------------------- Icon ---------------------- */ diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp index a53e745786..76988d5ef6 100644 --- a/fpdfsdk/src/javascript/JS_Context.cpp +++ b/fpdfsdk/src/javascript/JS_Context.cpp @@ -6,9 +6,9 @@ #include "JS_Context.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_EventHandler.h" #include "JS_Runtime.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" /* -------------------------- CJS_Context -------------------------- */ diff --git a/fpdfsdk/src/javascript/JS_Context.h b/fpdfsdk/src/javascript/JS_Context.h index e450ba5703..93ef1523a3 100644 --- a/fpdfsdk/src/javascript/JS_Context.h +++ b/fpdfsdk/src/javascript/JS_Context.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_ #define FPDFSDK_SRC_JAVASCRIPT_JS_CONTEXT_H_ -#include "../../include/javascript/IJavaScript.h" #include "core/include/fxcrt/fx_string.h" #include "core/include/fxcrt/fx_system.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" class CJS_EventHandler; class CJS_Runtime; diff --git a/fpdfsdk/src/javascript/JS_Define.h b/fpdfsdk/src/javascript/JS_Define.h index 0a6426868f..740295e1cb 100644 --- a/fpdfsdk/src/javascript/JS_Define.h +++ b/fpdfsdk/src/javascript/JS_Define.h @@ -7,10 +7,10 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_ #define FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_ -#include "../../include/jsapi/fxjs_v8.h" -#include "resource.h" #include "JS_Object.h" #include "JS_Value.h" +#include "fpdfsdk/include/jsapi/fxjs_v8.h" +#include "resource.h" struct JSConstSpec { const wchar_t* pName; diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp index cb86fde24d..df7f9791c2 100644 --- a/fpdfsdk/src/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp @@ -6,7 +6,6 @@ #include "JS_EventHandler.h" -#include "../../include/javascript/IJavaScript.h" #include "Document.h" #include "Field.h" #include "JS_Context.h" @@ -14,6 +13,7 @@ #include "JS_Object.h" #include "JS_Runtime.h" #include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ---------------------------- CJS_EventHandler ---------------------------- */ diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp index 36b81a20ac..d9a07a8507 100644 --- a/fpdfsdk/src/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp @@ -6,8 +6,8 @@ #include "JS_GlobalData.h" -#include "../../include/javascript/IJavaScript.h" #include "core/include/fdrm/fx_crypt.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #define JS_MAXGLOBALDATA (1024 * 4 - 8) diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index 1e649ae791..529b540237 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp @@ -6,10 +6,10 @@ #include "JS_Object.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "JS_Context.h" #include "JS_Define.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" namespace { diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/src/javascript/JS_Object.h index 8872a4eca4..d72696caeb 100644 --- a/fpdfsdk/src/javascript/JS_Object.h +++ b/fpdfsdk/src/javascript/JS_Object.h @@ -9,9 +9,9 @@ #include <map> -#include "../../include/fsdk_define.h" // For FX_UINT -#include "../../include/jsapi/fxjs_v8.h" #include "JS_Runtime.h" +#include "fpdfsdk/include/fsdk_define.h" // For FX_UINT +#include "fpdfsdk/include/jsapi/fxjs_v8.h" #include "third_party/base/nonstd_unique_ptr.h" class CJS_Context; diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 3e1f74beed..8f705d51fa 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -8,8 +8,6 @@ #include "../../../xfa/src/fxjse/src/value.h" #include "../../include/fpdfxfa/fpdfxfa_app.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Consts.h" #include "Document.h" #include "Field.h" @@ -25,6 +23,8 @@ #include "color.h" #include "console.h" #include "event.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "global.h" #include "report.h" #include "util.h" diff --git a/fpdfsdk/src/javascript/JS_Runtime.h b/fpdfsdk/src/javascript/JS_Runtime.h index 9e6b3abede..2353517016 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.h +++ b/fpdfsdk/src/javascript/JS_Runtime.h @@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "../../include/javascript/IJavaScript.h" -#include "../../include/jsapi/fxjs_v8.h" #include "JS_EventHandler.h" #include "core/include/fxcrt/fx_basic.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/include/jsapi/fxjs_v8.h" class CJS_Context; diff --git a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp index ba9b4a0d4a..90d19d9451 100644 --- a/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime_Stub.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "third_party/base/nonstd_unique_ptr.h" class CJS_ContextStub final : public IJS_Context { diff --git a/fpdfsdk/src/javascript/JS_Value.h b/fpdfsdk/src/javascript/JS_Value.h index 875ab18ca9..8517b76dac 100644 --- a/fpdfsdk/src/javascript/JS_Value.h +++ b/fpdfsdk/src/javascript/JS_Value.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_ #define FPDFSDK_SRC_JAVASCRIPT_JS_VALUE_H_ -#include "../../include/jsapi/fxjs_v8.h" #include "core/include/fxcrt/fx_basic.h" +#include "fpdfsdk/include/jsapi/fxjs_v8.h" class CJS_Array; class CJS_Date; diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp index ac9669d564..454085069e 100644 --- a/fpdfsdk/src/javascript/PublicMethods.cpp +++ b/fpdfsdk/src/javascript/PublicMethods.cpp @@ -6,8 +6,6 @@ #include "PublicMethods.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Field.h" #include "JS_Context.h" #include "JS_Define.h" @@ -16,6 +14,8 @@ #include "JS_Runtime.h" #include "JS_Value.h" #include "color.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" #include "util.h" diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp index dd8223ce9a..f8b2e3550e 100644 --- a/fpdfsdk/src/javascript/app.cpp +++ b/fpdfsdk/src/javascript/app.cpp @@ -6,8 +6,6 @@ #include "app.h" -#include "../../include/fsdk_mgr.h" // For CPDFDoc_Environment. -#include "../../include/javascript/IJavaScript.h" #include "Document.h" #include "JS_Context.h" #include "JS_Define.h" @@ -15,6 +13,8 @@ #include "JS_Object.h" #include "JS_Runtime.h" #include "JS_Value.h" +#include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" #include "third_party/base/nonstd_unique_ptr.h" diff --git a/fpdfsdk/src/javascript/color.cpp b/fpdfsdk/src/javascript/color.cpp index d00ac70e80..b9c4804727 100644 --- a/fpdfsdk/src/javascript/color.cpp +++ b/fpdfsdk/src/javascript/color.cpp @@ -6,13 +6,13 @@ #include "color.h" -#include "../../include/javascript/IJavaScript.h" +#include "JS_Context.h" #include "JS_Define.h" -#include "JS_Object.h" -#include "JS_Value.h" #include "JS_EventHandler.h" -#include "JS_Context.h" +#include "JS_Object.h" #include "JS_Runtime.h" +#include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* -------------------------- color -------------------------- */ diff --git a/fpdfsdk/src/javascript/color.h b/fpdfsdk/src/javascript/color.h index 360f66709c..0cc3f3c289 100644 --- a/fpdfsdk/src/javascript/color.h +++ b/fpdfsdk/src/javascript/color.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_COLOR_H_ #define FPDFSDK_SRC_JAVASCRIPT_COLOR_H_ -#include "../../include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. #include "JS_Define.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. class color : public CJS_EmbedObj { public: diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/src/javascript/console.cpp index f8dbd527d8..072e5b7f0d 100644 --- a/fpdfsdk/src/javascript/console.cpp +++ b/fpdfsdk/src/javascript/console.cpp @@ -6,12 +6,12 @@ #include "console.h" -#include "../../include/javascript/IJavaScript.h" +#include "JS_Context.h" #include "JS_Define.h" +#include "JS_EventHandler.h" #include "JS_Object.h" #include "JS_Value.h" -#include "JS_EventHandler.h" -#include "JS_Context.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ------------------------ console ------------------------ */ diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/src/javascript/event.cpp index a6bd5dca1f..5ad1ca513f 100644 --- a/fpdfsdk/src/javascript/event.cpp +++ b/fpdfsdk/src/javascript/event.cpp @@ -6,13 +6,13 @@ #include "event.h" -#include "../../include/javascript/IJavaScript.h" +#include "Field.h" +#include "JS_Context.h" #include "JS_Define.h" +#include "JS_EventHandler.h" #include "JS_Object.h" #include "JS_Value.h" -#include "JS_EventHandler.h" -#include "JS_Context.h" -#include "Field.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* -------------------------- event -------------------------- */ diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp index f7c71e88b1..2d9799dd4e 100644 --- a/fpdfsdk/src/javascript/global.cpp +++ b/fpdfsdk/src/javascript/global.cpp @@ -6,7 +6,6 @@ #include "global.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Context.h" #include "JS_Define.h" #include "JS_EventHandler.h" @@ -14,6 +13,7 @@ #include "JS_Object.h" #include "JS_Value.h" #include "core/include/fxcrt/fx_ext.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" /* ---------------------------- global ---------------------------- */ diff --git a/fpdfsdk/src/javascript/report.cpp b/fpdfsdk/src/javascript/report.cpp index 40fb682fbe..2ec07fb1e4 100644 --- a/fpdfsdk/src/javascript/report.cpp +++ b/fpdfsdk/src/javascript/report.cpp @@ -6,10 +6,10 @@ #include "report.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Define.h" #include "JS_Object.h" #include "JS_Value.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" /* ---------------------- report ---------------------- */ diff --git a/fpdfsdk/src/javascript/resource.h b/fpdfsdk/src/javascript/resource.h index 8e07d47768..be3ae13d90 100644 --- a/fpdfsdk/src/javascript/resource.h +++ b/fpdfsdk/src/javascript/resource.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_ #define FPDFSDK_SRC_JAVASCRIPT_RESOURCE_H_ -#include "../../include/fsdk_define.h" // For FX_UINT. #include "core/include/fxcrt/fx_string.h" // For CFX_WideString. +#include "fpdfsdk/include/fsdk_define.h" // For FX_UINT. class CJS_Context; diff --git a/fpdfsdk/src/javascript/util.cpp b/fpdfsdk/src/javascript/util.cpp index 2c28cc55e3..c021ec9e95 100644 --- a/fpdfsdk/src/javascript/util.cpp +++ b/fpdfsdk/src/javascript/util.cpp @@ -6,7 +6,6 @@ #include "util.h" -#include "../../include/javascript/IJavaScript.h" #include "JS_Context.h" #include "JS_Define.h" #include "JS_EventHandler.h" @@ -14,6 +13,7 @@ #include "JS_Runtime.h" #include "JS_Value.h" #include "PublicMethods.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "resource.h" #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/src/jsapi/fxjs_v8.cpp b/fpdfsdk/src/jsapi/fxjs_v8.cpp index f099289666..a3100bec41 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/jsapi/fxjs_v8.h" +#include "fpdfsdk/include/jsapi/fxjs_v8.h" #include "core/include/fxcrt/fx_basic.h" diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp index 9cde507203..8e685c9bd4 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../../testing/embedder_test.h" -#include "../../include/jsapi/fxjs_v8.h" #include "core/include/fpdfapi/fpdf_parser.h" +#include "fpdfsdk/include/jsapi/fxjs_v8.h" +#include "testing/embedder_test.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/base/nonstd_unique_ptr.h" diff --git a/fpdfsdk/src/pdfwindow/PWL_Button.cpp b/fpdfsdk/src/pdfwindow/PWL_Button.cpp index 9eca10c90d..e9c2647aa2 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Button.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Button.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_Button.h" -#include "../../include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Button.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" /* ------------------------------- CPWL_Button * ---------------------------------- */ diff --git a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp index f35385e7f7..adb296d8e1 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Caret.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Caret.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_Caret.h" -#include "../../include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Caret.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" #define PWL_CARET_FLASHINTERVAL 500 diff --git a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp index 2a9afe7dc6..943d6acb26 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_EditCtrl.h" -#include "../../include/pdfwindow/PWL_Edit.h" -#include "../../include/pdfwindow/PWL_ListBox.h" -#include "../../include/pdfwindow/PWL_ComboBox.h" -#include "../../include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_ComboBox.h" +#include "fpdfsdk/include/pdfwindow/PWL_Edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" #define PWLCB_DEFAULTFONTSIZE 12.0f diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp index ce9bd26050..29e7c2eea7 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Caret.h" -#include "../../include/pdfwindow/PWL_Edit.h" -#include "../../include/pdfwindow/PWL_EditCtrl.h" -#include "../../include/pdfwindow/PWL_FontMap.h" -#include "../../include/pdfwindow/PWL_ScrollBar.h" -#include "../../include/pdfwindow/PWL_Utils.h" -#include "../../include/pdfwindow/PWL_Wnd.h" #include "core/include/fxcrt/fx_safe_types.h" #include "core/include/fxcrt/fx_xml.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Caret.h" +#include "fpdfsdk/include/pdfwindow/PWL_Edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h" +#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" /* ---------------------------- CPWL_Edit ------------------------------ */ diff --git a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp index eb6324ee7e..0794be653c 100644 --- a/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_EditCtrl.h" -#include "../../include/pdfwindow/PWL_ScrollBar.h" -#include "../../include/pdfwindow/PWL_Utils.h" -#include "../../include/pdfwindow/PWL_Caret.h" -#include "../../include/pdfwindow/PWL_FontMap.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Caret.h" +#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h" +#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001) #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb))) diff --git a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp index 06ddeeb2a2..cd65c383ff 100644 --- a/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_FontMap.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_FontMap.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_FontMap.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" #define DEFAULT_FONT_NAME "Helvetica" diff --git a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp index 29e0aa86f5..166b4e7ba1 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Icon.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Icon.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_Icon.h" -#include "../../include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Icon.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" /* ------------------------------- CPWL_Image ---------------------------------- */ diff --git a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp index 24d2dad5fa..cc8b352af1 100644 --- a/fpdfsdk/src/pdfwindow/PWL_IconList.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_IconList.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_ListCtrl.h" -#include "../../include/pdfwindow/PWL_IconList.h" -#include "../../include/pdfwindow/PWL_Utils.h" -#include "../../include/pdfwindow/PWL_ScrollBar.h" -#include "../../include/pdfwindow/PWL_Label.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_IconList.h" +#include "fpdfsdk/include/pdfwindow/PWL_Label.h" +#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" #define PWL_IconList_ITEM_ICON_LEFTMARGIN 10.0f #define PWL_IconList_ITEM_WIDTH 20.0f diff --git a/fpdfsdk/src/pdfwindow/PWL_Label.cpp b/fpdfsdk/src/pdfwindow/PWL_Label.cpp index 797270ebba..4beeada721 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Label.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Label.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_Label.h" -#include "../../include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Label.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" /* ---------------------------- CPWL_Label ------------------------------ */ diff --git a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp index 4bdcb5d1f3..229c1dd81e 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ListBox.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_ListBox.h" -#include "../../include/pdfwindow/PWL_Utils.h" -#include "../../include/pdfwindow/PWL_ScrollBar.h" -#include "../../include/pdfwindow/PWL_EditCtrl.h" -#include "../../include/pdfwindow/PWL_Edit.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h" +#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001) #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb))) diff --git a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp index e01ce5c203..e578f9b860 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_ListCtrl.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" /* ---------------------------- CPWL_ListCtrl ---------------------------- */ diff --git a/fpdfsdk/src/pdfwindow/PWL_Note.cpp b/fpdfsdk/src/pdfwindow/PWL_Note.cpp index 6b05dde3b8..553a20f1dd 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Note.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Note.cpp @@ -4,19 +4,19 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_Button.h" -#include "../../include/pdfwindow/PWL_EditCtrl.h" -#include "../../include/pdfwindow/PWL_Edit.h" -#include "../../include/pdfwindow/PWL_ListCtrl.h" -#include "../../include/pdfwindow/PWL_ScrollBar.h" -#include "../../include/pdfwindow/PWL_Note.h" -#include "../../include/pdfwindow/PWL_Label.h" -#include "../../include/pdfwindow/PWL_Edit.h" -#include "../../include/pdfwindow/PWL_ScrollBar.h" -#include "../../include/pdfwindow/PWL_Utils.h" -#include "../../include/pdfwindow/PWL_Caret.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Button.h" +#include "fpdfsdk/include/pdfwindow/PWL_Caret.h" +#include "fpdfsdk/include/pdfwindow/PWL_Edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_Edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_Label.h" +#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_Note.h" +#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" #define POPUP_ITEM_HEAD_BOTTOM 3.0f #define POPUP_ITEM_BOTTOMWIDTH 1.0f diff --git a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp index c762b4cd92..94f14fd3b8 100644 --- a/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_ScrollBar.h" -#include "../../include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001) #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb))) diff --git a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp index bfe32ae8ad..f872bb4a62 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Signature.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Signature.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_Icon.h" -#include "../../include/pdfwindow/PWL_Signature.h" -#include "../../include/pdfwindow/PWL_Label.h" -#include "../../include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Icon.h" +#include "fpdfsdk/include/pdfwindow/PWL_Label.h" +#include "fpdfsdk/include/pdfwindow/PWL_Signature.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" /* --------------------------------- CPWL_Signature_Image * --------------------------------- */ diff --git a/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp b/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp index 7f125ad1d7..e22076edd2 100644 --- a/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_Button.h" -#include "../../include/pdfwindow/PWL_SpecialButton.h" -#include "../../include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Button.h" +#include "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" /* --------------------------- CPWL_PushButton ---------------------------- */ diff --git a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp index 52b22b548a..fafdf1e7cf 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Utils.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Utils.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_Utils.h" -#include "../../include/pdfwindow/PWL_Icon.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_Icon.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" #define IsFloatZero(f) ((f) < 0.0001 && (f) > -0.0001) #define IsFloatBigger(fa, fb) ((fa) > (fb) && !IsFloatZero((fa) - (fb))) diff --git a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp index 7b765f3e4f..d8f3904021 100644 --- a/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp +++ b/fpdfsdk/src/pdfwindow/PWL_Wnd.cpp @@ -6,10 +6,10 @@ #include <map> -#include "../../include/pdfwindow/PDFWindow.h" -#include "../../include/pdfwindow/PWL_Wnd.h" -#include "../../include/pdfwindow/PWL_Utils.h" -#include "../../include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PDFWindow.h" +#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PWL_Utils.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" /* -------------------------- CPWL_Timer -------------------------- */ diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index 3e71a60a13..8162287053 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -14,13 +14,13 @@ #include <utility> #include <vector> -#include "../testing/test_support.h" #include "image_diff_png.h" #include "public/fpdf_dataavail.h" #include "public/fpdf_ext.h" #include "public/fpdf_formfill.h" #include "public/fpdf_text.h" #include "public/fpdfview.h" +#include "testing/test_support.h" #ifdef PDF_ENABLE_V8 #include "v8/include/libplatform/libplatform.h" diff --git a/third_party/base/numerics/safe_conversions.h b/third_party/base/numerics/safe_conversions.h index e95608e0a5..dd0d1e47dc 100644 --- a/third_party/base/numerics/safe_conversions.h +++ b/third_party/base/numerics/safe_conversions.h @@ -7,8 +7,8 @@ #include <limits> -#include "../logging.h" #include "safe_conversions_impl.h" +#include "third_party/base/logging.h" namespace pdfium { namespace base { diff --git a/third_party/base/numerics/safe_conversions_impl.h b/third_party/base/numerics/safe_conversions_impl.h index f7afdfe31c..c974ee0590 100644 --- a/third_party/base/numerics/safe_conversions_impl.h +++ b/third_party/base/numerics/safe_conversions_impl.h @@ -8,8 +8,8 @@ #include <assert.h> #include <limits> -#include "../macros.h" -#include "../template_util.h" +#include "third_party/base/macros.h" +#include "third_party/base/template_util.h" namespace pdfium { namespace base { diff --git a/third_party/base/numerics/safe_math_impl.h b/third_party/base/numerics/safe_math_impl.h index 14897202bd..4209446694 100644 --- a/third_party/base/numerics/safe_math_impl.h +++ b/third_party/base/numerics/safe_math_impl.h @@ -11,9 +11,9 @@ #include <cstdlib> #include <limits> -#include "../macros.h" -#include "../template_util.h" #include "safe_conversions.h" +#include "third_party/base/macros.h" +#include "third_party/base/template_util.h" namespace pdfium { namespace base { diff --git a/third_party/lcms2-2.6/src/lcms2_internal.h b/third_party/lcms2-2.6/src/lcms2_internal.h index 5119218ceb..8617e92eb1 100644 --- a/third_party/lcms2-2.6/src/lcms2_internal.h +++ b/third_party/lcms2-2.6/src/lcms2_internal.h @@ -29,7 +29,7 @@ // Include plug-in foundation #ifndef _lcms_plugin_H -# include "../include/lcms2_plugin.h" +#include "third_party/lcms2-2.6/include/lcms2_plugin.h" #endif // ctype is part of C99 as per 7.1.2 |