diff options
Diffstat (limited to 'fpdfsdk')
27 files changed, 69 insertions, 54 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 4177f76d72..3f37b3a009 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -7,17 +7,17 @@ #ifndef FPDFSDK_INCLUDE_FSDK_DEFINE_H_ #define FPDFSDK_INCLUDE_FSDK_DEFINE_H_ +#include "../../core/include/fpdfapi/fpdfapi.h" #include "../../core/include/fpdfapi/fpdf_module.h" #include "../../core/include/fpdfapi/fpdf_pageobj.h" #include "../../core/include/fpdfapi/fpdf_parser.h" #include "../../core/include/fpdfapi/fpdf_render.h" #include "../../core/include/fpdfapi/fpdf_serial.h" -#include "../../core/include/fpdfapi/fpdfapi.h" #include "../../core/include/fpdfdoc/fpdf_doc.h" #include "../../core/include/fpdfdoc/fpdf_vt.h" #include "../../core/include/fxge/fx_ge.h" #include "../../core/include/fxge/fx_ge_win32.h" -#include "../../public/fpdfview.h" +#include "public/fpdfview.h" #ifdef _WIN32 #include <tchar.h> diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 32e640912c..0dd331e142 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -10,8 +10,6 @@ #include <map> #include "../../core/include/fpdftext/fpdf_text.h" -#include "../../public/fpdf_formfill.h" -#include "../../public/fpdf_fwlevent.h" // cross platform keycode and events define. #include "fsdk_actionhandler.h" #include "fsdk_annothandler.h" #include "fsdk_baseannot.h" @@ -20,6 +18,8 @@ #include "fsdk_define.h" #include "fx_systemhandler.h" #include "javascript/IJavaScript.h" +#include "public/fpdf_formfill.h" +#include "public/fpdf_fwlevent.h" // cross platform keycode and events define. #include "third_party/base/nonstd_unique_ptr.h" class CFFL_IFormFiller; diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h index 16f8ff88cf..8c007b567f 100644 --- a/fpdfsdk/include/fsdk_rendercontext.h +++ b/fpdfsdk/include/fsdk_rendercontext.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_ #define FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_ -#include "../../public/fpdf_progressive.h" #include "fsdk_define.h" +#include "public/fpdf_progressive.h" // Everything about rendering is put here: for OOM recovery class CRenderContext { diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h index 2abb38cd68..1b5e71f168 100644 --- a/fpdfsdk/include/pdfwindow/PDFWindow.h +++ b/fpdfsdk/include/pdfwindow/PDFWindow.h @@ -10,8 +10,8 @@ #include "../../../core/include/fpdfapi/fpdf_module.h" #include "../../../core/include/fpdfdoc/fpdf_doc.h" #include "../../../core/include/fpdfdoc/fpdf_vt.h" -#include "../../../public/fpdf_fwlevent.h" #include "../fx_systemhandler.h" #include "../fxedit/fx_edit.h" +#include "public/fpdf_fwlevent.h" #endif // FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_ diff --git a/fpdfsdk/include/pdfwindow/PWL_FontMap.h b/fpdfsdk/include/pdfwindow/PWL_FontMap.h index f91d7e823f..c7d4490280 100644 --- a/fpdfsdk/include/pdfwindow/PWL_FontMap.h +++ b/fpdfsdk/include/pdfwindow/PWL_FontMap.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_FONTMAP_H_ -#include "../../../public/fpdf_sysfontinfo.h" #include "../fxedit/fx_edit.h" +#include "public/fpdf_sysfontinfo.h" class CPDF_Document; class IFX_SystemHandler; diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index e3d55acdc7..55ded0e4e0 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_dataavail.h" -#include "../../public/fpdf_formfill.h" +#include "public/fpdf_dataavail.h" + #include "../include/fsdk_define.h" +#include "public/fpdf_formfill.h" // These checks are here because core/ and public/ cannot depend on each other. static_assert(IPDF_DataAvail::DataError == PDF_DATA_ERROR, diff --git a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp b/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp index 730a793d63..ee4c3e6104 100644 --- a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp +++ b/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../public/fpdf_doc.h" -#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" +#include "public/fpdf_doc.h" +#include "public/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" class FPDFDataAvailEmbeddertest : public EmbedderTest {}; diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp index 0a5c00a308..1ad67a461b 100644 --- a/fpdfsdk/src/fpdf_ext.cpp +++ b/fpdfsdk/src/fpdf_ext.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "public/fpdf_ext.h" + #include "../../core/include/fxcrt/fx_xml.h" -#include "../../public/fpdf_ext.h" #include "../include/fsdk_define.h" #define FPDFSDK_UNSUPPORT_CALL 100 diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index 75db8f806d..a816750912 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_flatten.h" +#include "public/fpdf_flatten.h" + #include "../include/fsdk_define.h" typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray; diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp index 463ccf4c53..0586e9d089 100644 --- a/fpdfsdk/src/fpdf_progressive.cpp +++ b/fpdfsdk/src/fpdf_progressive.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_progressive.h" -#include "../../public/fpdfview.h" +#include "public/fpdf_progressive.h" + #include "../include/fsdk_define.h" #include "../include/fsdk_rendercontext.h" +#include "public/fpdfview.h" // These checks are here because core/ and public/ cannot depend on each other. static_assert(CPDF_ProgressiveRenderer::Ready == FPDF_RENDER_READER, diff --git a/fpdfsdk/src/fpdf_searchex.cpp b/fpdfsdk/src/fpdf_searchex.cpp index 9747316305..2e0cb568fa 100644 --- a/fpdfsdk/src/fpdf_searchex.cpp +++ b/fpdfsdk/src/fpdf_searchex.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_searchex.h" +#include "public/fpdf_searchex.h" #include "../../core/include/fpdftext/fpdf_text.h" diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index a004e86ba1..9c388292a8 100644 --- a/fpdfsdk/src/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_sysfontinfo.h" +#include "public/fpdf_sysfontinfo.h" + #include "../include/fsdk_define.h" #include "../include/pdfwindow/PWL_FontMap.h" diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index 8a835fb220..134117dcd3 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_transformpage.h" +#include "public/fpdf_transformpage.h" + #include "../include/fsdk_define.h" namespace { diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index 8a4d619292..72231eb1cc 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_doc.h" +#include "public/fpdf_doc.h" + #include "../include/fsdk_define.h" namespace { diff --git a/fpdfsdk/src/fpdfdoc_embeddertest.cpp b/fpdfsdk/src/fpdfdoc_embeddertest.cpp index c83b2eb958..ca5cbebf01 100644 --- a/fpdfsdk/src/fpdfdoc_embeddertest.cpp +++ b/fpdfsdk/src/fpdfdoc_embeddertest.cpp @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "../../core/include/fxcrt/fx_string.h" -#include "../../public/fpdf_doc.h" -#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" #include "../../testing/fx_string_testhelpers.h" +#include "public/fpdf_doc.h" +#include "public/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" class FPDFDocEmbeddertest : public EmbedderTest {}; diff --git a/fpdfsdk/src/fpdfeditimg.cpp b/fpdfsdk/src/fpdfeditimg.cpp index 73fc251195..c4fa2d654e 100644 --- a/fpdfsdk/src/fpdfeditimg.cpp +++ b/fpdfsdk/src/fpdfeditimg.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_edit.h" +#include "public/fpdf_edit.h" + #include "../include/fsdk_define.h" DLLEXPORT FPDF_PAGEOBJECT STDCALL diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index ff175d6c14..6ba8700802 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_edit.h" -#include "../../public/fpdf_formfill.h" +#include "public/fpdf_edit.h" + #include "../include/fsdk_define.h" +#include "public/fpdf_formfill.h" #if _FX_OS_ == _FX_ANDROID_ #include "time.h" diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index 45204692fc..80c1cd01a2 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -4,10 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_formfill.h" -#include "../../public/fpdfview.h" +#include "public/fpdf_formfill.h" + #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" +#include "public/fpdfview.h" #include "third_party/base/nonstd_unique_ptr.h" namespace { diff --git a/fpdfsdk/src/fpdfformfill_embeddertest.cpp b/fpdfsdk/src/fpdfformfill_embeddertest.cpp index 53cdcbd041..f6d444abed 100644 --- a/fpdfsdk/src/fpdfformfill_embeddertest.cpp +++ b/fpdfsdk/src/fpdfformfill_embeddertest.cpp @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../public/fpdf_formfill.h" #include "../../testing/embedder_test.h" #include "../../testing/embedder_test_mock_delegate.h" #include "../../testing/embedder_test_timer_handling_delegate.h" +#include "public/fpdf_formfill.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index 6700a40a70..efa25ccd0e 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_ppo.h" +#include "public/fpdf_ppo.h" + #include "../include/fsdk_define.h" #include "third_party/base/nonstd_unique_ptr.h" diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index 7115f6d651..fee4e7cab7 100644 --- a/fpdfsdk/src/fpdfsave.cpp +++ b/fpdfsdk/src/fpdfsave.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../public/fpdf_edit.h" -#include "../../public/fpdf_save.h" +#include "public/fpdf_save.h" + #include "../include/fsdk_define.h" +#include "public/fpdf_edit.h" #if _FX_OS_ == _FX_ANDROID_ #include "time.h" diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp index 800c138f3f..e0a5abf90a 100644 --- a/fpdfsdk/src/fpdftext.cpp +++ b/fpdfsdk/src/fpdftext.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "public/fpdf_text.h" + #include "../../core/include/fpdfdoc/fpdf_doc.h" #include "../../core/include/fpdftext/fpdf_text.h" -#include "../../public/fpdf_text.h" #include "../include/fsdk_define.h" #ifdef _WIN32 diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp index b3fe9e4c1e..52cec7028a 100644 --- a/fpdfsdk/src/fpdftext_embeddertest.cpp +++ b/fpdfsdk/src/fpdftext_embeddertest.cpp @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "../../public/fpdf_text.h" -#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" +#include "public/fpdf_text.h" +#include "public/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index b9bcf02841..dc7323321d 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -4,15 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "public/fpdfview.h" + #include "../../core/include/fxcodec/fx_codec.h" #include "../../core/include/fxcrt/fx_safe_types.h" -#include "../../public/fpdf_ext.h" -#include "../../public/fpdf_progressive.h" -#include "../../public/fpdfview.h" #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" #include "../include/fsdk_rendercontext.h" #include "../include/javascript/IJavaScript.h" +#include "public/fpdf_ext.h" +#include "public/fpdf_progressive.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/base/numerics/safe_conversions_impl.h" diff --git a/fpdfsdk/src/fpdfview_c_api_test.c b/fpdfsdk/src/fpdfview_c_api_test.c index 0d212558e7..5ff3dbf5a4 100644 --- a/fpdfsdk/src/fpdfview_c_api_test.c +++ b/fpdfsdk/src/fpdfview_c_api_test.c @@ -9,21 +9,21 @@ #include "fpdfview_c_api_test.h" -#include "../../public/fpdf_dataavail.h" -#include "../../public/fpdf_doc.h" -#include "../../public/fpdf_edit.h" -#include "../../public/fpdf_ext.h" -#include "../../public/fpdf_flatten.h" -#include "../../public/fpdf_formfill.h" -#include "../../public/fpdf_fwlevent.h" -#include "../../public/fpdf_ppo.h" -#include "../../public/fpdf_progressive.h" -#include "../../public/fpdf_save.h" -#include "../../public/fpdf_searchex.h" -#include "../../public/fpdf_sysfontinfo.h" -#include "../../public/fpdf_text.h" -#include "../../public/fpdf_transformpage.h" -#include "../../public/fpdfview.h" +#include "public/fpdf_dataavail.h" +#include "public/fpdf_doc.h" +#include "public/fpdf_edit.h" +#include "public/fpdf_ext.h" +#include "public/fpdf_flatten.h" +#include "public/fpdf_formfill.h" +#include "public/fpdf_fwlevent.h" +#include "public/fpdf_ppo.h" +#include "public/fpdf_progressive.h" +#include "public/fpdf_save.h" +#include "public/fpdf_searchex.h" +#include "public/fpdf_sysfontinfo.h" +#include "public/fpdf_text.h" +#include "public/fpdf_transformpage.h" +#include "public/fpdfview.h" // Scheme for avoiding LTO out of existence, warnings, etc. typedef void (*fnptr)(void); // Legal generic function type for casts. diff --git a/fpdfsdk/src/fpdfview_embeddertest.cpp b/fpdfsdk/src/fpdfview_embeddertest.cpp index 36e79d777a..2a00193a5e 100644 --- a/fpdfsdk/src/fpdfview_embeddertest.cpp +++ b/fpdfsdk/src/fpdfview_embeddertest.cpp @@ -5,9 +5,9 @@ #include <limits> #include <string> -#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" #include "fpdfview_c_api_test.h" +#include "public/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" TEST(fpdf, CApiTest) { diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 7a767ea579..0884cb4987 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -6,11 +6,12 @@ #include <algorithm> -#include "../../public/fpdf_ext.h" +#include "../include/fsdk_mgr.h" + #include "../include/formfiller/FFL_FormFiller.h" #include "../include/fsdk_define.h" -#include "../include/fsdk_mgr.h" #include "../include/javascript/IJavaScript.h" +#include "public/fpdf_ext.h" #include "third_party/base/nonstd_unique_ptr.h" #if _FX_OS_ == _FX_ANDROID_ |