summaryrefslogtreecommitdiff
path: root/fpdfsdk
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk')
-rw-r--r--fpdfsdk/include/formfiller/FFL_Utils.h13
-rw-r--r--fpdfsdk/include/formfiller/FormFiller.h1
-rw-r--r--fpdfsdk/include/fsdk_define.h18
-rw-r--r--fpdfsdk/include/fsdk_mgr.h4
-rw-r--r--fpdfsdk/include/javascript/IJavaScript.h3
-rw-r--r--fpdfsdk/include/javascript/JavaScript.h2
-rw-r--r--fpdfsdk/include/javascript/resource.h2
-rw-r--r--fpdfsdk/include/pdfwindow/PDFWindow.h1
-rw-r--r--fpdfsdk/src/fpdf_ext.cpp1
-rw-r--r--fpdfsdk/src/fpdf_searchex.cpp12
-rw-r--r--fpdfsdk/src/fpdftext.cpp3
-rw-r--r--fpdfsdk/src/fpdfview.cpp1
-rw-r--r--fpdfsdk/src/javascript/JS_GlobalData.cpp1
-rw-r--r--fpdfsdk/src/pdfwindow/PWL_Edit.cpp1
14 files changed, 30 insertions, 33 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_Utils.h b/fpdfsdk/include/formfiller/FFL_Utils.h
index de9afafb56..fe025eca4b 100644
--- a/fpdfsdk/include/formfiller/FFL_Utils.h
+++ b/fpdfsdk/include/formfiller/FFL_Utils.h
@@ -8,17 +8,16 @@
#define FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
#include "../../../core/include/fpdfapi/fpdf_parser.h"
-#include "../../../core/include/fxcrt/fx_memory.h"
-
-#define FFL_BASE_USERUNIT (1.0f / 72.0f)
class CFFL_Utils
{
public:
- static CPDF_Rect MaxRect(const CPDF_Rect & rect1,const CPDF_Rect & rect2);
- static CPDF_Rect InflateRect(const CPDF_Rect & crRect, const FX_FLOAT & fSize);
- static CPDF_Rect DeflateRect(const CPDF_Rect & crRect, const FX_FLOAT & fSize);
- static FX_BOOL TraceObject(CPDF_Object* pObj);
+ static CPDF_Rect MaxRect(const CPDF_Rect& rect1,const CPDF_Rect& rect2);
+ static CPDF_Rect InflateRect(const CPDF_Rect& crRect,
+ const FX_FLOAT& fSize);
+ static CPDF_Rect DeflateRect(const CPDF_Rect& crRect,
+ const FX_FLOAT& fSize);
+ static FX_BOOL TraceObject(CPDF_Object* pObj);
};
#endif // FPDFSDK_INCLUDE_FORMFILLER_FFL_UTILS_H_
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
index fdca1ff940..90351f5527 100644
--- a/fpdfsdk/include/formfiller/FormFiller.h
+++ b/fpdfsdk/include/formfiller/FormFiller.h
@@ -10,7 +10,6 @@
#include "../../../core/include/fpdfapi/fpdf_module.h"
#include "../../../core/include/fpdfdoc/fpdf_doc.h"
#include "../../../core/include/fpdfdoc/fpdf_vt.h"
-#include "../../../core/include/fxcrt/fx_xml.h"
#include "../fsdk_mgr.h"
#include "../fxedit/fx_edit.h"
#include "../pdfwindow/IPDFWindow.h"
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index a80e5f5127..f809043417 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -12,25 +12,17 @@
#include <math.h>
#endif
+#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/fpdfapi.h"
#include "../../core/include/fpdfapi/fpdf_parser.h"
-#include "../../core/include/fpdfapi/fpdf_module.h"
#include "../../core/include/fpdfapi/fpdf_render.h"
-#include "../../core/include/fpdfapi/fpdf_pageobj.h"
#include "../../core/include/fpdfapi/fpdf_serial.h"
-
-#include "../../core/include/fpdftext/fpdf_text.h"
-
-#include "../../core/include/fxge/fx_ge_win32.h"
-#include "../../core/include/fxge/fx_ge.h"
-
-#include "../../core/include/fxcodec/fx_codec.h"
-
+#include "../../core/include/fpdfapi/fpdfapi.h"
#include "../../core/include/fpdfdoc/fpdf_doc.h"
#include "../../core/include/fpdfdoc/fpdf_vt.h"
-
-#include "../../core/include/fxcrt/fx_xml.h"
+#include "../../core/include/fxge/fx_ge.h"
+#include "../../core/include/fxge/fx_ge_win32.h"
#ifndef FX_GetAValue
diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h
index 166b421580..18092bb8bc 100644
--- a/fpdfsdk/include/fsdk_mgr.h
+++ b/fpdfsdk/include/fsdk_mgr.h
@@ -7,6 +7,7 @@
#ifndef FPDFSDK_INCLUDE_FSDK_MGR_H_
#define FPDFSDK_INCLUDE_FSDK_MGR_H_
+#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_common.h"
@@ -16,6 +17,7 @@
#include "fsdk_baseform.h"
#include "fsdk_annothandler.h"
#include "fsdk_actionhandler.h"
+#include "javascript/IJavaScript.h"
class CPDFSDK_Document;
class CPDFSDK_PageView;
@@ -26,8 +28,6 @@ class IFX_SystemHandler;
class CPDFSDK_ActionHandler;
class CJS_RuntimeFactory;
-#include "javascript/IJavaScript.h"
-
class CPDFDoc_Environment final
{
public:
diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h
index 1d0c55f227..783b249ff6 100644
--- a/fpdfsdk/include/javascript/IJavaScript.h
+++ b/fpdfsdk/include/javascript/IJavaScript.h
@@ -7,7 +7,8 @@
#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
#define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_
-#include "../../../core/include/fxcrt/fx_basic.h"
+#include "../../../core/include/fxcrt/fx_string.h"
+#include "../../../core/include/fxcrt/fx_system.h"
class CPDF_Bookmark;
class CPDF_FormField;
diff --git a/fpdfsdk/include/javascript/JavaScript.h b/fpdfsdk/include/javascript/JavaScript.h
index 96cb9ba31f..655aca07d6 100644
--- a/fpdfsdk/include/javascript/JavaScript.h
+++ b/fpdfsdk/include/javascript/JavaScript.h
@@ -10,13 +10,11 @@
#include <string>
#include <vector>
-#include "../../../core/include/fdrm/fx_crypt.h"
#include "../../../core/include/fpdfapi/fpdf_module.h"
#include "../../../core/include/fpdfapi/fpdf_pageobj.h"
#include "../../../core/include/fpdfapi/fpdf_serial.h"
#include "../../../core/include/fpdfdoc/fpdf_doc.h"
#include "../../../core/include/fpdfdoc/fpdf_vt.h"
-#include "../../../core/include/fxcrt/fx_xml.h"
#include "../fsdk_mgr.h"
#include "../fx_systemhandler.h"
#include "../fxedit/fx_edit.h"
diff --git a/fpdfsdk/include/javascript/resource.h b/fpdfsdk/include/javascript/resource.h
index 88011f2bb0..433785984d 100644
--- a/fpdfsdk/include/javascript/resource.h
+++ b/fpdfsdk/include/javascript/resource.h
@@ -7,7 +7,7 @@
#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_RESOURCE_H_
#define FPDFSDK_INCLUDE_JAVASCRIPT_RESOURCE_H_
-#include "../../../core/include/fxcrt/fx_basic.h" // For CFX_WideString.
+#include "../../../core/include/fxcrt/fx_string.h" // For CFX_WideString.
#include "../fsdk_define.h" // For FX_UINT.
class CJS_Context;
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
index 3cd1e02878..2abb38cd68 100644
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ b/fpdfsdk/include/pdfwindow/PDFWindow.h
@@ -10,7 +10,6 @@
#include "../../../core/include/fpdfapi/fpdf_module.h"
#include "../../../core/include/fpdfdoc/fpdf_doc.h"
#include "../../../core/include/fpdfdoc/fpdf_vt.h"
-#include "../../../core/include/fxcrt/fx_xml.h"
#include "../../../public/fpdf_fwlevent.h"
#include "../fx_systemhandler.h"
#include "../fxedit/fx_edit.h"
diff --git a/fpdfsdk/src/fpdf_ext.cpp b/fpdfsdk/src/fpdf_ext.cpp
index 1e68c6bd70..9afe9b5ea8 100644
--- a/fpdfsdk/src/fpdf_ext.cpp
+++ b/fpdfsdk/src/fpdf_ext.cpp
@@ -4,6 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "../../core/include/fxcrt/fx_xml.h"
#include "../../public/fpdf_ext.h"
#include "../include/fsdk_define.h"
diff --git a/fpdfsdk/src/fpdf_searchex.cpp b/fpdfsdk/src/fpdf_searchex.cpp
index d63f8fff46..e012d30590 100644
--- a/fpdfsdk/src/fpdf_searchex.cpp
+++ b/fpdfsdk/src/fpdf_searchex.cpp
@@ -5,10 +5,14 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "../../public/fpdf_searchex.h"
-#include "../include/fsdk_define.h"
-DLLEXPORT int STDCALL FPDFText_GetCharIndexFromTextIndex(FPDF_TEXTPAGE text_page, int nTextIndex)
+#include "../../core/include/fpdftext/fpdf_text.h"
+
+DLLEXPORT int STDCALL FPDFText_GetCharIndexFromTextIndex(
+ FPDF_TEXTPAGE text_page,
+ int nTextIndex)
{
- if(!text_page) return -1;
- return ((IPDF_TextPage*)text_page)->CharIndexFromTextIndex(nTextIndex);
+ if (!text_page)
+ return -1;
+ return ((IPDF_TextPage*)text_page)->CharIndexFromTextIndex(nTextIndex);
}
diff --git a/fpdfsdk/src/fpdftext.cpp b/fpdfsdk/src/fpdftext.cpp
index 1840247b95..aba24f4991 100644
--- a/fpdfsdk/src/fpdftext.cpp
+++ b/fpdfsdk/src/fpdftext.cpp
@@ -4,8 +4,9 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#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
#include <tchar.h>
diff --git a/fpdfsdk/src/fpdfview.cpp b/fpdfsdk/src/fpdfview.cpp
index 10bfc3db2c..48c6516d22 100644
--- a/fpdfsdk/src/fpdfview.cpp
+++ b/fpdfsdk/src/fpdfview.cpp
@@ -4,6 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#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"
diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp
index 2947a63344..2ba5c3bca5 100644
--- a/fpdfsdk/src/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp
@@ -4,6 +4,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+#include "../../../core/include/fdrm/fx_crypt.h"
#include "../../include/javascript/JavaScript.h"
#include "../../include/javascript/IJavaScript.h"
#include "../../include/javascript/JS_GlobalData.h"
diff --git a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
index 627e7a85d9..58d8a79da1 100644
--- a/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/src/pdfwindow/PWL_Edit.cpp
@@ -5,6 +5,7 @@
// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
#include "../../../core/include/fxcrt/fx_safe_types.h"
+#include "../../../core/include/fxcrt/fx_xml.h"
#include "../../include/pdfwindow/PDFWindow.h"
#include "../../include/pdfwindow/PWL_Caret.h"
#include "../../include/pdfwindow/PWL_Edit.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 14:11:44 +0000