From 875b9c99efdbd5fcabf0213e0d392cb2876ed26a Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 8 Jan 2016 13:51:10 -0800 Subject: XFA: Remove relative includes outside of xfa/. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1572523002 . --- core/src/fxcodec/codec/fx_codec_bmp.cpp | 6 +++--- core/src/fxcodec/codec/fx_codec_gif.cpp | 6 +++--- core/src/fxcodec/codec/fx_codec_png.cpp | 4 ++-- core/src/fxcodec/codec/fx_codec_progress.cpp | 4 ++-- core/src/fxcodec/codec/fx_codec_tiff.cpp | 4 ++-- core/src/fxcodec/lbmp/fx_bmp.h | 2 +- core/src/fxcodec/lgif/fx_gif.h | 2 +- core/src/fxcrt/fx_arabic.cpp | 2 +- core/src/fxcrt/fx_arabic.h | 2 +- fpdfsdk/include/fpdfxfa/fpdfxfa_app.h | 2 +- fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h | 2 +- fpdfsdk/include/fsdk_define.h | 10 +++++----- fpdfsdk/include/fsdk_mgr.h | 4 ++-- fpdfsdk/include/javascript/IJavaScript.h | 2 +- fpdfsdk/src/fpdf_ext.cpp | 2 +- fpdfsdk/src/fpdfeditpage.cpp | 6 +++--- fpdfsdk/src/fpdfformfill.cpp | 6 +++--- fpdfsdk/src/fpdfsave.cpp | 6 +++--- fpdfsdk/src/fpdftext.cpp | 4 ++-- fpdfsdk/src/fpdfview.cpp | 8 ++++---- fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp | 12 ++++++------ fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp | 14 +++++++------- fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp | 10 +++++----- fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp | 6 +++--- fpdfsdk/src/fsdk_annothandler.cpp | 4 ++-- fpdfsdk/src/fsdk_baseform.cpp | 4 ++-- fpdfsdk/src/fsdk_mgr.cpp | 8 ++++---- fpdfsdk/src/javascript/JS_Runtime.cpp | 4 ++-- third_party/libtiff/0000-build-config.patch | 6 ++---- third_party/libtiff/tiffconf.h | 4 +--- 30 files changed, 76 insertions(+), 80 deletions(-) diff --git a/core/src/fxcodec/codec/fx_codec_bmp.cpp b/core/src/fxcodec/codec/fx_codec_bmp.cpp index fddd076482..08b2f480df 100644 --- a/core/src/fxcodec/codec/fx_codec_bmp.cpp +++ b/core/src/fxcodec/codec/fx_codec_bmp.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxge/fx_dib.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_dib.h" #include "codec_int.h" -#include "../lbmp/fx_bmp.h" +#include "core/src/fxcodec/lbmp/fx_bmp.h" struct FXBMP_Context { bmp_decompress_struct_p bmp_ptr; void* parent_ptr; diff --git a/core/src/fxcodec/codec/fx_codec_gif.cpp b/core/src/fxcodec/codec/fx_codec_gif.cpp index a4fe3d65f9..45aeb09c41 100644 --- a/core/src/fxcodec/codec/fx_codec_gif.cpp +++ b/core/src/fxcodec/codec/fx_codec_gif.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxge/fx_dib.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_dib.h" #include "codec_int.h" -#include "../lgif/fx_gif.h" +#include "core/src/fxcodec/lgif/fx_gif.h" struct FXGIF_Context { gif_decompress_struct_p gif_ptr; void* parent_ptr; diff --git a/core/src/fxcodec/codec/fx_codec_png.cpp b/core/src/fxcodec/codec/fx_codec_png.cpp index ea9c7a5b67..6401081ea3 100644 --- a/core/src/fxcodec/codec/fx_codec_png.cpp +++ b/core/src/fxcodec/codec/fx_codec_png.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxge/fx_dib.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_dib.h" #include "codec_int.h" extern "C" { diff --git a/core/src/fxcodec/codec/fx_codec_progress.cpp b/core/src/fxcodec/codec/fx_codec_progress.cpp index 82bbee99be..383e3ed93d 100644 --- a/core/src/fxcodec/codec/fx_codec_progress.cpp +++ b/core/src/fxcodec/codec/fx_codec_progress.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_dib.h" -#include "../../../include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_dib.h" +#include "core/include/fxcodec/fx_codec.h" #include "fx_codec_progress.h" void CFXCODEC_WeightTable::Calc(int dest_len, int dest_min, diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp index 51a443bc3d..d158c0009a 100644 --- a/core/src/fxcodec/codec/fx_codec_tiff.cpp +++ b/core/src/fxcodec/codec/fx_codec_tiff.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxge/fx_dib.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_dib.h" #include "codec_int.h" extern "C" { diff --git a/core/src/fxcodec/lbmp/fx_bmp.h b/core/src/fxcodec/lbmp/fx_bmp.h index 2f05f2ca1c..d1232f1f11 100644 --- a/core/src/fxcodec/lbmp/fx_bmp.h +++ b/core/src/fxcodec/lbmp/fx_bmp.h @@ -6,7 +6,7 @@ #include -#include "../../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" #define BMP_SUPPORT_BITFIELD #define BMP_WIDTHBYTES(width, bitCount) ((width * bitCount) + 31) / 32 * 4 diff --git a/core/src/fxcodec/lgif/fx_gif.h b/core/src/fxcodec/lgif/fx_gif.h index 7e45330820..8b2acc86ae 100644 --- a/core/src/fxcodec/lgif/fx_gif.h +++ b/core/src/fxcodec/lgif/fx_gif.h @@ -6,7 +6,7 @@ #include -#include "../../../include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" extern FX_WORD _GetWord_LSBFirst(uint8_t* p); extern void _SetWord_LSBFirst(uint8_t* p, FX_WORD v); diff --git a/core/src/fxcrt/fx_arabic.cpp b/core/src/fxcrt/fx_arabic.cpp index 1869cb2008..7fb93cfe07 100644 --- a/core/src/fxcrt/fx_arabic.cpp +++ b/core/src/fxcrt/fx_arabic.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fxcrt/fx_ucd.h" +#include "core/include/fxcrt/fx_ucd.h" #include "fx_arabic.h" namespace { diff --git a/core/src/fxcrt/fx_arabic.h b/core/src/fxcrt/fx_arabic.h index 8fde73d5d9..9a1758683b 100644 --- a/core/src/fxcrt/fx_arabic.h +++ b/core/src/fxcrt/fx_arabic.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FXCRT_FX_ARABIC_H_ #define CORE_SRC_FXCRT_FX_ARABIC_H_ -#include "../../include/fxcrt/fx_arb.h" +#include "core/include/fxcrt/fx_arb.h" class CFX_ArabicChar : public IFX_ArabicChar { public: diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h index c1061a5e75..b25a9039ad 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h @@ -7,7 +7,7 @@ #ifndef FPDFXFA_APP_H_ #define FPDFXFA_APP_H_ -#include "../../../xfa/include/fxfa/fxfa.h" +#include "xfa/include/fxfa/fxfa.h" class IFXJS_Runtime; diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h index c61214371d..abe22a7be7 100644 --- a/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h +++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h @@ -7,8 +7,8 @@ #ifndef FPDFXFA_DOC_H_ #define FPDFXFA_DOC_H_ -#include "../../../xfa/include/fxfa/fxfa.h" #include "public/fpdfview.h" +#include "xfa/include/fxfa/fxfa.h" class CPDFXFA_App; class CPDFXFA_Document; diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 831e499f00..c47839b1fd 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -19,13 +19,13 @@ #include "public/fpdfview.h" #ifdef PDF_ENABLE_XFA -#include "../../xfa/include/fwl/adapter/fwl_adaptertimermgr.h" -#include "../../xfa/include/fxbarcode/BC_BarCode.h" -#include "../../xfa/include/fxfa/fxfa.h" -#include "../../xfa/include/fxgraphics/fx_graphics.h" -#include "../../xfa/include/fxjse/fxjse.h" #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" #include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "xfa/include/fwl/adapter/fwl_adaptertimermgr.h" +#include "xfa/include/fxbarcode/BC_BarCode.h" +#include "xfa/include/fxfa/fxfa.h" +#include "xfa/include/fxgraphics/fx_graphics.h" +#include "xfa/include/fxjse/fxjse.h" #endif // PDF_ENABLE_XFA #ifdef _WIN32 diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 694b471ab8..51f16919d4 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -23,8 +23,8 @@ #include "public/fpdf_fwlevent.h" // cross platform keycode and events define. #ifdef PDF_ENABLE_XFA -#include "fpdfxfa/fpdfxfa_doc.h" -#include "fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" #endif // PDF_ENABLE_XFA class CFFL_IFormFiller; diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h index 0ce866c85f..6b154676da 100644 --- a/fpdfsdk/include/javascript/IJavaScript.h +++ b/fpdfsdk/include/javascript/IJavaScript.h @@ -11,7 +11,7 @@ #include "core/include/fxcrt/fx_system.h" #ifdef PDF_ENABLE_XFA -#include "../../../xfa/include/fxjse/fxjse.h" +#include "xfa/include/fxjse/fxjse.h" #endif // PDF_ENABLE_XFA class CPDFDoc_Environment; diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp index deee6b6214..c83464e722 100644 --- a/fpdfsdk/src/fpdf_ext.cpp +++ b/fpdfsdk/src/fpdf_ext.cpp @@ -10,7 +10,7 @@ #include "fpdfsdk/include/fsdk_define.h" #ifdef PDF_ENABLE_XFA -#include "../include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" #endif // PDF_ENABLE_XFA #define FPDFSDK_UNSUPPORT_CALL 100 diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index 40cf73c50a..c6d579a2f1 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -10,9 +10,9 @@ #include "public/fpdf_formfill.h" #ifdef PDF_ENABLE_XFA -#include "../include/fpdfxfa/fpdfxfa_app.h" -#include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" #endif // PDF_ENABLE_XFA #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index 366c972c3a..b870d38939 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -13,9 +13,9 @@ #include "public/fpdfview.h" #ifdef PDF_ENABLE_XFA -#include "../include/fpdfxfa/fpdfxfa_app.h" -#include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" #endif // PDF_ENABLE_XFA namespace { diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index 253c11690d..87545472f2 100644 --- a/fpdfsdk/src/fpdfsave.cpp +++ b/fpdfsdk/src/fpdfsave.cpp @@ -10,9 +10,9 @@ #include "public/fpdf_edit.h" #ifdef PDF_ENABLE_XFA -#include "../include/fpdfxfa/fpdfxfa_app.h" -#include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" #include "public/fpdf_formfill.h" #endif diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp index 9c5cdef057..c5226244f2 100644 --- a/fpdfsdk/src/fpdftext.cpp +++ b/fpdfsdk/src/fpdftext.cpp @@ -11,8 +11,8 @@ #include "fpdfsdk/include/fsdk_define.h" #ifdef PDF_ENABLE_XFA -#include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" #endif // PDF_ENABLE_XFA #ifdef _WIN32 diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index 1c8dcc22f2..e047b50846 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -19,11 +19,11 @@ #include "third_party/base/numerics/safe_conversions_impl.h" #ifdef PDF_ENABLE_XFA -#include "../include/fpdfxfa/fpdfxfa_app.h" -#include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfxfa/fpdfxfa_page.h" -#include "../include/fpdfxfa/fpdfxfa_util.h" #include "core/include/fpdfapi/fpdf_module.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" #include "public/fpdf_formfill.h" #endif // PDF_ENABLE_XFA diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp index 051dad2c95..853eb30d82 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fsdk_define.h" -#include "../../include/fsdk_mgr.h" -#include "../../include/fpdfxfa/fpdfxfa_doc.h" -#include "../../include/fpdfxfa/fpdfxfa_util.h" -#include "../../include/javascript/IJavaScript.h" -#include "../../include/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" #include "public/fpdf_formfill.h" CPDFXFA_App* CPDFXFA_App::g_pApp = NULL; diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index fb30ba44d0..d623a68637 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -4,13 +4,13 @@ // 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/fpdfxfa/fpdfxfa_app.h" -#include "../../include/fpdfxfa/fpdfxfa_util.h" -#include "../../include/fpdfxfa/fpdfxfa_page.h" -#include "../../include/javascript/IJavaScript.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/javascript/IJavaScript.h" #include "public/fpdf_formfill.h" #define IDS_XFA_Validate_Input \ diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp index f78eb9b27d..dec9e959d0 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fsdk_define.h" -#include "../../include/fsdk_mgr.h" -#include "../../include/fpdfxfa/fpdfxfa_util.h" -#include "../../include/fpdfxfa/fpdfxfa_doc.h" -#include "../../include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" CPDFXFA_Page::CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index) : m_pPDFPage(NULL), diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp index 9db36c3920..dc1cf9b516 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../include/fsdk_define.h" -#include "../../include/fsdk_mgr.h" -#include "../../include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" CFX_PtrArray CXFA_FWLAdapterTimerMgr::ms_timerArray; diff --git a/fpdfsdk/src/fsdk_annothandler.cpp b/fpdfsdk/src/fsdk_annothandler.cpp index ff591c1620..08d33a2e37 100644 --- a/fpdfsdk/src/fsdk_annothandler.cpp +++ b/fpdfsdk/src/fsdk_annothandler.cpp @@ -12,8 +12,8 @@ #include "fpdfsdk/include/fsdk_mgr.h" #ifdef PDF_ENABLE_XFA -#include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" #endif // PDF_ENABLE_XFA CPDFSDK_AnnotHandlerMgr::CPDFSDK_AnnotHandlerMgr(CPDFDoc_Environment* pApp) { diff --git a/fpdfsdk/src/fsdk_baseform.cpp b/fpdfsdk/src/fsdk_baseform.cpp index 469a196813..2f0fb42928 100644 --- a/fpdfsdk/src/fsdk_baseform.cpp +++ b/fpdfsdk/src/fsdk_baseform.cpp @@ -17,8 +17,8 @@ #include "fpdfsdk/include/pdfwindow/PWL_Utils.h" #ifdef PDF_ENABLE_XFA -#include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" #endif // PDF_ENABLE_XFA #define IsFloatZero(f) ((f) < 0.01 && (f) > -0.01) diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 8ecc602b09..6d656a0c14 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -16,10 +16,10 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "../include/fpdfxfa/fpdfxfa_app.h" -#include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfxfa/fpdfxfa_page.h" -#include "../include/fpdfxfa/fpdfxfa_util.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h" #endif // PDF_ENABLE_XFA #if _FX_OS_ == _FX_ANDROID_ diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index a20ca8f44d..ba6d748ade 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -29,8 +29,8 @@ #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA -#include "../../../xfa/src/fxjse/src/value.h" -#include "../../include/fpdfxfa/fpdfxfa_app.h" +#include "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h" +#include "xfa/src/fxjse/src/value.h" #endif // PDF_ENABLE_XFA // static diff --git a/third_party/libtiff/0000-build-config.patch b/third_party/libtiff/0000-build-config.patch index c59249c11b..64e86e60ad 100644 --- a/third_party/libtiff/0000-build-config.patch +++ b/third_party/libtiff/0000-build-config.patch @@ -92,7 +92,7 @@ diff a/third_party/libtiff/tif_zip.c b/third_party/libtiff/tif_zip.c diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h --- /dev/null +++ b/third_party/libtiff/tiffconf.h -@@ -0,0 +1,250 @@ +@@ -0,0 +1,248 @@ +/* libtiff/tiffconf.h. Generated by configure. */ +/* + Configuration defines for installed libtiff. @@ -102,9 +102,7 @@ diff a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h +#ifndef _TIFFCONF_ +#define _TIFFCONF_ + -+#ifndef _FX_SYSTEM_H_ -+# include "../../core/include/fxcrt/fx_system.h" -+#endif ++#include "core/include/fxcrt/fx_system.h" + +//NOTE: The tiff codec requires an ANSI C compiler environment for building and +// presumes an ANSI C environment for use. diff --git a/third_party/libtiff/tiffconf.h b/third_party/libtiff/tiffconf.h index e36bde6571..bcc0bc5848 100644 --- a/third_party/libtiff/tiffconf.h +++ b/third_party/libtiff/tiffconf.h @@ -7,9 +7,7 @@ #ifndef _TIFFCONF_ #define _TIFFCONF_ -#ifndef _FX_SYSTEM_H_ -# include "../../core/include/fxcrt/fx_system.h" -#endif +#include "core/include/fxcrt/fx_system.h" //NOTE: The tiff codec requires an ANSI C compiler environment for building and // presumes an ANSI C environment for use. -- cgit v1.2.3