From 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 5 Nov 2015 18:39:40 -0800 Subject: Fix all relative includes to third_party. - In non-standalone builds, use the provided jpeg library. - Run gn format over all the GN files. - Also roll DEPS for buildtools to c2f2598. BUG=541704 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1425153006 . --- core/include/fpdfapi/fpdf_module.h | 2 +- core/include/fpdfapi/fpdf_parser.h | 2 +- core/include/fpdfapi/fpdf_render.h | 2 +- core/include/fpdfdoc/fpdf_doc.h | 2 +- core/include/fxcodec/fx_codec.h | 2 +- core/include/fxcodec/fx_codec_flate.h | 2 +- core/include/fxcrt/fx_safe_types.h | 2 +- core/include/fxcrt/fx_system.h | 2 +- core/include/fxge/fx_font.h | 2 +- core/src/fpdfapi/fpdf_font/ttgsubtable.cpp | 4 ++-- core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp | 4 ++-- core/src/fpdfapi/fpdf_page/pageint.h | 2 +- core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp | 4 ++-- .../src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp | 2 +- core/src/fpdfapi/fpdf_render/render_int.h | 2 +- core/src/fpdfdoc/doc_annot.cpp | 4 ++-- core/src/fpdfdoc/doc_bookmark.cpp | 2 +- core/src/fpdftext/fpdf_text.cpp | 2 +- core/src/fpdftext/fpdf_text_int.cpp | 2 +- core/src/fxcodec/DEPS | 6 ++++-- core/src/fxcodec/codec/codec_int.h | 4 ++-- core/src/fxcodec/codec/fx_codec.cpp | 2 +- core/src/fxcodec/codec/fx_codec_flate.cpp | 4 ++-- core/src/fxcodec/codec/fx_codec_icc.cpp | 2 +- core/src/fxcodec/codec/fx_codec_jpeg.cpp | 8 +++++++- core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 4 ++-- core/src/fxcodec/jbig2/JBig2_Context.h | 2 +- core/src/fxcodec/jbig2/JBig2_GrdProc.cpp | 2 +- core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp | 2 +- core/src/fxcodec/jbig2/JBig2_GsidProc.cpp | 2 +- core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp | 2 +- core/src/fxcodec/jbig2/JBig2_PddProc.cpp | 2 +- core/src/fxcodec/jbig2/JBig2_SddProc.cpp | 4 ++-- core/src/fxcodec/jbig2/JBig2_SymbolDict.h | 2 +- core/src/fxcodec/jbig2/JBig2_TrdProc.cpp | 4 ++-- core/src/fxcrt/fx_basic_array.cpp | 2 +- core/src/fxcrt/fx_basic_bstring.cpp | 2 +- core/src/fxcrt/fx_basic_wstring.cpp | 2 +- core/src/fxge/agg/include/fx_agg_driver.h | 6 +++--- core/src/fxge/agg/src/fx_agg_driver.cpp | 19 ++++++++++--------- core/src/fxge/freetype/fx_freetype.c | 2 +- core/src/fxge/ge/fx_ge_path.cpp | 2 +- 42 files changed, 71 insertions(+), 62 deletions(-) (limited to 'core') diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h index 2f88644041..e9c38306b7 100644 --- a/core/include/fpdfapi/fpdf_module.h +++ b/core/include/fpdfapi/fpdf_module.h @@ -7,9 +7,9 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_MODULE_H_ -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_coordinates.h" #include "../fxcrt/fx_system.h" +#include "third_party/base/nonstd_unique_ptr.h" class CCodec_ModuleMgr; class CFX_AffineMatrix; diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index d1f50038a7..2937d05938 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -7,9 +7,9 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_PARSER_H_ -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_system.h" #include "fpdf_objects.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFDF_Document; class CFDF_Parser; diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h index 7a5251e86e..1726988dd8 100644 --- a/core/include/fpdfapi/fpdf_render.h +++ b/core/include/fpdfapi/fpdf_render.h @@ -7,9 +7,9 @@ #ifndef CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_ #define CORE_INCLUDE_FPDFAPI_FPDF_RENDER_H_ -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxge/fx_ge.h" #include "fpdf_page.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFX_GraphStateData; class CFX_PathData; diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h index a86ae62610..cffb32bc20 100644 --- a/core/include/fpdfdoc/fpdf_doc.h +++ b/core/include/fpdfdoc/fpdf_doc.h @@ -10,9 +10,9 @@ #include #include -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fpdfapi/fpdf_parser.h" #include "../fpdfapi/fpdf_render.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFieldTree; class CPDF_AAction; diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index 1d5bd78ac4..d8c66d9d65 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -9,9 +9,9 @@ #include -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_basic.h" #include "fx_codec_def.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFX_DIBSource; class CJPX_Decoder; diff --git a/core/include/fxcodec/fx_codec_flate.h b/core/include/fxcodec/fx_codec_flate.h index 7d0106139e..eaecef49ca 100644 --- a/core/include/fxcodec/fx_codec_flate.h +++ b/core/include/fxcodec/fx_codec_flate.h @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../third_party/zlib_v128/zlib.h" +#include "third_party/zlib_v128/zlib.h" #ifdef __cplusplus extern "C" { diff --git a/core/include/fxcrt/fx_safe_types.h b/core/include/fxcrt/fx_safe_types.h index ee50a53e34..d10bdbeb1a 100644 --- a/core/include/fxcrt/fx_safe_types.h +++ b/core/include/fxcrt/fx_safe_types.h @@ -7,9 +7,9 @@ #include // For size_t. -#include "../../../third_party/base/numerics/safe_math.h" #include "fx_stream.h" // for FX_FILESIZE. #include "fx_system.h" +#include "third_party/base/numerics/safe_math.h" typedef pdfium::base::CheckedNumeric FX_SAFE_DWORD; typedef pdfium::base::CheckedNumeric FX_SAFE_INT32; diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 53789581d7..5fe3453626 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -160,7 +160,7 @@ FXSYS_FILE* FXSYS_wfopen(const FX_WCHAR* filename, const FX_WCHAR* mode); #ifdef __cplusplus } // extern "C" -#include "../../../third_party/base/numerics/safe_conversions.h" +#include "third_party/base/numerics/safe_conversions.h" #define FXSYS_strlen(ptr) pdfium::base::checked_cast(strlen(ptr)) #define FXSYS_wcslen(ptr) pdfium::base::checked_cast(wcslen(ptr)) extern "C" { diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h index 8c2416e6e0..3e4ca95299 100644 --- a/core/include/fxge/fx_font.h +++ b/core/include/fxge/fx_font.h @@ -9,9 +9,9 @@ #include -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../fxcrt/fx_system.h" #include "fx_dib.h" +#include "third_party/base/nonstd_unique_ptr.h" typedef struct FT_FaceRec_* FXFT_Face; typedef void* FXFT_Library; diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp index 6c1b4263b1..1ee25995c2 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../include/fxge/fx_ge.h" #include "../../../include/fxge/fx_freetype.h" +#include "../../../include/fxge/fx_ge.h" +#include "third_party/base/nonstd_unique_ptr.h" #include "ttgsubtable.h" CFX_GlyphMap::CFX_GlyphMap() {} diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp index e6268037b7..0b9f043eb2 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp @@ -7,12 +7,12 @@ #include #include -#include "../../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../../third_party/base/numerics/safe_conversions_impl.h" #include "../../../include/fpdfapi/fpdf_module.h" #include "../../../include/fpdfapi/fpdf_page.h" #include "../../../include/fxcrt/fx_safe_types.h" #include "pageint.h" +#include "third_party/base/nonstd_unique_ptr.h" +#include "third_party/base/numerics/safe_conversions_impl.h" class CPDF_PSEngine; typedef enum { diff --git a/core/src/fpdfapi/fpdf_page/pageint.h b/core/src/fpdfapi/fpdf_page/pageint.h index e787d6973a..3b2aef55af 100644 --- a/core/src/fpdfapi/fpdf_page/pageint.h +++ b/core/src/fpdfapi/fpdf_page/pageint.h @@ -9,9 +9,9 @@ #include -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fpdfapi/fpdf_page.h" #include "../../../include/fpdfapi/fpdf_pageobj.h" +#include "third_party/base/nonstd_unique_ptr.h" class CPDF_AllStates; class CPDF_ParseOptions; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 7db97d25b3..4393bfbfe8 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -8,14 +8,14 @@ #include #include -#include "../../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../../third_party/base/stl_util.h" #include "../../../include/fpdfapi/fpdf_module.h" #include "../../../include/fpdfapi/fpdf_page.h" #include "../../../include/fpdfapi/fpdf_parser.h" #include "../../../include/fxcrt/fx_safe_types.h" #include "../fpdf_page/pageint.h" #include "parser_int.h" +#include "third_party/base/nonstd_unique_ptr.h" +#include "third_party/base/stl_util.h" namespace { diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 6af3ab4ce6..ea8ceee9d3 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -6,7 +6,6 @@ #include -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fpdfapi/fpdf_module.h" #include "../../../include/fpdfapi/fpdf_pageobj.h" #include "../../../include/fpdfapi/fpdf_render.h" @@ -15,6 +14,7 @@ #include "../../../include/fxge/fx_ge.h" #include "../fpdf_page/pageint.h" #include "render_int.h" +#include "third_party/base/nonstd_unique_ptr.h" namespace { diff --git a/core/src/fpdfapi/fpdf_render/render_int.h b/core/src/fpdfapi/fpdf_render/render_int.h index c97cb7105d..a0eda2858e 100644 --- a/core/src/fpdfapi/fpdf_render/render_int.h +++ b/core/src/fpdfapi/fpdf_render/render_int.h @@ -9,8 +9,8 @@ #include -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fpdfapi/fpdf_pageobj.h" +#include "third_party/base/nonstd_unique_ptr.h" class CFX_GlyphBitmap; class CPDF_QuickStretcher; diff --git a/core/src/fpdfdoc/doc_annot.cpp b/core/src/fpdfdoc/doc_annot.cpp index ae253a086a..e69ea80a35 100644 --- a/core/src/fpdfdoc/doc_annot.cpp +++ b/core/src/fpdfdoc/doc_annot.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../third_party/base/nonstd_unique_ptr.h" -#include "../../include/fpdfdoc/fpdf_doc.h" #include "../../include/fpdfapi/fpdf_pageobj.h" +#include "../../include/fpdfdoc/fpdf_doc.h" +#include "third_party/base/nonstd_unique_ptr.h" CPDF_AnnotList::CPDF_AnnotList(CPDF_Page* pPage) : m_pDocument(pPage->m_pDocument) { diff --git a/core/src/fpdfdoc/doc_bookmark.cpp b/core/src/fpdfdoc/doc_bookmark.cpp index 5ebd27e6e7..c5cbfd8d2e 100644 --- a/core/src/fpdfdoc/doc_bookmark.cpp +++ b/core/src/fpdfdoc/doc_bookmark.cpp @@ -6,8 +6,8 @@ #include -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fpdfdoc/fpdf_doc.h" +#include "third_party/base/nonstd_unique_ptr.h" CPDF_Bookmark CPDF_BookmarkTree::GetFirstChild( const CPDF_Bookmark& parent) const { diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 9ecbc21bda..d5ea24f25c 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -4,7 +4,6 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fpdfapi/fpdf_page.h" #include "../../include/fpdfapi/fpdf_pageobj.h" #include "../../include/fpdfapi/fpdf_resource.h" @@ -12,6 +11,7 @@ #include "../../include/fxcrt/fx_bidi.h" #include "../../include/fxcrt/fx_ucd.h" #include "text_int.h" +#include "third_party/base/nonstd_unique_ptr.h" #include "txtproc.h" CFX_ByteString CharFromUnicodeAlt(FX_WCHAR unicode, diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index 9ab09e19e4..1b25993f37 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -7,7 +7,6 @@ #include #include -#include "../../../third_party/base/nonstd_unique_ptr.h" #include "../../include/fpdfapi/fpdf_module.h" #include "../../include/fpdfapi/fpdf_page.h" #include "../../include/fpdfapi/fpdf_pageobj.h" @@ -16,6 +15,7 @@ #include "../../include/fxcrt/fx_bidi.h" #include "../../include/fxcrt/fx_ucd.h" #include "text_int.h" +#include "third_party/base/nonstd_unique_ptr.h" namespace { diff --git a/core/src/fxcodec/DEPS b/core/src/fxcodec/DEPS index 48eaa048e0..a88b3294a9 100644 --- a/core/src/fxcodec/DEPS +++ b/core/src/fxcodec/DEPS @@ -1,6 +1,8 @@ include_rules = [ '+third_party/lcms2-2.6', - '+third_party/libjpeg', + '+third_party/libjpeg/jpeglib.h', + # For non-standalone builds that may use libjpeg_turbo. + '+third_party/libjpeg_turbo/jpeglib.h', '+third_party/libopenjpeg20', '+third_party/zlib_v128', -] \ No newline at end of file +] diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index 1fd228996d..baf06d60a1 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -11,10 +11,10 @@ #include #include -#include "../../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../../third_party/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. #include "../../../include/fxcodec/fx_codec.h" #include "../jbig2/JBig2_Context.h" +#include "third_party/base/nonstd_unique_ptr.h" +#include "third_party/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. class CFX_IccProfileCache; class CFX_IccTransformCache; diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp index 46f479e0b1..2f3bd7a6da 100644 --- a/core/src/fxcodec/codec/fx_codec.cpp +++ b/core/src/fxcodec/codec/fx_codec.cpp @@ -8,9 +8,9 @@ #include -#include "../../../../third_party/base/logging.h" #include "../../../include/fxcrt/fx_safe_types.h" #include "codec_int.h" +#include "third_party/base/logging.h" CCodec_ModuleMgr::CCodec_ModuleMgr() : m_pBasicModule(new CCodec_BasicModule), diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp index 519ff00522..d4e56bf000 100644 --- a/core/src/fxcodec/codec/fx_codec_flate.cpp +++ b/core/src/fxcodec/codec/fx_codec_flate.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../../third_party/zlib_v128/zlib.h" #include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fxcodec/fx_codec_flate.h" #include "codec_int.h" +#include "third_party/base/nonstd_unique_ptr.h" +#include "third_party/zlib_v128/zlib.h" extern "C" { static void* my_alloc_func(void* opaque, diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp index 2a8ccc364c..67e3d6422e 100644 --- a/core/src/fxcodec/codec/fx_codec_icc.cpp +++ b/core/src/fxcodec/codec/fx_codec_icc.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../third_party/lcms2-2.6/include/lcms2.h" #include "../../../include/fxcodec/fx_codec.h" #include "codec_int.h" +#include "third_party/lcms2-2.6/include/lcms2.h" const FX_DWORD N_COMPONENT_LAB = 3; const FX_DWORD N_COMPONENT_GRAY = 1; diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 544a6d14cf..925864f2e2 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -13,7 +13,13 @@ extern "C" { #undef FAR -#include "../../../../third_party/libjpeg/jpeglib.h" +#if defined(USE_SYSTEM_LIBJPEG) +#include +#elif defined(USE_LIBJPEG_TURBO) +#include "third_party/libjpeg_turbo/jpeglib.h" +#else +#include "third_party/libjpeg/jpeglib.h" +#endif } extern "C" { diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index 616af36b00..02efdb73b9 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -8,11 +8,11 @@ #include #include -#include "../../../../third_party/lcms2-2.6/include/lcms2.h" -#include "../../../../third_party/libopenjpeg20/openjpeg.h" #include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fxcrt/fx_safe_types.h" #include "codec_int.h" +#include "third_party/lcms2-2.6/include/lcms2.h" +#include "third_party/libopenjpeg20/openjpeg.h" static void fx_error_callback(const char* msg, void* client_data) { (void)client_data; diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h index 61379fe2ff..a98d7a98ca 100644 --- a/core/src/fxcodec/jbig2/JBig2_Context.h +++ b/core/src/fxcodec/jbig2/JBig2_Context.h @@ -10,12 +10,12 @@ #include #include -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fpdfapi/fpdf_objects.h" #include "../../../include/fxcodec/fx_codec_def.h" #include "JBig2_List.h" #include "JBig2_Page.h" #include "JBig2_Segment.h" +#include "third_party/base/nonstd_unique_ptr.h" class CJBig2_ArithDecoder; class CJBig2_GRDProc; diff --git a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp index eda76bbce9..083ac5e186 100644 --- a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp @@ -6,11 +6,11 @@ #include "JBig2_GrdProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxcodec/fx_codec.h" #include "JBig2_ArithDecoder.h" #include "JBig2_BitStream.h" #include "JBig2_Image.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_GRDProc::CJBig2_GRDProc() : m_loopIndex(0), diff --git a/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp index 916683c8aa..549669a72f 100644 --- a/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp @@ -6,10 +6,10 @@ #include "JBig2_GrrdProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "JBig2_ArithDecoder.h" #include "JBig2_BitStream.h" #include "JBig2_Image.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_Image* CJBig2_GRRDProc::decode(CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* grContext) { diff --git a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp b/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp index 5f423c4b04..ee43cdba5e 100644 --- a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp @@ -6,12 +6,12 @@ #include "JBig2_GsidProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxcrt/fx_basic.h" #include "JBig2_BitStream.h" #include "JBig2_GrdProc.h" #include "JBig2_Image.h" #include "JBig2_List.h" +#include "third_party/base/nonstd_unique_ptr.h" FX_DWORD* CJBig2_GSIDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* gbContext, diff --git a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp index a5a8b7abfe..d9768345a0 100644 --- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp @@ -6,9 +6,9 @@ #include "JBig2_HtrdProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxcrt/fx_basic.h" #include "JBig2_GsidProc.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_Image* CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* gbContext, diff --git a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp b/core/src/fxcodec/jbig2/JBig2_PddProc.cpp index 56443a01d2..fbe9e4b17f 100644 --- a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_PddProc.cpp @@ -6,10 +6,10 @@ #include "JBig2_PddProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "JBig2_GrdProc.h" #include "JBig2_Image.h" #include "JBig2_PatternDict.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_PatternDict* CJBig2_PDDProc::decode_Arith( CJBig2_ArithDecoder* pArithDecoder, diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp index ab3b34f583..fe39e71af9 100644 --- a/core/src/fxcodec/jbig2/JBig2_SddProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_SddProc.cpp @@ -6,8 +6,6 @@ #include "JBig2_SddProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../../third_party/base/stl_util.h" #include "../../../include/fxcrt/fx_basic.h" #include "JBig2_ArithIntDecoder.h" #include "JBig2_GrdProc.h" @@ -16,6 +14,8 @@ #include "JBig2_HuffmanTable.h" #include "JBig2_SymbolDict.h" #include "JBig2_TrdProc.h" +#include "third_party/base/nonstd_unique_ptr.h" +#include "third_party/base/stl_util.h" using pdfium::vector_as_array; diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h index 6ff4c2efe2..107b282c9e 100644 --- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h +++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h @@ -9,10 +9,10 @@ #include -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "../../../include/fxcrt/fx_basic.h" #include "JBig2_ArithDecoder.h" #include "JBig2_List.h" +#include "third_party/base/nonstd_unique_ptr.h" class CJBig2_Image; diff --git a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp index 368ec9b11e..d76beea8e2 100644 --- a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp @@ -6,11 +6,11 @@ #include "JBig2_TrdProc.h" -#include "../../../../third_party/base/nonstd_unique_ptr.h" #include "JBig2_ArithDecoder.h" #include "JBig2_ArithIntDecoder.h" -#include "JBig2_HuffmanDecoder.h" #include "JBig2_GrrdProc.h" +#include "JBig2_HuffmanDecoder.h" +#include "third_party/base/nonstd_unique_ptr.h" CJBig2_Image* CJBig2_TRDProc::decode_Huffman(CJBig2_BitStream* pStream, JBig2ArithCtx* grContext) { diff --git a/core/src/fxcrt/fx_basic_array.cpp b/core/src/fxcrt/fx_basic_array.cpp index eeaa74926a..a24b78a0af 100644 --- a/core/src/fxcrt/fx_basic_array.cpp +++ b/core/src/fxcrt/fx_basic_array.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../include/fxcrt/fx_basic.h" -#include "../../../third_party/base/numerics/safe_math.h" +#include "third_party/base/numerics/safe_math.h" CFX_BasicArray::CFX_BasicArray(int unit_size) : m_pData(NULL), m_nSize(0), m_nMaxSize(0) { diff --git a/core/src/fxcrt/fx_basic_bstring.cpp b/core/src/fxcrt/fx_basic_bstring.cpp index c706912d9d..7793a0e19f 100644 --- a/core/src/fxcrt/fx_basic_bstring.cpp +++ b/core/src/fxcrt/fx_basic_bstring.cpp @@ -7,7 +7,7 @@ #include // For offsetof(). #include "../../include/fxcrt/fx_basic.h" -#include "../../../third_party/base/numerics/safe_math.h" +#include "third_party/base/numerics/safe_math.h" static int _Buffer_itoa(char* buf, int i, FX_DWORD flags) { if (i == 0) { diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index c097e1fc09..0da9f5168d 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -7,7 +7,7 @@ #include // For offsetof(). #include "../../include/fxcrt/fx_basic.h" -#include "../../../third_party/base/numerics/safe_math.h" +#include "third_party/base/numerics/safe_math.h" // static CFX_WideString::StringData* CFX_WideString::StringData::Create(int nLen) { diff --git a/core/src/fxge/agg/include/fx_agg_driver.h b/core/src/fxge/agg/include/fx_agg_driver.h index c3de76d369..c0b23dddb4 100644 --- a/core/src/fxge/agg/include/fx_agg_driver.h +++ b/core/src/fxge/agg/include/fx_agg_driver.h @@ -7,9 +7,9 @@ #ifndef FX_AGG_DRIVER_H_ #define FX_AGG_DRIVER_H_ -#include "../../../../../third_party/agg23/agg_clip_liang_barsky.h" -#include "../../../../../third_party/agg23/agg_path_storage.h" -#include "../../../../../third_party/agg23/agg_rasterizer_scanline_aa.h" +#include "third_party/agg23/agg_clip_liang_barsky.h" +#include "third_party/agg23/agg_path_storage.h" +#include "third_party/agg23/agg_rasterizer_scanline_aa.h" class CAgg_PathData { public: diff --git a/core/src/fxge/agg/src/fx_agg_driver.cpp b/core/src/fxge/agg/src/fx_agg_driver.cpp index d9783d174b..57ece1e6a1 100644 --- a/core/src/fxge/agg/src/fx_agg_driver.cpp +++ b/core/src/fxge/agg/src/fx_agg_driver.cpp @@ -4,19 +4,20 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../../include/fxcodec/fx_codec.h" #include "../../../../include/fxge/fx_ge.h" #include "../../dib/dib_int.h" #include "../../ge/text_int.h" -#include "../../../../include/fxcodec/fx_codec.h" -#include "../../../../../third_party/agg23/agg_pixfmt_gray.h" -#include "../../../../../third_party/agg23/agg_path_storage.h" -#include "../../../../../third_party/agg23/agg_scanline_u.h" -#include "../../../../../third_party/agg23/agg_rasterizer_scanline_aa.h" -#include "../../../../../third_party/agg23/agg_renderer_scanline.h" -#include "../../../../../third_party/agg23/agg_curves.h" -#include "../../../../../third_party/agg23/agg_conv_stroke.h" -#include "../../../../../third_party/agg23/agg_conv_dash.h" #include "../include/fx_agg_driver.h" +#include "third_party/agg23/agg_conv_dash.h" +#include "third_party/agg23/agg_conv_stroke.h" +#include "third_party/agg23/agg_curves.h" +#include "third_party/agg23/agg_path_storage.h" +#include "third_party/agg23/agg_pixfmt_gray.h" +#include "third_party/agg23/agg_rasterizer_scanline_aa.h" +#include "third_party/agg23/agg_renderer_scanline.h" +#include "third_party/agg23/agg_scanline_u.h" + void _HardClip(FX_FLOAT& x, FX_FLOAT& y) { if (x > 50000) { x = 50000; diff --git a/core/src/fxge/freetype/fx_freetype.c b/core/src/fxge/freetype/fx_freetype.c index 78dec9ad99..4804bc1d1b 100644 --- a/core/src/fxge/freetype/fx_freetype.c +++ b/core/src/fxge/freetype/fx_freetype.c @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "../../../include/fxge/fx_freetype.h" -#include "../../../../third_party/freetype/src/psnames/pstables.h" +#include "third_party/freetype/src/psnames/pstables.h" static int xyq_search_node(char* glyph_name, int name_offset, int table_offset, wchar_t unicode) { diff --git a/core/src/fxge/ge/fx_ge_path.cpp b/core/src/fxge/ge/fx_ge_path.cpp index 9acbcabfbf..c8e4f61ad8 100644 --- a/core/src/fxge/ge/fx_ge_path.cpp +++ b/core/src/fxge/ge/fx_ge_path.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../third_party/base/numerics/safe_math.h" #include "../../../include/fxcrt/fx_system.h" #include "../../../include/fxge/fx_ge.h" +#include "third_party/base/numerics/safe_math.h" CFX_ClipRgn::CFX_ClipRgn(int width, int height) { m_Type = RectI; -- cgit v1.2.3