diff options
Diffstat (limited to 'core/fpdfapi')
79 files changed, 117 insertions, 117 deletions
diff --git a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp index 51c5b1e365..086a78637a 100644 --- a/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp +++ b/core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fxcrt/include/fx_basic.h" // For FX_ArraySize(). #include "core/include/fpdfapi/fpdf_resource.h" -#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize(). static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = { {"B5pc-H", FXCMAP_CMap::Range, g_FXCMAP_B5pc_H_0, 247, FXCMAP_CMap::None, diff --git a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp index cf29fe7c8e..95d231563e 100644 --- a/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp +++ b/core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fxcrt/include/fx_basic.h" // For FX_ArraySize(). #include "core/include/fpdfapi/fpdf_resource.h" -#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize(). static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = { {"GB-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_GB_EUC_H_0, 90, FXCMAP_CMap::None, diff --git a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp index a2146230fe..8c43d41311 100644 --- a/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp +++ b/core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fxcrt/include/fx_basic.h" // For FX_ArraySize(). #include "core/include/fpdfapi/fpdf_resource.h" -#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize(). static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = { {"83pv-RKSJ-H", FXCMAP_CMap::Range, g_FXCMAP_83pv_RKSJ_H_1, 222, diff --git a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp index d6932156e5..0001aaaf8d 100644 --- a/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp +++ b/core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/fpdfapi/fpdf_font/font_int.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fxcrt/include/fx_basic.h" // For FX_ArraySize(). #include "core/include/fpdfapi/fpdf_resource.h" -#include "core/include/fxcrt/fx_basic.h" // For FX_ArraySize(). static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = { {"KSC-EUC-H", FXCMAP_CMap::Range, g_FXCMAP_KSC_EUC_H_0, 467, diff --git a/core/fpdfapi/fpdf_cmaps/cmap_int.h b/core/fpdfapi/fpdf_cmaps/cmap_int.h index 8dea4b4759..9b8db2154d 100644 --- a/core/fpdfapi/fpdf_cmaps/cmap_int.h +++ b/core/fpdfapi/fpdf_cmaps/cmap_int.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ #define CORE_FPDFAPI_FPDF_CMAPS_CMAP_INT_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" struct FXCMAP_CMap { enum MapType { None, Single, Range, Reverse }; diff --git a/core/fpdfapi/fpdf_edit/editint.h b/core/fpdfapi/fpdf_edit/editint.h index 2e4b0cc067..8a73f123a3 100644 --- a/core/fpdfapi/fpdf_edit/editint.h +++ b/core/fpdfapi/fpdf_edit/editint.h @@ -9,9 +9,9 @@ #include <vector> -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_stream.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_stream.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Creator; class CPDF_Object; diff --git a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp index 41bb99defc..f774d0119a 100644 --- a/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp +++ b/core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp @@ -21,7 +21,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h" #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h" -#include "core/include/fxcrt/fx_ext.h" +#include "core/fxcrt/include/fx_ext.h" #include "third_party/base/stl_util.h" #define PDF_OBJECTSTREAM_MAXLENGTH (256 * 1024) diff --git a/core/fpdfapi/fpdf_edit/include/cpdf_creator.h b/core/fpdfapi/fpdf_edit/include/cpdf_creator.h index 2132457c1c..0488266564 100644 --- a/core/fpdfapi/fpdf_edit/include/cpdf_creator.h +++ b/core/fpdfapi/fpdf_edit/include/cpdf_creator.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_EDIT_INCLUDE_CPDF_CREATOR_H_ #define CORE_FPDFAPI_FPDF_EDIT_INCLUDE_CPDF_CREATOR_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_Array; class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h index 8aea084798..53446c34e3 100644 --- a/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h +++ b/core/fpdfapi/fpdf_edit/include/cpdf_pagecontentgenerator.h @@ -8,9 +8,9 @@ #define CORE_FPDFAPI_FPDF_EDIT_INCLUDE_CPDF_PAGECONTENTGENERATOR_H_ #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Object; class CPDF_Page; diff --git a/core/fpdfapi/fpdf_font/font_int.h b/core/fpdfapi/fpdf_font/font_int.h index bb209d8c16..74380f1147 100644 --- a/core/fpdfapi/fpdf_font/font_int.h +++ b/core/fpdfapi/fpdf_font/font_int.h @@ -10,8 +10,8 @@ #include <map> #include <memory> +#include "core/fxcrt/include/fx_basic.h" #include "core/include/fpdfapi/fpdf_resource.h" -#include "core/include/fxcrt/fx_basic.h" class CPDF_CID2UnicodeMap; class CPDF_CMap; diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp index d079110679..8dc91616f9 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp @@ -15,8 +15,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_number.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fxcrt/include/fx_ext.h" #include "core/include/fpdfapi/fpdf_resource.h" -#include "core/include/fxcrt/fx_ext.h" #include "core/include/fxge/fx_freetype.h" #include "third_party/base/stl_util.h" diff --git a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp index b952cda4e5..c73043abfa 100644 --- a/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -12,8 +12,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fxcrt/include/fx_ext.h" #include "core/include/fpdfapi/fpdf_resource.h" -#include "core/include/fxcrt/fx_ext.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" diff --git a/core/fpdfapi/fpdf_font/ttgsubtable.h b/core/fpdfapi/fpdf_font/ttgsubtable.h index 47ae5a1fa4..e0bdcc75e2 100644 --- a/core/fpdfapi/fpdf_font/ttgsubtable.h +++ b/core/fpdfapi/fpdf_font/ttgsubtable.h @@ -11,7 +11,7 @@ #include <map> -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "core/include/fxge/fx_font.h" #include "core/include/fxge/fx_freetype.h" diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.h b/core/fpdfapi/fpdf_page/cpdf_allstates.h index 700072f26c..9af917a113 100644 --- a/core/fpdfapi/fpdf_page/cpdf_allstates.h +++ b/core/fpdfapi/fpdf_page/cpdf_allstates.h @@ -8,8 +8,8 @@ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_ALLSTATES_H_ #include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Array; class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.h b/core/fpdfapi/fpdf_page/cpdf_colorstate.h index 77a506e1b4..e7f3e37d35 100644 --- a/core/fpdfapi/fpdf_page/cpdf_colorstate.h +++ b/core/fpdfapi/fpdf_page/cpdf_colorstate.h @@ -8,8 +8,8 @@ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATE_H_ #include "core/fpdfapi/fpdf_page/cpdf_colorstatedata.h" -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Color; class CPDF_ColorSpace; diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h b/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h index 304410b553..319fea51ae 100644 --- a/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h +++ b/core/fpdfapi/fpdf_page/cpdf_colorstatedata.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATEDATA_H_ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATEDATA_H_ +#include "core/fxcrt/include/fx_system.h" #include "core/include/fpdfapi/fpdf_resource.h" -#include "core/include/fxcrt/fx_system.h" class CPDF_ColorStateData { public: diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmark.h b/core/fpdfapi/fpdf_page/cpdf_contentmark.h index 35e4a9664b..056edc23a8 100644 --- a/core/fpdfapi/fpdf_page/cpdf_contentmark.h +++ b/core/fpdfapi/fpdf_page/cpdf_contentmark.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARK_H_ #include "core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_ContentMark : public CFX_CountRef<CPDF_ContentMarkData> { public: diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h b/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h index 4cf859fda9..773fea741b 100644 --- a/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h +++ b/core/fpdfapi/fpdf_page/cpdf_contentmarkdata.h @@ -10,7 +10,7 @@ #include <vector> #include "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h b/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h index 0a9ca1a04b..f46592d0a7 100644 --- a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h +++ b/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_ -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_page/cpdf_parseoptions.h b/core/fpdfapi/fpdf_page/cpdf_parseoptions.h index cd1bb69948..3d091ab7cf 100644 --- a/core/fpdfapi/fpdf_page/cpdf_parseoptions.h +++ b/core/fpdfapi/fpdf_page/cpdf_parseoptions.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PARSEOPTIONS_H_ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_PARSEOPTIONS_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_ParseOptions { public: diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.h b/core/fpdfapi/fpdf_page/cpdf_textstate.h index 8530322aeb..cfb4b28a21 100644 --- a/core/fpdfapi/fpdf_page/cpdf_textstate.h +++ b/core/fpdfapi/fpdf_page/cpdf_textstate.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_ #include "core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_Font; diff --git a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp index 4bf7c06a7b..cea7d6b8e7 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_func.cpp @@ -15,7 +15,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h" -#include "core/include/fxcrt/fx_safe_types.h" +#include "core/fxcrt/include/fx_safe_types.h" #include "third_party/base/numerics/safe_conversions_impl.h" namespace { diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index 87ed09735a..c0d7c08ee1 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -24,9 +24,9 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h" #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/include/fx_safe_types.h" #include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fxcrt/fx_safe_types.h" CPDF_StreamParser::CPDF_StreamParser(const uint8_t* pData, FX_DWORD dwSize) { m_pBuf = pData; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h index 4631e8266a..e265cd4ce0 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_clippath.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_clippath.h @@ -9,9 +9,9 @@ #include "core/fpdfapi/fpdf_page/cpdf_clippathdata.h" #include "core/fpdfapi/fpdf_page/include/cpdf_path.h" -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_TextObject; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_formobject.h b/core/fpdfapi/fpdf_page/include/cpdf_formobject.h index 47d40e0e8b..234cd73328 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_formobject.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_formobject.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_FORMOBJECT_H_ #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h" -#include "core/include/fxcrt/fx_coordinates.h" +#include "core/fxcrt/include/fx_coordinates.h" class Form; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h b/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h index 3495b6c3ff..ab1e940089 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_generalstate.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_GENERALSTATE_H_ #include "core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_GeneralState : public CFX_CountRef<CPDF_GeneralStateData> { public: diff --git a/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h b/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h index f2e5510ccc..df7560289c 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_generalstatedata.h @@ -7,9 +7,9 @@ #ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_GENERALSTATEDATA_H_ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_GENERALSTATEDATA_H_ -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" #include "core/include/fxge/fx_dib.h" class CPDF_TransferFunc; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h b/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h index dec60c9d9b..9b983cc05c 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_imageobject.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_IMAGEOBJECT_H_ #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h" -#include "core/include/fxcrt/fx_coordinates.h" +#include "core/fxcrt/include/fx_coordinates.h" class CPDF_Image; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_page.h b/core/fpdfapi/fpdf_page/include/cpdf_page.h index 5e27ba2ec7..3ede3c9404 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_page.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_page.h @@ -8,9 +8,9 @@ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PAGE_H_ #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h" -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Document; class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h b/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h index 2f55547b47..8e7da81e90 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_pageobject.h @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_page/cpdf_contentmark.h" #include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_TextObject; class CPDF_PathObject; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h b/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h index b0ab376956..7ac9f2cea0 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h @@ -8,8 +8,8 @@ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PAGEOBJECTHOLDER_H_ #include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class IFX_Pause; class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_path.h b/core/fpdfapi/fpdf_page/include/cpdf_path.h index a90115486a..f13b2719b9 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_path.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_path.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_PATH_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #include "core/include/fxge/fx_ge.h" class CPDF_Path : public CFX_CountRef<CFX_PathData> { diff --git a/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h b/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h index 30df0c2937..296cdf8317 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_pathobject.h @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h" #include "core/fpdfapi/fpdf_page/include/cpdf_path.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_PathObject : public CPDF_PageObject { public: diff --git a/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h b/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h index f43a1e3a4f..ae2ee90083 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_shadingobject.h @@ -8,7 +8,7 @@ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_SHADINGOBJECT_H_ #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h" -#include "core/include/fxcrt/fx_coordinates.h" +#include "core/fxcrt/include/fx_coordinates.h" class CPDF_ShadingPattern; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_textobject.h b/core/fpdfapi/fpdf_page/include/cpdf_textobject.h index 9aaa2f0160..bb268c1446 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_textobject.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_textobject.h @@ -8,8 +8,8 @@ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_TEXTOBJECT_H_ #include "core/fpdfapi/fpdf_page/include/cpdf_pageobject.h" -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" struct CPDF_TextObjectItem { FX_DWORD m_CharCode; diff --git a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h index 1fcc1fe8c2..feed1a043f 100644 --- a/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h +++ b/core/fpdfapi/fpdf_page/include/cpdf_textstatedata.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_TEXTSTATEDATA_H_ #define CORE_FPDFAPI_FPDF_PAGE_INCLUDE_CPDF_TEXTSTATEDATA_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Font; class CPDF_Document; diff --git a/core/fpdfapi/fpdf_parser/cpdf_boolean.h b/core/fpdfapi/fpdf_parser/cpdf_boolean.h index 9a35153a20..c92bf41b86 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_boolean.h +++ b/core/fpdfapi/fpdf_parser/cpdf_boolean.h @@ -8,8 +8,8 @@ #define CORE_FPDFAPI_FPDF_PARSER_CPDF_BOOLEAN_H_ #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Boolean : public CPDF_Object { public: diff --git a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp index 1f7f70fa91..c5576ae8e2 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp @@ -16,8 +16,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_reference.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fxcrt/fx_safe_types.h" +#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/include/fx_safe_types.h" #include "third_party/base/stl_util.h" IPDF_DataAvail::IPDF_DataAvail(IPDF_DataAvail::FileAvail* pFileAvail, diff --git a/core/fpdfapi/fpdf_parser/cpdf_data_avail.h b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h index c30093dd58..4c8d3719ff 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_data_avail.h +++ b/core/fpdfapi/fpdf_parser/cpdf_data_avail.h @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h" #include "core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_Dictionary; class CPDF_IndirectObjectHolder; diff --git a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp index 166c68d51a..0dd869210e 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp @@ -11,7 +11,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" -#include "core/include/fxcrt/fx_safe_types.h" +#include "core/fxcrt/include/fx_safe_types.h" namespace { diff --git a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h index 325f57611f..3271f5e1ec 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h +++ b/core/fpdfapi/fpdf_parser/cpdf_hint_tables.h @@ -10,8 +10,8 @@ #include <vector> #include "core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h" -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_stream.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_stream.h" class CFX_BitStream; class CPDF_DataAvail; diff --git a/core/fpdfapi/fpdf_parser/cpdf_object.cpp b/core/fpdfapi/fpdf_parser/cpdf_object.cpp index ad00cc113b..9a190a7308 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_object.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_object.cpp @@ -13,7 +13,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h" #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h" -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_string.h" #include "third_party/base/stl_util.h" CPDF_Object::~CPDF_Object() {} diff --git a/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp index 529b6c4fd3..84ad7cfc32 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp @@ -17,7 +17,7 @@ #include <vector> #include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/core/fpdfapi/fpdf_parser/cpdf_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp index 3ee53e6cf9..e9896d8099 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_parser.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_parser.cpp @@ -19,8 +19,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h" -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fxcrt/fx_safe_types.h" +#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/include/fx_safe_types.h" #include "third_party/base/stl_util.h" namespace { diff --git a/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp index dc4d757120..7a08511e81 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp @@ -7,8 +7,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h" -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fxcrt/fx_stream.h" +#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/include/fx_stream.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/utils/path_service.h" diff --git a/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp index cfb0b33279..67287dfd5a 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp @@ -7,7 +7,7 @@ #include <string> #include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/test_support.h" diff --git a/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h b/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h index 7acaabcaef..8c1629c486 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h +++ b/core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h @@ -8,8 +8,8 @@ #define CORE_FPDFAPI_FPDF_PARSER_CPDF_STANDARD_SECURITY_HANDLER_H_ #include "core/fpdfapi/fpdf_parser/ipdf_security_handler.h" -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Array; diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp index 9e5cb9d38a..00e2ee6a13 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp @@ -21,7 +21,7 @@ #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h" #include "core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" -#include "core/include/fxcrt/fx_ext.h" +#include "core/fxcrt/include/fx_ext.h" #include "third_party/base/numerics/safe_math.h" namespace { diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h index 842b35f8f2..2e613d5cd9 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h +++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h @@ -9,7 +9,7 @@ #include <memory> -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_Dictionary; class CPDF_IndirectObjectHolder; diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp index 53a01e0224..bfb6ead563 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp @@ -7,8 +7,8 @@ #include "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_parser.h" -#include "core/include/fxcrt/fx_ext.h" -#include "core/include/fxcrt/fx_stream.h" +#include "core/fxcrt/include/fx_ext.h" +#include "core/fxcrt/include/fx_stream.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/utils/path_service.h" diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp index 75ff11c60c..e6f531da53 100644 --- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp @@ -13,8 +13,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fxcrt/include/fx_ext.h" #include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxcrt/fx_ext.h" #include "third_party/base/stl_util.h" #define _STREAM_MAX_SIZE_ 20 * 1024 * 1024 diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp index 9e8d3344c3..4fd26b9153 100644 --- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp +++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp @@ -7,7 +7,7 @@ #include <cstring> #include <string> -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" #include "testing/embedder_test.h" #include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp index ffd4388dcc..a4cc85ae7d 100644 --- a/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp +++ b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp @@ -14,7 +14,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h" #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h" -#include "core/include/fxcrt/fx_ext.h" +#include "core/fxcrt/include/fx_ext.h" // Indexed by 8-bit character code, contains either: // 'W' - for whitespace: NUL, TAB, CR, LF, FF, SPACE, 0x80, 0xff diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h index d0410eec98..d072fbc191 100644 --- a/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h +++ b/core/fpdfapi/fpdf_parser/fpdf_parser_utility.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_ #define CORE_FPDFAPI_FPDF_PARSER_FPDF_PARSER_UTILITY_H_ -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" class IFX_FileRead; class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_parser/include/cfdf_document.h b/core/fpdfapi/fpdf_parser/include/cfdf_document.h index bd68789a14..f01039cd4e 100644 --- a/core/fpdfapi/fpdf_parser/include/cfdf_document.h +++ b/core/fpdfapi/fpdf_parser/include/cfdf_document.h @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_array.h b/core/fpdfapi/fpdf_parser/include/cpdf_array.h index a166454eba..2ee7760a77 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_array.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_array.h @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_coordinates.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_coordinates.h" class CPDF_Array : public CPDF_Object { public: diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h b/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h index 896db62cc2..ebc5cee90a 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h @@ -10,8 +10,8 @@ #include <map> #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_string.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_string.h" class CPDF_IndirectObjectHolder; diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_document.h b/core/fpdfapi/fpdf_parser/include/cpdf_document.h index 56e41b4328..02a55dd455 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_document.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_document.h @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CFX_Font; class CFX_Matrix; diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h b/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h index 9fa6770c90..373159d060 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_indirect_object_holder.h @@ -9,7 +9,7 @@ #include <map> -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Object; class CPDF_Parser; diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_number.h b/core/fpdfapi/fpdf_parser/include/cpdf_number.h index 89586352f6..7b93a992b1 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_number.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_number.h @@ -8,8 +8,8 @@ #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_NUMBER_H_ #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Number : public CPDF_Object { public: diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_object.h b/core/fpdfapi/fpdf_parser/include/cpdf_object.h index 9149510536..cc461d6218 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_object.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_object.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_OBJECT_H_ #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_OBJECT_H_ -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Array; class CPDF_Boolean; diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_parser.h b/core/fpdfapi/fpdf_parser/include/cpdf_parser.h index d5c5216b9c..933ab1c7fa 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_parser.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_parser.h @@ -11,7 +11,7 @@ #include <memory> #include <set> -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_Array; class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h b/core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h index a2a39f10ea..0bd3b8daac 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_simple_parser.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_SIMPLE_PARSER_H_ #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_SIMPLE_PARSER_H_ -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_SimpleParser { public: diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_stream.h b/core/fpdfapi/fpdf_parser/include/cpdf_stream.h index 43853839a1..20045d7aa2 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_stream.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_stream.h @@ -9,7 +9,7 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" -#include "core/include/fxcrt/fx_stream.h" +#include "core/fxcrt/include/fx_stream.h" class CPDF_Stream : public CPDF_Object { public: diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h b/core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h index 6920579c8e..8fad265a75 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h @@ -9,8 +9,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h" #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h" -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_StreamAcc { public: diff --git a/core/fpdfapi/fpdf_parser/include/cpdf_string.h b/core/fpdfapi/fpdf_parser/include/cpdf_string.h index 088fe6e28d..77e41ecd6a 100644 --- a/core/fpdfapi/fpdf_parser/include/cpdf_string.h +++ b/core/fpdfapi/fpdf_parser/include/cpdf_string.h @@ -8,8 +8,8 @@ #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_CPDF_STRING_H_ #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h" -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_String : public CPDF_Object { public: diff --git a/core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h b/core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h index 6904099b52..4a1d66cabb 100644 --- a/core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h +++ b/core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_FPDF_PARSER_DECODE_H_ #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_FPDF_PARSER_DECODE_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h b/core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h index 90d137c34a..d92c06d0cd 100644 --- a/core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h +++ b/core/fpdfapi/fpdf_parser/include/ipdf_data_avail.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFAPI_FPDF_PARSER_INCLUDE_IPDF_DATA_AVAIL_H_ #define CORE_FPDFAPI_FPDF_PARSER_INCLUDE_IPDF_DATA_AVAIL_H_ -#include "core/include/fxcrt/fx_stream.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_stream.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Document; class CPDF_Object; diff --git a/core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h b/core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h index a1000760f3..8e83589a16 100644 --- a/core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h +++ b/core/fpdfapi/fpdf_parser/ipdf_crypto_handler.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_PARSER_IPDF_CRYPTO_HANDLER_H_ #define CORE_FPDFAPI_FPDF_PARSER_IPDF_CRYPTO_HANDLER_H_ -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CPDF_Dictionary; class IPDF_SecurityHandler; diff --git a/core/fpdfapi/fpdf_parser/ipdf_occontext.h b/core/fpdfapi/fpdf_parser/ipdf_occontext.h index 6c410037e2..0108787342 100644 --- a/core/fpdfapi/fpdf_parser/ipdf_occontext.h +++ b/core/fpdfapi/fpdf_parser/ipdf_occontext.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_PARSER_IPDF_OCCONTEXT_H_ #define CORE_FPDFAPI_FPDF_PARSER_IPDF_OCCONTEXT_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Dictionary; class CPDF_PageObject; diff --git a/core/fpdfapi/fpdf_parser/ipdf_security_handler.h b/core/fpdfapi/fpdf_parser/ipdf_security_handler.h index c73c4c5081..fd70b1fac6 100644 --- a/core/fpdfapi/fpdf_parser/ipdf_security_handler.h +++ b/core/fpdfapi/fpdf_parser/ipdf_security_handler.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_PARSER_IPDF_SECURITY_HANDLER_H_ #define CORE_FPDFAPI_FPDF_PARSER_IPDF_SECURITY_HANDLER_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Parser; class CPDF_Dictionary; diff --git a/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h b/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h index 26d71efcab..578700c30d 100644 --- a/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h +++ b/core/fpdfapi/fpdf_render/cpdf_pagerendercache.h @@ -9,7 +9,7 @@ #include <map> -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_Stream; class CPDF_ImageCacheEntry; diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp index e16016445e..bda2a4469f 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -21,8 +21,8 @@ #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h" #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h" +#include "core/fxcrt/include/fx_safe_types.h" #include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxcrt/fx_safe_types.h" #include "core/include/fxge/fx_ge.h" FX_BOOL CPDF_RenderStatus::ProcessImage(const CPDF_ImageObject* pImageObj, diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 193d0874f1..5c4f7f593c 100644 --- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -18,8 +18,8 @@ #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h" #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h" #include "core/fpdfapi/include/cpdf_modulemgr.h" +#include "core/fxcrt/include/fx_safe_types.h" #include "core/include/fxcodec/fx_codec.h" -#include "core/include/fxcrt/fx_safe_types.h" #include "core/include/fxge/fx_ge.h" namespace { diff --git a/core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h b/core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h index e5c0d9d6d8..11ece71406 100644 --- a/core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h +++ b/core/fpdfapi/fpdf_render/include/cpdf_progressiverenderer.h @@ -11,8 +11,8 @@ #include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h" #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h" -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_system.h" class CPDF_RenderOptions; class CPDF_RenderStatus; diff --git a/core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h b/core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h index 4c55658163..b2566ad007 100644 --- a/core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h +++ b/core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h @@ -7,8 +7,8 @@ #ifndef CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_RENDERCONTEXT_H_ #define CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_RENDERCONTEXT_H_ -#include "core/include/fxcrt/fx_basic.h" -#include "core/include/fxcrt/fx_coordinates.h" +#include "core/fxcrt/include/fx_basic.h" +#include "core/fxcrt/include/fx_coordinates.h" class CPDF_Dictionary; class CPDF_Document; diff --git a/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h b/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h index c0911e7cd2..f28fae4f3d 100644 --- a/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h +++ b/core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h @@ -7,7 +7,7 @@ #ifndef CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_RENDEROPTIONS_H_ #define CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_RENDEROPTIONS_H_ -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_system.h" #include "core/include/fxge/fx_dib.h" class IPDF_OCContext; diff --git a/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h b/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h index 1cf67cd2f2..7c04e4a705 100644 --- a/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h +++ b/core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h @@ -7,9 +7,9 @@ #ifndef CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_TEXTRENDERER_H_ #define CORE_FPDFAPI_FPDF_RENDER_INCLUDE_CPDF_TEXTRENDERER_H_ -#include "core/include/fxcrt/fx_coordinates.h" -#include "core/include/fxcrt/fx_string.h" -#include "core/include/fxcrt/fx_system.h" +#include "core/fxcrt/include/fx_coordinates.h" +#include "core/fxcrt/include/fx_string.h" +#include "core/fxcrt/include/fx_system.h" #include "core/include/fxge/fx_dib.h" class CFX_RenderDevice; diff --git a/core/fpdfapi/include/cpdf_modulemgr.h b/core/fpdfapi/include/cpdf_modulemgr.h index 5449b082c6..a8be5af7dd 100644 --- a/core/fpdfapi/include/cpdf_modulemgr.h +++ b/core/fpdfapi/include/cpdf_modulemgr.h @@ -10,7 +10,7 @@ #include <memory> #include "core/fpdfapi/ipdf_pagemodule.h" -#include "core/include/fxcrt/fx_basic.h" +#include "core/fxcrt/include/fx_basic.h" class CCodec_ModuleMgr; class ICodec_FaxModule; |