diff options
48 files changed, 92 insertions, 92 deletions
@@ -50,18 +50,6 @@ config("pdfium_config") { static_library("pdfium") { sources = [ - "fpdfsdk/include/fpdfdoc.h", - "fpdfsdk/include/fpdfedit.h", - "fpdfsdk/include/fpdfformfill.h", - "fpdfsdk/include/fpdftext.h", - "fpdfsdk/include/fpdfview.h", - "fpdfsdk/include/fpdf_dataavail.h", - "fpdfsdk/include/fpdf_flatten.h", - "fpdfsdk/include/fpdf_progressive.h", - "fpdfsdk/include/fpdf_searchex.h", - "fpdfsdk/include/fpdf_sysfontinfo.h", - "fpdfsdk/include/fpdf_ext.h", - "fpdfsdk/include/fpdf_sysfontinfo.h", "fpdfsdk/include/fsdk_actionhandler.h", "fpdfsdk/include/fsdk_annothandler.h", "fpdfsdk/include/fsdk_baseannot.h", @@ -88,8 +76,21 @@ static_library("pdfium") { "fpdfsdk/src/fsdk_rendercontext.cpp", "fpdfsdk/src/fpdfsdkdll.rc", "fpdfsdk/src/resource.h", - "fpdfsdk/include/fpdf_transformpage.h", - "fpdfsdk/src/fpdf_transformpage.cpp", + "public/fpdf_dataavail.h", + "public/fpdf_doc.h", + "public/fpdf_edit.h", + "public/fpdf_ext.h", + "public/fpdf_flatten.h", + "public/fpdf_formfill.h", + "public/fpdf_fwlevent.h", + "public/fpdf_ppo.h", + "public/fpdf_progressive.h", + "public/fpdf_save.h", + "public/fpdf_searchex.h", + "public/fpdf_sysfontinfo.h", + "public/fpdf_text.h", + "public/fpdf_transformpage.h", + "public/fpdfview.h", ] libs = [] diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp index 2769f3c14f..45caf4e9be 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp @@ -5,7 +5,7 @@ #include <cstring> #include <string> -#include "../../../../fpdfsdk/include/fpdfview.h" +#include "../../../../public/fpdfview.h" #include "../../../../testing/fx_string_testhelpers.h" #include "../../../include/fpdfapi/fpdf_parser.h" #include "../../../include/fxcrt/fx_basic.h" diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h index 4c59a28f94..7171540596 100644 --- a/fpdfsdk/include/fsdk_define.h +++ b/fpdfsdk/include/fsdk_define.h @@ -73,7 +73,7 @@ typedef unsigned int FX_UINT; -#include "fpdfview.h" +#include "../../public/fpdfview.h" class CPDF_CustomAccess FX_FINAL : public IFX_FileRead { diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 31c12a4e95..906662d8ff 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -7,6 +7,8 @@ #ifndef _FPDFSDK_MGR_H #define _FPDFSDK_MGR_H +#include "../../public/fpdf_formfill.h" +#include "../../public/fpdf_fwlevent.h" // cross platform keycode and events define. #include "fsdk_common.h" #include "fsdk_define.h" #include "fx_systemhandler.h" @@ -14,14 +16,9 @@ #include "fpdfxfa/fpdfxfa_page.h" #include "fsdk_baseannot.h" #include "fsdk_baseform.h" -#include "fpdfformfill.h" #include "fsdk_annothandler.h" #include "fsdk_actionhandler.h" -//cross platform keycode and events define. -#include "fpdf_fwlevent.h" - - class CPDFSDK_Document; class CPDFSDK_PageView; class CPDFSDK_Annot; diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h index 94ad48e7c9..dfc9f5e58a 100644 --- a/fpdfsdk/include/fsdk_rendercontext.h +++ b/fpdfsdk/include/fsdk_rendercontext.h @@ -6,8 +6,9 @@ #ifndef _RENDERCONTENT_H_ #define _RENDERCONTENT_H_ + +#include "../../public/fpdf_progressive.h" #include "../include/fsdk_define.h" -#include "../include/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 a83be41349..a26c57d2db 100644 --- a/fpdfsdk/include/pdfwindow/PDFWindow.h +++ b/fpdfsdk/include/pdfwindow/PDFWindow.h @@ -19,7 +19,7 @@ #include "../../../core/include/fpdfdoc/fpdf_vt.h" #include "../../../core/include/fxcrt/fx_xml.h" - #include "../fpdf_fwlevent.h" + #include "../../../public/fpdf_fwlevent.h" #include "../fx_systemhandler.h" #endif diff --git a/fpdfsdk/src/fpdf_dataavail.cpp b/fpdfsdk/src/fpdf_dataavail.cpp index a04e7a2120..f3fd42a369 100644 --- a/fpdfsdk/src/fpdf_dataavail.cpp +++ b/fpdfsdk/src/fpdf_dataavail.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_dataavail.h" +#include "../../public/fpdf_formfill.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_dataavail.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" -#include "../include/fpdfformfill.h" #include "../include/fpdfxfa/fpdfxfa_app.h" extern void ProcessParseError(FX_DWORD err_code); diff --git a/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp b/fpdfsdk/src/fpdf_dataavail_embeddertest.cpp index 31977ac534..d2f0b78b52 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 "../../fpdfsdk/include/fpdfview.h" -#include "../../fpdfsdk/include/fpdfdoc.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 0ba66724fd..ae9cb9e44e 100644 --- a/fpdfsdk/src/fpdf_ext.cpp +++ b/fpdfsdk/src/fpdf_ext.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_ext.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_ext.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #define FPDFSDK_UNSUPPORT_CALL 100 diff --git a/fpdfsdk/src/fpdf_flatten.cpp b/fpdfsdk/src/fpdf_flatten.cpp index c7ef4b50d8..9356db9842 100644 --- a/fpdfsdk/src/fpdf_flatten.cpp +++ b/fpdfsdk/src/fpdf_flatten.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_flatten.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_flatten.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdf_progressive.cpp b/fpdfsdk/src/fpdf_progressive.cpp index 5226770d48..bd8d86434f 100644 --- a/fpdfsdk/src/fpdf_progressive.cpp +++ b/fpdfsdk/src/fpdf_progressive.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/fpdf_progressive.h" +#include "../../public/fpdf_progressive.h" +#include "../../public/fpdfview.h" #include "../include/fsdk_define.h" -#include "../include/fpdfview.h" #include "../include/fsdk_rendercontext.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdf_searchex.cpp b/fpdfsdk/src/fpdf_searchex.cpp index 21831a3e3d..4384cdc5b3 100644 --- a/fpdfsdk/src/fpdf_searchex.cpp +++ b/fpdfsdk/src/fpdf_searchex.cpp @@ -4,9 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_searchex.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_searchex.h" - DLLEXPORT int STDCALL FPDFText_GetCharIndexFromTextIndex(FPDF_TEXTPAGE text_page, int nTextIndex) { diff --git a/fpdfsdk/src/fpdf_sysfontinfo.cpp b/fpdfsdk/src/fpdf_sysfontinfo.cpp index f60dc9723e..603bb62250 100644 --- a/fpdfsdk/src/fpdf_sysfontinfo.cpp +++ b/fpdfsdk/src/fpdf_sysfontinfo.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_sysfontinfo.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_sysfontinfo.h" class CSysFontInfo_Ext FX_FINAL : public IFX_SystemFontInfo { diff --git a/fpdfsdk/src/fpdf_transformpage.cpp b/fpdfsdk/src/fpdf_transformpage.cpp index 043c02cc27..592b5f4e64 100644 --- a/fpdfsdk/src/fpdf_transformpage.cpp +++ b/fpdfsdk/src/fpdf_transformpage.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_transformpage.h" #include "../include/fsdk_define.h" -#include "../include/fpdf_transformpage.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdfdoc.cpp b/fpdfsdk/src/fpdfdoc.cpp index 7e11565ad7..d662699dbf 100644 --- a/fpdfsdk/src/fpdfdoc.cpp +++ b/fpdfsdk/src/fpdfdoc.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_doc.h" #include "../include/fsdk_define.h" -#include "../include/fpdfdoc.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdfdoc_embeddertest.cpp b/fpdfsdk/src/fpdfdoc_embeddertest.cpp index dadaf1d809..1f11bef214 100644 --- a/fpdfsdk/src/fpdfdoc_embeddertest.cpp +++ b/fpdfsdk/src/fpdfdoc_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 "../../fpdfsdk/include/fpdfview.h" -#include "../../fpdfsdk/include/fpdfdoc.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 188b5f070d..aba8d0b7b2 100644 --- a/fpdfsdk/src/fpdfeditimg.cpp +++ b/fpdfsdk/src/fpdfeditimg.cpp @@ -4,12 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_edit.h" #include "../include/fsdk_define.h" -#include "../include/fpdfedit.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" - DLLEXPORT FPDF_PAGEOBJECT STDCALL FPDFPageObj_NewImgeObj(FPDF_DOCUMENT document) { if (!document) diff --git a/fpdfsdk/src/fpdfeditpage.cpp b/fpdfsdk/src/fpdfeditpage.cpp index 43d74aad04..f371f82df3 100644 --- a/fpdfsdk/src/fpdfeditpage.cpp +++ b/fpdfsdk/src/fpdfeditpage.cpp @@ -4,14 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_edit.h" +#include "../../public/fpdf_formfill.h" #include "../include/fsdk_define.h" -#include "../include/fpdfedit.h" -#include "../include/fpdfformfill.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_page.h" - #if _FX_OS_ == _FX_ANDROID_ #include "time.h" #else diff --git a/fpdfsdk/src/fpdfformfill.cpp b/fpdfsdk/src/fpdfformfill.cpp index ea94925d63..7482871527 100644 --- a/fpdfsdk/src/fpdfformfill.cpp +++ b/fpdfsdk/src/fpdfformfill.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/fpdfview.h" -#include "../include/fpdfformfill.h" +#include "../../public/fpdf_formfill.h" +#include "../../public/fpdfview.h" #include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fsdk_mgr.h" diff --git a/fpdfsdk/src/fpdfformfill_embeddertest.cpp b/fpdfsdk/src/fpdfformfill_embeddertest.cpp index 3fe34d5d8c..7c3988c445 100644 --- a/fpdfsdk/src/fpdfformfill_embeddertest.cpp +++ b/fpdfsdk/src/fpdfformfill_embeddertest.cpp @@ -3,7 +3,7 @@ // found in the LICENSE file. -#include "../../fpdfsdk/include/fpdfformfill.h" +#include "../../public/fpdf_formfill.h" #include "../../testing/embedder_test.h" #include "../../testing/embedder_test_mock_delegate.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp index b3bc0f144e..21cf647dd6 100644 --- a/fpdfsdk/src/fpdfppo.cpp +++ b/fpdfsdk/src/fpdfppo.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../include/fpdfppo.h" +#include "../../public/fpdf_ppo.h" #include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" diff --git a/fpdfsdk/src/fpdfsave.cpp b/fpdfsdk/src/fpdfsave.cpp index de645a2841..0be1709f37 100644 --- a/fpdfsdk/src/fpdfsave.cpp +++ b/fpdfsdk/src/fpdfsave.cpp @@ -4,13 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_edit.h" +#include "../../public/fpdf_formfill.h" +#include "../../public/fpdf_save.h" #include "../include/fsdk_define.h" -#include "../include/fpdfsave.h" -#include "../include/fpdfedit.h" -#include "../include/fpdfformfill.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_util.h" + #if _FX_OS_ == _FX_ANDROID_ #include "time.h" #else diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp index 776a1b66c7..951cde047c 100644 --- a/fpdfsdk/src/fpdftext.cpp +++ b/fpdfsdk/src/fpdftext.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_text.h" #include "../include/fsdk_define.h" -#include "../include/fpdftext.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdftext_embeddertest.cpp b/fpdfsdk/src/fpdftext_embeddertest.cpp index f0d9feb91d..394e1a96b3 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 "../../fpdfsdk/include/fpdfview.h" -#include "../../fpdfsdk/include/fpdftext.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp index c0b65cae05..7852670999 100644 --- a/fpdfsdk/src/fpdfview.cpp +++ b/fpdfsdk/src/fpdfview.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_ext.h" +#include "../../public/fpdf_formfill.h" +#include "../../public/fpdf_progressive.h" +#include "../../public/fpdfview.h" #include "../include/fsdk_define.h" #include "../include/fsdk_mgr.h" -#include "../include/fpdfview.h" #include "../include/fsdk_rendercontext.h" -#include "../include/fpdf_progressive.h" -#include "../include/fpdf_ext.h" #include "../../../core/src/fxcrt/fx_safe_types.h" #include "../../third_party/base/nonstd_unique_ptr.h" #include "../../third_party/base/numerics/safe_conversions_impl.h" -#include "../include/fpdfformfill.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_app.h" #include "../include/fpdfxfa/fpdfxfa_page.h" diff --git a/fpdfsdk/src/fpdfview_embeddertest.cpp b/fpdfsdk/src/fpdfview_embeddertest.cpp index 66fbe464d0..d7223245ca 100644 --- a/fpdfsdk/src/fpdfview_embeddertest.cpp +++ b/fpdfsdk/src/fpdfview_embeddertest.cpp @@ -5,8 +5,8 @@ #include <limits> #include <string> +#include "../../public/fpdfview.h" #include "../../testing/embedder_test.h" -#include "../../fpdfsdk/include/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" class FPDFViewEmbeddertest : public EmbedderTest { diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp index 7abd2741a0..94164f12b8 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "../../../public/fpdf_formfill.h"
#include "../../include/fsdk_define.h"
-#include "../../include/fpdfformfill.h"
#include "../../include/fsdk_mgr.h"
#include "../../include/fpdfxfa/fpdfxfa_doc.h"
#include "../../include/fpdfxfa/fpdfxfa_util.h"
diff --git a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp index 87fb9d21ce..c3137f51c6 100644 --- a/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp +++ b/fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "../../../public/fpdf_formfill.h"
#include "../../include/fsdk_define.h"
#include "../../include/fpdfxfa/fpdfxfa_doc.h"
-#include "../../include/fpdfformfill.h"
#include "../../include/fsdk_mgr.h"
#include "../../include/fpdfxfa/fpdfxfa_app.h"
#include "../../include/fpdfxfa/fpdfxfa_util.h"
diff --git a/fpdfsdk/src/fsdk_mgr.cpp b/fpdfsdk/src/fsdk_mgr.cpp index 7b071a9b55..e783532ca2 100644 --- a/fpdfsdk/src/fsdk_mgr.cpp +++ b/fpdfsdk/src/fsdk_mgr.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../public/fpdf_ext.h" #include "../include/fsdk_define.h" #include "../include/fpdfxfa/fpdfxfa_doc.h" #include "../include/fpdfxfa/fpdfxfa_page.h" #include "../include/fpdfxfa/fpdfxfa_util.h" #include "../include/fsdk_mgr.h" -#include "../include/fpdf_ext.h" #include "../include/formfiller/FFL_FormFiller.h" #include "../include/javascript/IJavaScript.h" #include "../include/fpdfxfa/fpdfxfa_app.h" diff --git a/pdfium.gyp b/pdfium.gyp index f823d594e1..164d8e8f47 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -65,18 +65,6 @@ ], 'ldflags': [ '-L<(PRODUCT_DIR)',], 'sources': [ - 'fpdfsdk/include/fpdfdoc.h', - 'fpdfsdk/include/fpdfedit.h', - 'fpdfsdk/include/fpdfformfill.h', - 'fpdfsdk/include/fpdftext.h', - 'fpdfsdk/include/fpdfview.h', - 'fpdfsdk/include/fpdf_dataavail.h', - 'fpdfsdk/include/fpdf_flatten.h', - 'fpdfsdk/include/fpdf_progressive.h', - 'fpdfsdk/include/fpdf_searchex.h', - 'fpdfsdk/include/fpdf_sysfontinfo.h', - 'fpdfsdk/include/fpdf_ext.h', - 'fpdfsdk/include/fpdf_sysfontinfo.h', 'fpdfsdk/include/fsdk_actionhandler.h', 'fpdfsdk/include/fsdk_annothandler.h', 'fpdfsdk/include/fsdk_baseannot.h', @@ -95,6 +83,7 @@ 'fpdfsdk/src/fpdf_progressive.cpp', 'fpdfsdk/src/fpdf_searchex.cpp', 'fpdfsdk/src/fpdf_sysfontinfo.cpp', + 'fpdfsdk/src/fpdf_transformpage.cpp', 'fpdfsdk/src/fsdk_actionhandler.cpp', 'fpdfsdk/src/fsdk_annothandler.cpp', 'fpdfsdk/src/fsdk_baseannot.cpp', @@ -103,8 +92,21 @@ 'fpdfsdk/src/fsdk_rendercontext.cpp', 'fpdfsdk/src/fpdfsdkdll.rc', 'fpdfsdk/src/resource.h', - 'fpdfsdk/include/fpdf_transformpage.h', - 'fpdfsdk/src/fpdf_transformpage.cpp', + 'public/fpdf_dataavail.h', + 'public/fpdf_doc.h', + 'public/fpdf_edit.h', + 'public/fpdf_ext.h', + 'public/fpdf_flatten.h', + 'public/fpdf_formfill.h', + 'public/fpdf_fwlevent.h', + 'public/fpdf_ppo.h', + 'public/fpdf_progressive.h', + 'public/fpdf_save.h', + 'public/fpdf_searchex.h', + 'public/fpdf_sysfontinfo.h', + 'public/fpdf_text.h', + 'public/fpdf_transformpage.h', + 'public/fpdfview.h', ], 'conditions': [ ['OS!="win"', { diff --git a/fpdfsdk/include/fpdf_dataavail.h b/public/fpdf_dataavail.h index de6cb23bd5..de6cb23bd5 100644 --- a/fpdfsdk/include/fpdf_dataavail.h +++ b/public/fpdf_dataavail.h diff --git a/fpdfsdk/include/fpdfdoc.h b/public/fpdf_doc.h index 99deab27fe..99deab27fe 100644 --- a/fpdfsdk/include/fpdfdoc.h +++ b/public/fpdf_doc.h diff --git a/fpdfsdk/include/fpdfedit.h b/public/fpdf_edit.h index 3be2fd3112..3be2fd3112 100644 --- a/fpdfsdk/include/fpdfedit.h +++ b/public/fpdf_edit.h diff --git a/fpdfsdk/include/fpdf_ext.h b/public/fpdf_ext.h index 96e3c857fd..96e3c857fd 100644 --- a/fpdfsdk/include/fpdf_ext.h +++ b/public/fpdf_ext.h diff --git a/fpdfsdk/include/fpdf_flatten.h b/public/fpdf_flatten.h index 0c555138ab..0c555138ab 100644 --- a/fpdfsdk/include/fpdf_flatten.h +++ b/public/fpdf_flatten.h diff --git a/fpdfsdk/include/fpdfformfill.h b/public/fpdf_formfill.h index 5191fd75a8..5191fd75a8 100644 --- a/fpdfsdk/include/fpdfformfill.h +++ b/public/fpdf_formfill.h diff --git a/fpdfsdk/include/fpdf_fwlevent.h b/public/fpdf_fwlevent.h index f77e7e399f..f77e7e399f 100644 --- a/fpdfsdk/include/fpdf_fwlevent.h +++ b/public/fpdf_fwlevent.h diff --git a/fpdfsdk/include/fpdfppo.h b/public/fpdf_ppo.h index db78a1942d..db78a1942d 100644 --- a/fpdfsdk/include/fpdfppo.h +++ b/public/fpdf_ppo.h diff --git a/fpdfsdk/include/fpdf_progressive.h b/public/fpdf_progressive.h index 69bbfba4cd..69bbfba4cd 100644 --- a/fpdfsdk/include/fpdf_progressive.h +++ b/public/fpdf_progressive.h diff --git a/fpdfsdk/include/fpdfsave.h b/public/fpdf_save.h index 0909d5a447..0909d5a447 100644 --- a/fpdfsdk/include/fpdfsave.h +++ b/public/fpdf_save.h diff --git a/fpdfsdk/include/fpdf_searchex.h b/public/fpdf_searchex.h index d70dddc984..d70dddc984 100644 --- a/fpdfsdk/include/fpdf_searchex.h +++ b/public/fpdf_searchex.h diff --git a/fpdfsdk/include/fpdf_sysfontinfo.h b/public/fpdf_sysfontinfo.h index 00c9fab0e6..00c9fab0e6 100644 --- a/fpdfsdk/include/fpdf_sysfontinfo.h +++ b/public/fpdf_sysfontinfo.h diff --git a/fpdfsdk/include/fpdftext.h b/public/fpdf_text.h index cd33f2d061..cd33f2d061 100644 --- a/fpdfsdk/include/fpdftext.h +++ b/public/fpdf_text.h diff --git a/fpdfsdk/include/fpdf_transformpage.h b/public/fpdf_transformpage.h index 32b0ea008c..32b0ea008c 100644 --- a/fpdfsdk/include/fpdf_transformpage.h +++ b/public/fpdf_transformpage.h diff --git a/fpdfsdk/include/fpdfview.h b/public/fpdfview.h index d99826350d..d0b745ccfa 100644 --- a/fpdfsdk/include/fpdfview.h +++ b/public/fpdfview.h @@ -4,6 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +// NOTE: External docs refer to this file as "fpdfview.h", so do not rename +// despite lack of consitency with other public files. #ifndef _FPDFVIEW_H_ #define _FPDFVIEW_H_ diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index 52e0125f09..8ab94972a9 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -14,15 +14,14 @@ #include <utility> #include <vector> -#include "../fpdfsdk/include/fpdf_dataavail.h" -#include "../fpdfsdk/include/fpdf_ext.h" -#include "../fpdfsdk/include/fpdfformfill.h" -#include "../fpdfsdk/include/fpdftext.h" -#include "../fpdfsdk/include/fpdfview.h" -#include "../core/include/fxcrt/fx_system.h" +#include "../public/fpdf_dataavail.h" +#include "../public/fpdf_ext.h" +#include "../public/fpdf_formfill.h" +#include "../public/fpdf_text.h" +#include "../public/fpdfview.h" #include "image_diff_png.h" -#include "v8/include/v8.h" #include "v8/include/libplatform/libplatform.h" +#include "v8/include/v8.h" #ifdef _WIN32 @@ -498,8 +497,8 @@ void RenderPdf(const std::string& name, const char* pBuf, size_t len, FORM_DoDocumentJSAction(form); FORM_DoDocumentOpenAction(form); - size_t rendered_pages = 0; - size_t bad_pages = 0; + int rendered_pages = 0; + int bad_pages = 0; for (int i = 0; i < page_count; ++i) { FPDF_PAGE page = FPDF_LoadPage(doc, i); if (!page) { @@ -568,8 +567,8 @@ void RenderPdf(const std::string& name, const char* pBuf, size_t len, FPDFDOC_ExitFormFillEnvironment(form); FPDFAvail_Destroy(pdf_avail); - fprintf(stderr, "Rendered %" PRIuS " pages.\n", rendered_pages); - fprintf(stderr, "Skipped %" PRIuS " bad pages.\n", bad_pages); + fprintf(stderr, "Rendered %d pages.\n", rendered_pages); + fprintf(stderr, "Skipped %d bad pages.\n", bad_pages); } static const char usage_string[] = diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index 563dec8bec..e161867732 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -14,9 +14,9 @@ #include <utility> #include <vector> -#include "../fpdfsdk/include/fpdftext.h" -#include "../fpdfsdk/include/fpdfview.h" #include "../core/include/fxcrt/fx_system.h" +#include "../public/fpdf_text.h" +#include "../public/fpdfview.h" #include "testing/gmock/include/gmock/gmock.h" #include "v8/include/v8.h" #include "v8/include/libplatform/libplatform.h" diff --git a/testing/embedder_test.h b/testing/embedder_test.h index ea93131749..5cede6c6b4 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -8,10 +8,10 @@ #include <string> #include "../core/include/fxcrt/fx_system.h" -#include "../fpdfsdk/include/fpdf_dataavail.h" -#include "../fpdfsdk/include/fpdf_ext.h" -#include "../fpdfsdk/include/fpdfformfill.h" -#include "../fpdfsdk/include/fpdfview.h" +#include "../public/fpdf_dataavail.h" +#include "../public/fpdf_ext.h" +#include "../public/fpdf_formfill.h" +#include "../public/fpdfview.h" #include "testing/gtest/include/gtest/gtest.h" #include "v8/include/v8.h" |