diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2016-02-17 16:54:43 -0500 |
|---|---|---|
| committer | Dan Sinclair <dsinclair@chromium.org> | 2016-02-17 16:54:43 -0500 |
| commit | efbc1912f10f5a53e7df3a24ebfd6b78412f0bba (patch) | |
| tree | 6f2c0d3d8d884be0af857a0d696ce57d310cf976 | |
| parent | 99afc62bb330118b5d44da9799b75b4c20926592 (diff) | |
| download | pdfium-efbc1912f10f5a53e7df3a24ebfd6b78412f0bba.tar.xz | |
Expand all paths to be based off pdfium/ directory
This CL runs a script over the source and updates the include files to be
a full path from the pdfium/ directory.
BUG=pdfium:65
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1707923002 .
252 files changed, 422 insertions, 427 deletions
diff --git a/core/include/fpdfdoc/fpdf_ap.h b/core/include/fpdfdoc/fpdf_ap.h index 510b39cb9b..f9ade57d97 100644 --- a/core/include/fpdfdoc/fpdf_ap.h +++ b/core/include/fpdfdoc/fpdf_ap.h @@ -8,7 +8,7 @@ #define CORE_INCLUDE_FPDFDOC_FPDF_AP_H_ #include "core/include/fpdfapi/fpdf_parser.h" -#include "fpdf_vt.h" +#include "core/include/fpdfdoc/fpdf_vt.h" class IPVT_FontMap { public: diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h index b0c1d5710a..1c120aa0ab 100644 --- a/core/include/fxcodec/fx_codec.h +++ b/core/include/fxcodec/fx_codec.h @@ -14,7 +14,6 @@ #include "core/include/fxcodec/fx_codec_def.h" #include "core/include/fxcrt/fx_basic.h" #include "core/include/fxcrt/fx_coordinates.h" // For FX_RECT. -#include "fx_codec_def.h" class CFX_DIBSource; class CJPX_Decoder; diff --git a/core/include/fxcrt/fx_arb.h b/core/include/fxcrt/fx_arb.h index 6760ef3d79..112118d5f9 100644 --- a/core/include/fxcrt/fx_arb.h +++ b/core/include/fxcrt/fx_arb.h @@ -7,8 +7,8 @@ #ifndef CORE_INCLUDE_FXCRT_FX_ARB_H_ #define CORE_INCLUDE_FXCRT_FX_ARB_H_ -#include "fx_system.h" -#include "fx_ucd.h" +#include "core/include/fxcrt/fx_system.h" +#include "core/include/fxcrt/fx_ucd.h" class IFX_ArabicChar; diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 7099e28447..3acdda7797 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -9,10 +9,10 @@ #include <algorithm> -#include "fx_memory.h" -#include "fx_stream.h" -#include "fx_string.h" -#include "fx_system.h" +#include "core/include/fxcrt/fx_memory.h" +#include "core/include/fxcrt/fx_stream.h" +#include "core/include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_system.h" // The FX_ArraySize(arr) macro returns the # of elements in an array arr. // The expression is a compile-time constant, and therefore can be diff --git a/core/include/fxcrt/fx_bidi.h b/core/include/fxcrt/fx_bidi.h index ecf888b306..4ea17dae86 100644 --- a/core/include/fxcrt/fx_bidi.h +++ b/core/include/fxcrt/fx_bidi.h @@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "fx_string.h" -#include "fx_system.h" +#include "core/include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_system.h" // Processes characters and group them into segments based on text direction. class CFX_BidiChar { diff --git a/core/include/fxcrt/fx_coordinates.h b/core/include/fxcrt/fx_coordinates.h index bb8f2f71f8..97462303a3 100644 --- a/core/include/fxcrt/fx_coordinates.h +++ b/core/include/fxcrt/fx_coordinates.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FXCRT_FX_COORDINATES_H_ #define CORE_INCLUDE_FXCRT_FX_COORDINATES_H_ -#include "fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" template <class baseType> class CFX_PSVTemplate; diff --git a/core/include/fxcrt/fx_memory.h b/core/include/fxcrt/fx_memory.h index c607de2159..b49305aa32 100644 --- a/core/include/fxcrt/fx_memory.h +++ b/core/include/fxcrt/fx_memory.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FXCRT_FX_MEMORY_H_ #define CORE_INCLUDE_FXCRT_FX_MEMORY_H_ -#include "fx_system.h" +#include "core/include/fxcrt/fx_system.h" #ifdef __cplusplus extern "C" { diff --git a/core/include/fxcrt/fx_safe_types.h b/core/include/fxcrt/fx_safe_types.h index d10bdbeb1a..aec1ca7e96 100644 --- a/core/include/fxcrt/fx_safe_types.h +++ b/core/include/fxcrt/fx_safe_types.h @@ -7,8 +7,8 @@ #include <stdlib.h> // For size_t. -#include "fx_stream.h" // for FX_FILESIZE. -#include "fx_system.h" +#include "core/include/fxcrt/fx_stream.h" // for FX_FILESIZE. +#include "core/include/fxcrt/fx_system.h" #include "third_party/base/numerics/safe_math.h" typedef pdfium::base::CheckedNumeric<FX_DWORD> FX_SAFE_DWORD; diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h index f98e44b846..263a355fff 100644 --- a/core/include/fxcrt/fx_stream.h +++ b/core/include/fxcrt/fx_stream.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FXCRT_FX_STREAM_H_ #define CORE_INCLUDE_FXCRT_FX_STREAM_H_ -#include "fx_string.h" +#include "core/include/fxcrt/fx_string.h" void* FX_OpenFolder(const FX_CHAR* path); void* FX_OpenFolder(const FX_WCHAR* path); diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h index 6abcf52c76..36eba8d1c1 100644 --- a/core/include/fxcrt/fx_string.h +++ b/core/include/fxcrt/fx_string.h @@ -10,8 +10,8 @@ #include <stdint.h> // For intptr_t. #include <algorithm> -#include "fx_memory.h" -#include "fx_system.h" +#include "core/include/fxcrt/fx_memory.h" +#include "core/include/fxcrt/fx_system.h" class CFX_BinaryBuf; class CFX_ByteString; diff --git a/core/include/fxcrt/fx_ucd.h b/core/include/fxcrt/fx_ucd.h index 27812de13d..e091f8bd8a 100644 --- a/core/include/fxcrt/fx_ucd.h +++ b/core/include/fxcrt/fx_ucd.h @@ -7,7 +7,7 @@ #ifndef CORE_INCLUDE_FXCRT_FX_UCD_H_ #define CORE_INCLUDE_FXCRT_FX_UCD_H_ -#include "fx_basic.h" +#include "core/include/fxcrt/fx_basic.h" #define FX_BIDICLASSBITS 6 #define FX_BIDICLASSBITSMASK (31 << FX_BIDICLASSBITS) diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp index 86289f39f9..2d50c5f00f 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_CNS1CID2Unicode_5[19088] = { 0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp index 8bf880808d..6d85584629 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_B5pc_H_0[247 * 3] = { 0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x003D, 0x00FD, 0x00FF, 0x0060, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp index 4d6843725b..a7173980da 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_B5pc_V_0[12 * 3] = { 0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, 0x35B1, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp index 8881c91679..f8ce91983d 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_CNS_EUC_H_0[157 * 3] = { 0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1FE, 0x0063, 0xA2A1, 0xA2FE, 0x00C1, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp index 38ad6ab908..94106cc77b 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_CNS_EUC_V_0[180 * 3] = { 0x0020, 0x007E, 0x3550, 0xA1A1, 0xA1AB, 0x0063, 0xA1AC, 0xA1AC, 0x354E, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp index d67212061b..23a9e055e6 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_ETen_B5_H_0[254 * 3] = { 0x0020, 0x007E, 0x3550, 0xA140, 0xA158, 0x0063, 0xA159, 0xA15C, 0x35AF, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp index f098b1850e..61114e5b53 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_ETen_B5_V_0[13 * 3] = { 0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp index 4d2c92f364..f13970edba 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_ETenms_B5_H_0[1 * 3] = { 0x0020, 0x007E, 0x0001, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp index 80641e727c..029d00030c 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_ETenms_B5_V_0[18 * 3] = { 0xA14B, 0xA14B, 0x354E, 0xA14C, 0xA14C, 0x006D, 0xA156, 0xA156, 0x0138, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp index fc13b86ad0..85871b99d6 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_HKscs_B5_H_5[1210 * 3] = { 0x0020, 0x007E, 0x0001, 0x8740, 0x8765, 0x4A15, 0x8767, 0x8779, 0x4A3B, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp index 4dbcc38a94..564c3ad861 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_HKscs_B5_V_5[13 * 3] = { 0xA14B, 0xA14B, 0x354E, 0xA15A, 0xA15A, 0x35AF, 0xA15C, 0xA15C, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp index 65537ac33a..611739e296 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_UniCNS_UCS2_H_3[16418 * 3] = { 0x0020, 0x007E, 0x0001, 0x00A2, 0x00A3, 0x0106, 0x00A5, 0x00A5, 0x0104, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp index 2ec788ebf5..d01fb73ce1 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_UniCNS_UCS2_V_3[13 * 3] = { 0x2013, 0x2013, 0x0078, 0x2014, 0x2014, 0x007A, 0x2025, 0x2025, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp index a39260b6c6..4ad544034a 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" const FX_WORD g_FXCMAP_UniCNS_UTF16_H_0[14557 * 2] = { 0x0020, 0x0001, 0x0021, 0x0002, 0x0022, 0x0003, 0x0023, 0x0004, 0x0024, diff --git a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp index e105402896..b28c6bc13d 100644 --- a/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_cns1.h" +#include "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_resource.h" diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp index c3d67eaeab..c078ea8b2e 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GB1CID2Unicode_5[30284] = { 0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp index 8e9061168c..047b87a1b0 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GB_EUC_H_0[90 * 3] = { 0x0020, 0x0020, 0x1E24, 0x0021, 0x007E, 0x032E, 0xA1A1, 0xA1FE, 0x0060, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp index d020dc8b52..4502b66f62 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GB_EUC_V_0[20 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp index 0e26a8fdd8..cd737d2e15 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GBK_EUC_H_2[4071 * 3] = { 0x0020, 0x0020, 0x1E24, 0x0021, 0x007E, 0x032E, 0x8140, 0x8178, 0x2758, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp index 336ab39fe4..262c9db221 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GBK_EUC_V_2[20 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp index 47514d3c8e..adca3b7b35 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GBK2K_H_5[4071 * 3] = { 0x0020, 0x007E, 0x0001, 0x8140, 0x8178, 0x2758, 0x8179, 0x8179, 0x2059, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp index 833cf2f77e..5ea2722f4f 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GBK2K_V_5[41 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp index b905785a92..f0a8afe863 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GBKp_EUC_H_2[4070 * 3] = { 0x0020, 0x007E, 0x0001, 0x8140, 0x8178, 0x2758, 0x8179, 0x8179, 0x2059, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp index 53772dc037..094d72be05 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GBKp_EUC_V_2[20 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp index 2f4f15ab68..48af788ceb 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GBpc_EUC_H_0[91 * 3] = { 0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x1E20, 0x00FD, 0x00FF, 0x1E21, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp index fe44bf2ffe..de80fe7a2d 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_GBpc_EUC_V_0[20 * 3] = { 0xA1A2, 0xA1A2, 0x023F, 0xA1A3, 0xA1A3, 0x023E, 0xA1AA, 0xA1AA, 0x0256, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp index c57e346dd7..04423f1262 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_UniGB_UCS2_H_4[13825 * 3] = { 0x0020, 0x007E, 0x0001, 0x00A4, 0x00A4, 0x00A7, 0x00A5, 0x00A5, 0x5752, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp index 80fdc9ec44..496f7ee1be 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" const FX_WORD g_FXCMAP_UniGB_UCS2_V_4[24 * 3] = { 0x2014, 0x2014, 0x0256, 0x2026, 0x2026, 0x0257, 0x2225, 0x2225, 0x1E1C, diff --git a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp index 949d0a121c..234f990821 100644 --- a/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_gb1.h" +#include "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_resource.h" diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp index 605eec0eec..09778bc6cb 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_83pv_RKSJ_H_1[222 * 3] = { 0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x0061, 0x00A0, 0x00DF, 0x0146, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp index 22d02b94c5..8cf3f0122d 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_90ms_RKSJ_H_2[171 * 3] = { 0x0020, 0x007D, 0x00E7, 0x007E, 0x007E, 0x0277, 0x00A0, 0x00DF, 0x0146, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp index 7710edb546..ea8ebbf0e0 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_90ms_RKSJ_V_2[78 * 3] = { 0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp index 2099aefaf5..99a6ae790d 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_90msp_RKSJ_H_2[170 * 3] = { 0x0020, 0x007E, 0x0001, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp index fad0e01db4..f9872f88d6 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_90msp_RKSJ_V_2[78 * 3] = { 0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp index bd85e58874..b00779d4c4 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_90pv_RKSJ_H_1[263 * 3] = { 0x0020, 0x007E, 0x0001, 0x0080, 0x0080, 0x0061, 0x00A0, 0x00DF, 0x0146, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp index 39d326cfa2..ddfad18b86 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_Add_RKSJ_H_1[635 * 3] = { 0x0020, 0x007E, 0x00E7, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp index ea97f38b57..e99b1dee2f 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_Add_RKSJ_V_1[57 * 3] = { 0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp index d6dadd51c7..997d0018f4 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_Japan1CID2Unicode_4[15444] = { 0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp index f3b15d333b..7544e4e4ad 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_EUC_H_1[120 * 3] = { 0x0020, 0x007E, 0x00E7, 0x8EA0, 0x8EDF, 0x0146, 0xA1A1, 0xA1FE, 0x0279, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp index d4004cdad0..ce4fa25811 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_EUC_V_1[27 * 3] = { 0xA1A2, 0xA1A3, 0x1ECF, 0xA1B1, 0xA1B2, 0x1ED1, 0xA1BC, 0xA1BE, 0x1ED3, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp index 850625328b..506c9ecc8b 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_Ext_RKSJ_H_2[665 * 3] = { 0x0020, 0x007E, 0x00E7, 0x00A0, 0x00DF, 0x0146, 0x8140, 0x817E, 0x0279, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp index 7de6f01190..6bbd237ecd 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_Ext_RKSJ_V_2[39 * 3] = { 0x8141, 0x8142, 0x1ECF, 0x8143, 0x8143, 0x204C, 0x8144, 0x8144, 0x2052, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp index ed6cb81502..6bfca50662 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_H_1[118 * 3] = { 0x2121, 0x217E, 0x0279, 0x2221, 0x222E, 0x02D7, 0x223A, 0x2241, 0x02E5, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp index 836a1f177f..4b11e5eb17 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_UniJIS_UCS2_HW_H_4[4 * 3] = { 0x0020, 0x005B, 0x00E7, 0x005C, 0x005C, 0x220F, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp index 997ce05d5c..30e2858ac4 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_UniJIS_UCS2_HW_V_4[199 * 3] = { 0x0020, 0x005B, 0x00E7, 0x005C, 0x005C, 0x220F, 0x005D, 0x007E, 0x0124, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp index 67745afb86..f6ae452b2a 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_UniJIS_UCS2_H_4[9772 * 2] = { 0x0020, 0x0001, 0x0021, 0x0002, 0x0022, 0x0003, 0x0023, 0x0004, 0x0024, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp index 19066d73b8..bc6190bfb6 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_UniJIS_UCS2_V_4[251 * 2] = { 0x00B0, 0x204D, 0x2010, 0x1ED5, 0x2015, 0x1ED4, 0x2016, 0x1ED7, 0x2018, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp index 0bee140882..4f38da8d46 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" const FX_WORD g_FXCMAP_V_1[27 * 3] = { 0x2122, 0x2123, 0x1ECF, 0x2131, 0x2132, 0x1ED1, 0x213C, 0x213E, 0x1ED3, diff --git a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp index 5978f0c363..233c12c7ac 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_japan1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_resource.h" diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp index 7dc85ffcff..47f7313004 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_Korea1CID2Unicode_2[18352] = { 0xFFFD, 0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025, 0x0026, 0x0027, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp index 0e8f005819..17d1d2a042 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_KSC_EUC_H_0[467 * 3] = { 0x0020, 0x007E, 0x1F9E, 0xA1A1, 0xA1FE, 0x0065, 0xA2A1, 0xA2E5, 0x00C3, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp index 624066ddc3..211de4bc05 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_KSC_EUC_V_0[16 * 3] = { 0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp index dd40dae6df..fffb3c64b5 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_KSCms_UHC_HW_H_1[675 * 3] = { 0x0020, 0x007E, 0x1F9E, 0x8141, 0x815A, 0x2475, 0x8161, 0x817A, 0x248F, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp index 9742baf06f..37690536e6 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_KSCms_UHC_HW_V_1[16 * 3] = { 0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp index 69db811511..d14aabba28 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_KSCms_UHC_H_1[675 * 3] = { 0x0020, 0x007E, 0x0001, 0x8141, 0x815A, 0x2475, 0x8161, 0x817A, 0x248F, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp index bc6939a155..c0991de205 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_KSCms_UHC_V_1[16 * 3] = { 0xA1A2, 0xA1A3, 0x1F78, 0xA1A5, 0xA1A5, 0x1F7A, 0xA1A6, 0xA1A6, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp index 170fa55935..9a58d7a4c8 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_KSCpc_EUC_H_0[509 * 3] = { 0x0020, 0x007E, 0x0001, 0x0081, 0x0083, 0x0060, 0x00FE, 0x00FF, 0x0063, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp index 1f74eff26e..99aae1196b 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_UniKS_UCS2_H_1[8394 * 3] = { 0x0020, 0x007E, 0x0001, 0x00A1, 0x00A1, 0x00D0, 0x00A4, 0x00A4, 0x00D6, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp index 5ca70185e1..19638f68bf 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_UniKS_UCS2_V_1[18 * 3] = { 0x2013, 0x2014, 0x1F7B, 0x2016, 0x2016, 0x1F7D, 0x2025, 0x2025, 0x1F7A, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp index 76dc5a7d62..23aba2f2bd 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" const FX_WORD g_FXCMAP_UniKS_UTF16_H_0[158 * 2] = { 0x00A9, 0x0062, 0x2010, 0x0061, 0x20A9, 0x0060, 0x2F00, 0x193C, 0x2F04, diff --git a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp index f6ae70a8dc..9ae97e0b50 100644 --- a/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmaps_korea1.h" +#include "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_resource.h" diff --git a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp index 90091deaac..4964f41f18 100644 --- a/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp +++ b/core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "cmap_int.h" +#include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_resource.h" diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp index ec86a60d6f..52b79b0c1a 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "font_int.h" +#include "core/src/fpdfapi/fpdf_font/font_int.h" #include "core/src/fpdfapi/fpdf_page/pageint.h" #include "core/include/fpdfapi/fpdf_module.h" diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp index 37647c8ef0..34877a866a 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "font_int.h" +#include "core/src/fpdfapi/fpdf_font/font_int.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_page.h" @@ -13,6 +13,7 @@ #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" #include "core/src/fpdfapi/fpdf_cmaps/cmap_int.h" +#include "core/src/fpdfapi/fpdf_font/ttgsubtable.h" namespace { @@ -1037,7 +1038,6 @@ void CPDF_CID2UnicodeMap::Load(CPDF_CMapManager* pMgr, FPDFAPI_LoadCID2UnicodeMap(charset, m_pEmbeddedMap, m_EmbeddedCount); } -#include "ttgsubtable.h" CPDF_CIDFont::CPDF_CIDFont() : CPDF_Font(PDFFONT_CIDFONT) { m_pCMap = NULL; m_pAllocatedCMap = NULL; diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp index 0a8086a193..61961c95e6 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "core/src/fpdfapi/fpdf_font/font_int.h" #include "testing/gtest/include/gtest/gtest.h" -#include "font_int.h" - namespace { bool uint_ranges_equal(uint8_t* a, uint8_t* b, size_t count) { diff --git a/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp b/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp index 9cc529c3df..7ea17408ee 100644 --- a/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp +++ b/core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "core/src/fpdfapi/fpdf_font/font_int.h" #include "testing/gtest/include/gtest/gtest.h" -#include "font_int.h" - TEST(fpdf_font, StringToCode) { EXPECT_EQ(0, CPDF_ToUnicodeMap::StringToCode("")); EXPECT_EQ(194, CPDF_ToUnicodeMap::StringToCode("<c2")); diff --git a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp index 09930bee2d..03a0028e10 100644 --- a/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp +++ b/core/src/fpdfapi/fpdf_font/ttgsubtable.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "ttgsubtable.h" +#include "core/src/fpdfapi/fpdf_font/ttgsubtable.h" #include <memory> diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp index 1a81e1b901..4194ff75eb 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "pageint.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_page.h" diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp index 9620415e55..db2eec69cc 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "pageint.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include <limits.h> diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp index 6ba7e4598b..756e08646a 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "pageint.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "core/include/fdrm/fx_crypt.h" #include "core/include/fpdfapi/fpdf_module.h" diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp index a003d2047f..a428287e19 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "pageint.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_page.h" diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp index 3791f5fec0..01322b5c1f 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "pageint.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "core/include/fpdfapi/fpdf_page.h" #include "core/include/fpdfapi/fpdf_pageobj.h" diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp index 3fc012f29c..846166521d 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp @@ -2,10 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "testing/gtest/include/gtest/gtest.h" -#include "pageint.h" - TEST(fpdf_page_parser_old, ReadHexString) { { // Position out of bounds. diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp index a768434647..09d7b87780 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "pageint.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "core/include/fpdfapi/fpdf_module.h" #include "core/include/fpdfapi/fpdf_page.h" diff --git a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp index dae583e8b9..e6106441fe 100644 --- a/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp +++ b/core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "pageint.h" +#include "core/src/fpdfapi/fpdf_page/pageint.h" #include "core/include/fpdfapi/fpdf_page.h" diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp index a9294acff4..d95885f434 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "render_int.h" +#include "core/src/fpdfapi/fpdf_render/render_int.h" #include "core/include/fpdfapi/fpdf_pageobj.h" #include "core/include/fpdfapi/fpdf_render.h" diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp index d31e214ffd..2bd3e91935 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "render_int.h" +#include "core/src/fpdfapi/fpdf_render/render_int.h" #include <utility> #include <vector> diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp index 6e4dec3b6a..533834e9b1 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "render_int.h" +#include "core/src/fpdfapi/fpdf_render/render_int.h" #include <algorithm> #include <memory> diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp index ed44a04181..7284b627b5 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "render_int.h" +#include "core/src/fpdfapi/fpdf_render/render_int.h" #include "core/include/fpdfapi/fpdf_pageobj.h" #include "core/include/fpdfapi/fpdf_render.h" diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp index 7e2c0bd0fd..f19e6f8258 100644 --- a/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "render_int.h" +#include "core/src/fpdfapi/fpdf_render/render_int.h" #include "core/include/fpdfapi/fpdf_pageobj.h" #include "core/include/fpdfapi/fpdf_render.h" diff --git a/core/src/fpdfdoc/doc_ap.cpp b/core/src/fpdfdoc/doc_ap.cpp index b6134927cf..3ccf4c44d1 100644 --- a/core/src/fpdfdoc/doc_ap.cpp +++ b/core/src/fpdfdoc/doc_ap.cpp @@ -7,8 +7,8 @@ #include "core/include/fpdfdoc/fpdf_ap.h" #include "core/include/fpdfdoc/fpdf_doc.h" #include "core/include/fpdfdoc/fpdf_vt.h" -#include "doc_utils.h" -#include "pdf_vt.h" +#include "core/src/fpdfdoc/doc_utils.h" +#include "core/src/fpdfdoc/pdf_vt.h" #define PBS_SOLID 0 #define PBS_DASH 1 diff --git a/core/src/fpdfdoc/doc_form.cpp b/core/src/fpdfdoc/doc_form.cpp index b4735bed41..aeddb28e96 100644 --- a/core/src/fpdfdoc/doc_form.cpp +++ b/core/src/fpdfdoc/doc_form.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fpdfdoc/fpdf_doc.h" -#include "doc_utils.h" +#include "core/src/fpdfdoc/doc_utils.h" #include "third_party/base/stl_util.h" const int nMaxRecursion = 32; diff --git a/core/src/fpdfdoc/doc_formfield.cpp b/core/src/fpdfdoc/doc_formfield.cpp index 274459aec0..7f85aff4d3 100644 --- a/core/src/fpdfdoc/doc_formfield.cpp +++ b/core/src/fpdfdoc/doc_formfield.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fpdfdoc/fpdf_doc.h" -#include "doc_utils.h" +#include "core/src/fpdfdoc/doc_utils.h" FX_BOOL PDF_FormField_IsUnison(CPDF_FormField* pField) { FX_BOOL bUnison = FALSE; diff --git a/core/src/fpdfdoc/doc_tagged.cpp b/core/src/fpdfdoc/doc_tagged.cpp index bf623eb703..e16d852ccb 100644 --- a/core/src/fpdfdoc/doc_tagged.cpp +++ b/core/src/fpdfdoc/doc_tagged.cpp @@ -7,7 +7,7 @@ #include "core/include/fpdfapi/fpdf_page.h" #include "core/include/fpdfapi/fpdf_parser.h" #include "core/include/fpdfdoc/fpdf_tagged.h" -#include "tagged_int.h" +#include "core/src/fpdfdoc/tagged_int.h" const int nMaxRecursion = 32; static FX_BOOL IsTagged(const CPDF_Document* pDoc) { diff --git a/core/src/fpdfdoc/doc_utils.cpp b/core/src/fpdfdoc/doc_utils.cpp index db905c880f..db5db4ee89 100644 --- a/core/src/fpdfdoc/doc_utils.cpp +++ b/core/src/fpdfdoc/doc_utils.cpp @@ -7,7 +7,7 @@ #include <algorithm> #include "core/include/fpdfdoc/fpdf_doc.h" -#include "doc_utils.h" +#include "core/src/fpdfdoc/doc_utils.h" static const int FPDFDOC_UTILS_MAXRECURSION = 32; diff --git a/core/src/fpdfdoc/doc_vt.cpp b/core/src/fpdfdoc/doc_vt.cpp index e5c9ad8eba..0f8a4e5320 100644 --- a/core/src/fpdfdoc/doc_vt.cpp +++ b/core/src/fpdfdoc/doc_vt.cpp @@ -8,7 +8,7 @@ #include "core/include/fpdfdoc/fpdf_doc.h" #include "core/include/fpdfdoc/fpdf_vt.h" -#include "pdf_vt.h" +#include "core/src/fpdfdoc/pdf_vt.h" const uint8_t gFontSizeSteps[] = {4, 6, 8, 9, 10, 12, 14, 18, 20, 25, 30, 35, 40, 45, 50, 55, 60, 70, diff --git a/core/src/fpdfdoc/doc_vtmodule.cpp b/core/src/fpdfdoc/doc_vtmodule.cpp index c67b9605c7..d5ea91f67e 100644 --- a/core/src/fpdfdoc/doc_vtmodule.cpp +++ b/core/src/fpdfdoc/doc_vtmodule.cpp @@ -6,7 +6,7 @@ #include "core/include/fpdfdoc/fpdf_doc.h" #include "core/include/fpdfdoc/fpdf_vt.h" -#include "pdf_vt.h" +#include "core/src/fpdfdoc/pdf_vt.h" IPDF_VariableText* IPDF_VariableText::NewVariableText() { return new CPDF_VariableText(); diff --git a/core/src/fpdftext/unicodenormalization.cpp b/core/src/fpdftext/unicodenormalization.cpp index b56fe00f3d..d3b404dfcf 100644 --- a/core/src/fpdftext/unicodenormalization.cpp +++ b/core/src/fpdftext/unicodenormalization.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fxcrt/fx_string.h" -#include "unicodenormalizationdata.h" +#include "core/src/fpdftext/unicodenormalizationdata.h" const FX_WCHAR* const g_UnicodeData_Normalization_Maps[5] = { nullptr, diff --git a/core/src/fpdftext/unicodenormalizationdata.cpp b/core/src/fpdftext/unicodenormalizationdata.cpp index 686fe9124f..f3843603d4 100644 --- a/core/src/fpdftext/unicodenormalizationdata.cpp +++ b/core/src/fpdftext/unicodenormalizationdata.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fxcrt/fx_system.h" -#include "unicodenormalizationdata.h" +#include "core/src/fpdftext/unicodenormalizationdata.h" const FX_WCHAR g_UnicodeData_Normalization[65536] = { 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp index 82a6ae67da..17e665d608 100644 --- a/core/src/fxcodec/codec/fx_codec.cpp +++ b/core/src/fxcodec/codec/fx_codec.cpp @@ -9,9 +9,9 @@ #include <cmath> #include <utility> -#include "codec_int.h" #include "core/include/fxcrt/fx_ext.h" #include "core/include/fxcrt/fx_safe_types.h" +#include "core/src/fxcodec/codec/codec_int.h" #include "third_party/base/logging.h" CCodec_ModuleMgr::CCodec_ModuleMgr() diff --git a/core/src/fxcodec/codec/fx_codec_bmp.cpp b/core/src/fxcodec/codec/fx_codec_bmp.cpp index 2396f36c1a..4e5fef0d1d 100644 --- a/core/src/fxcodec/codec/fx_codec_bmp.cpp +++ b/core/src/fxcodec/codec/fx_codec_bmp.cpp @@ -6,7 +6,7 @@ #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxge/fx_dib.h" -#include "codec_int.h" +#include "core/src/fxcodec/codec/codec_int.h" #include "core/src/fxcodec/lbmp/fx_bmp.h" struct FXBMP_Context { bmp_decompress_struct_p bmp_ptr; diff --git a/core/src/fxcodec/codec/fx_codec_fax.cpp b/core/src/fxcodec/codec/fx_codec_fax.cpp index b198e74784..cacbc71456 100644 --- a/core/src/fxcodec/codec/fx_codec_fax.cpp +++ b/core/src/fxcodec/codec/fx_codec_fax.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "codec_int.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/src/fxcodec/codec/codec_int.h" namespace { diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp index ce7c9ade03..faffebda28 100644 --- a/core/src/fxcodec/codec/fx_codec_flate.cpp +++ b/core/src/fxcodec/codec/fx_codec_flate.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "codec_int.h" +#include "core/src/fxcodec/codec/codec_int.h" #include <algorithm> #include <memory> diff --git a/core/src/fxcodec/codec/fx_codec_gif.cpp b/core/src/fxcodec/codec/fx_codec_gif.cpp index d61ccc6f70..4c60a0392c 100644 --- a/core/src/fxcodec/codec/fx_codec_gif.cpp +++ b/core/src/fxcodec/codec/fx_codec_gif.cpp @@ -6,7 +6,7 @@ #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxge/fx_dib.h" -#include "codec_int.h" +#include "core/src/fxcodec/codec/codec_int.h" #include "core/src/fxcodec/lgif/fx_gif.h" struct FXGIF_Context { gif_decompress_struct_p gif_ptr; diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp index 7ae59a6510..c2129eaef2 100644 --- a/core/src/fxcodec/codec/fx_codec_icc.cpp +++ b/core/src/fxcodec/codec/fx_codec_icc.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "codec_int.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/src/fxcodec/codec/codec_int.h" #include "third_party/lcms2-2.6/include/lcms2.h" const FX_DWORD N_COMPONENT_LAB = 3; diff --git a/core/src/fxcodec/codec/fx_codec_jbig.cpp b/core/src/fxcodec/codec/fx_codec_jbig.cpp index 8c7f1bcc7a..0e39e19bc9 100644 --- a/core/src/fxcodec/codec/fx_codec_jbig.cpp +++ b/core/src/fxcodec/codec/fx_codec_jbig.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "codec_int.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/src/fxcodec/codec/codec_int.h" // Holds per-document JBig2 related data. class JBig2DocumentContext : public CFX_DestructObject { diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 4f0494691c..14cc194db4 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -6,10 +6,10 @@ #include <setjmp.h> -#include "codec_int.h" #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxcrt/fx_safe_types.h" #include "core/include/fxge/fx_dib.h" +#include "core/src/fxcodec/codec/codec_int.h" extern "C" { #undef FAR diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index c185d224f0..4ace3ad220 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -8,10 +8,10 @@ #include <limits> #include <vector> -#include "codec_int.h" #include "core/include/fpdfapi/fpdf_resource.h" #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxcrt/fx_safe_types.h" +#include "core/src/fxcodec/codec/codec_int.h" #include "third_party/lcms2-2.6/include/lcms2.h" #include "third_party/libopenjpeg20/openjpeg.h" diff --git a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp index 4139fbde3b..c472ef18c6 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp @@ -6,7 +6,7 @@ #include <limits> -#include "codec_int.h" +#include "core/src/fxcodec/codec/codec_int.h" #include "testing/fx_string_testhelpers.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/core/src/fxcodec/codec/fx_codec_png.cpp b/core/src/fxcodec/codec/fx_codec_png.cpp index 32b0d3d48f..0df3455522 100644 --- a/core/src/fxcodec/codec/fx_codec_png.cpp +++ b/core/src/fxcodec/codec/fx_codec_png.cpp @@ -8,7 +8,7 @@ #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxge/fx_dib.h" -#include "codec_int.h" +#include "core/src/fxcodec/codec/codec_int.h" extern "C" { #undef FAR diff --git a/core/src/fxcodec/codec/fx_codec_progress.cpp b/core/src/fxcodec/codec/fx_codec_progress.cpp index 5dbc19b4b6..1165f7f1d6 100644 --- a/core/src/fxcodec/codec/fx_codec_progress.cpp +++ b/core/src/fxcodec/codec/fx_codec_progress.cpp @@ -6,7 +6,7 @@ #include "core/include/fxge/fx_dib.h" #include "core/include/fxcodec/fx_codec.h" -#include "fx_codec_progress.h" +#include "core/src/fxcodec/codec/fx_codec_progress.h" void CFXCODEC_WeightTable::Calc(int dest_len, int dest_min, int dest_max, diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp index cfdc5feb97..38c2af6287 100644 --- a/core/src/fxcodec/codec/fx_codec_tiff.cpp +++ b/core/src/fxcodec/codec/fx_codec_tiff.cpp @@ -6,7 +6,7 @@ #include "core/include/fxcodec/fx_codec.h" #include "core/include/fxge/fx_dib.h" -#include "codec_int.h" +#include "core/src/fxcodec/codec/codec_int.h" extern "C" { #include "third_party/libtiff/tiffiop.h" diff --git a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp index 3a2f26df77..9e32304f41 100644 --- a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp +++ b/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_ArithDecoder.h" +#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h" -#include "JBig2_BitStream.h" #include "core/include/fxcrt/fx_basic.h" +#include "core/src/fxcodec/jbig2/JBig2_BitStream.h" namespace { diff --git a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp index 6ee255af1b..b3f9911141 100644 --- a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp +++ b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_ArithIntDecoder.h" +#include "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h" #include "core/include/fxcrt/fx_basic.h" diff --git a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h index dc3cb11904..4909ce48f8 100644 --- a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h +++ b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h @@ -9,8 +9,8 @@ #include <vector> -#include "JBig2_ArithDecoder.h" #include "core/include/fxcrt/fx_system.h" +#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h" class CJBig2_ArithIntDecoder { public: diff --git a/core/src/fxcodec/jbig2/JBig2_BitStream.cpp b/core/src/fxcodec/jbig2/JBig2_BitStream.cpp index 42b1e642dc..5e99e80e7c 100644 --- a/core/src/fxcodec/jbig2/JBig2_BitStream.cpp +++ b/core/src/fxcodec/jbig2/JBig2_BitStream.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_BitStream.h" +#include "core/src/fxcodec/jbig2/JBig2_BitStream.h" #include <algorithm> diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h index dd63bcd1b0..ff62062c1f 100644 --- a/core/src/fxcodec/jbig2/JBig2_Context.h +++ b/core/src/fxcodec/jbig2/JBig2_Context.h @@ -11,11 +11,11 @@ #include <memory> #include <utility> -#include "JBig2_List.h" -#include "JBig2_Page.h" -#include "JBig2_Segment.h" #include "core/include/fpdfapi/fpdf_objects.h" #include "core/include/fxcodec/fx_codec_def.h" +#include "core/src/fxcodec/jbig2/JBig2_List.h" +#include "core/src/fxcodec/jbig2/JBig2_Page.h" +#include "core/src/fxcodec/jbig2/JBig2_Segment.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 803e4a70d4..cf0f60405c 100644 --- a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_GrdProc.h" +#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h" #include <memory> -#include "JBig2_ArithDecoder.h" -#include "JBig2_BitStream.h" -#include "JBig2_Image.h" #include "core/include/fxcodec/fx_codec.h" +#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h" +#include "core/src/fxcodec/jbig2/JBig2_BitStream.h" +#include "core/src/fxcodec/jbig2/JBig2_Image.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 e1c5e19fa6..eaa9a76608 100644 --- a/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_GrrdProc.h" +#include "core/src/fxcodec/jbig2/JBig2_GrrdProc.h" #include <memory> -#include "JBig2_ArithDecoder.h" -#include "JBig2_BitStream.h" -#include "JBig2_Image.h" +#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h" +#include "core/src/fxcodec/jbig2/JBig2_BitStream.h" +#include "core/src/fxcodec/jbig2/JBig2_Image.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 5871efb16d..42b3b59142 100644 --- a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_GsidProc.h" +#include "core/src/fxcodec/jbig2/JBig2_GsidProc.h" #include <memory> -#include "JBig2_BitStream.h" -#include "JBig2_GrdProc.h" -#include "JBig2_Image.h" -#include "JBig2_List.h" #include "core/include/fxcrt/fx_basic.h" +#include "core/src/fxcodec/jbig2/JBig2_BitStream.h" +#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h" +#include "core/src/fxcodec/jbig2/JBig2_Image.h" +#include "core/src/fxcodec/jbig2/JBig2_List.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 377af58dfa..d49cab92e5 100644 --- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_HtrdProc.h" +#include "core/src/fxcodec/jbig2/JBig2_HtrdProc.h" #include <memory> -#include "JBig2_GsidProc.h" #include "core/include/fxcrt/fx_basic.h" +#include "core/src/fxcodec/jbig2/JBig2_GsidProc.h" CJBig2_Image* CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* gbContext, diff --git a/core/src/fxcodec/jbig2/JBig2_HtrdProc.h b/core/src/fxcodec/jbig2/JBig2_HtrdProc.h index 30e038058c..f66ad75eca 100644 --- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.h +++ b/core/src/fxcodec/jbig2/JBig2_HtrdProc.h @@ -8,8 +8,7 @@ #define CORE_SRC_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_ #include "core/include/fxcrt/fx_system.h" - -#include "JBig2_Image.h" +#include "core/src/fxcodec/jbig2/JBig2_Image.h" class CJBig2_ArithDecoder; class CJBig2_BitStream; diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp index 4cbecd017a..093d2abadb 100644 --- a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp +++ b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_HuffmanDecoder.h" +#include "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h" -#include "JBig2_Define.h" +#include "core/src/fxcodec/jbig2/JBig2_Define.h" CJBig2_HuffmanDecoder::CJBig2_HuffmanDecoder(CJBig2_BitStream* pStream) : m_pStream(pStream) { diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h index e15e891060..85b393bd41 100644 --- a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h +++ b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h @@ -6,8 +6,8 @@ #ifndef _JBIG2_HUFFMAN_DECODER_H_ #define _JBIG2_HUFFMAN_DECODER_H_ -#include "JBig2_BitStream.h" -#include "JBig2_HuffmanTable.h" +#include "core/src/fxcodec/jbig2/JBig2_BitStream.h" +#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h" class CJBig2_HuffmanDecoder { public: explicit CJBig2_HuffmanDecoder(CJBig2_BitStream* pStream); diff --git a/core/src/fxcodec/jbig2/JBig2_Image.cpp b/core/src/fxcodec/jbig2/JBig2_Image.cpp index 074458744d..16e4243e3b 100644 --- a/core/src/fxcodec/jbig2/JBig2_Image.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Image.cpp @@ -6,9 +6,9 @@ #include <limits.h> -#include "JBig2_Image.h" #include "core/include/fxcrt/fx_coordinates.h" #include "core/include/fxcrt/fx_safe_types.h" +#include "core/src/fxcodec/jbig2/JBig2_Image.h" CJBig2_Image::CJBig2_Image(int32_t w, int32_t h) { m_nWidth = w; diff --git a/core/src/fxcodec/jbig2/JBig2_Image.h b/core/src/fxcodec/jbig2/JBig2_Image.h index c47d275cf7..e7b0779816 100644 --- a/core/src/fxcodec/jbig2/JBig2_Image.h +++ b/core/src/fxcodec/jbig2/JBig2_Image.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_IMAGE_H_ #define CORE_SRC_FXCODEC_JBIG2_JBIG2_IMAGE_H_ -#include "JBig2_Define.h" +#include "core/src/fxcodec/jbig2/JBig2_Define.h" enum JBig2ComposeOp { JBIG2_COMPOSE_OR = 0, diff --git a/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp b/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp index b32daa0de7..aa78954aaa 100644 --- a/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp +++ b/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_PatternDict.h" +#include "core/src/fxcodec/jbig2/JBig2_PatternDict.h" #include "core/include/fxcrt/fx_memory.h" diff --git a/core/src/fxcodec/jbig2/JBig2_PatternDict.h b/core/src/fxcodec/jbig2/JBig2_PatternDict.h index 43250f9163..ac8e062535 100644 --- a/core/src/fxcodec/jbig2/JBig2_PatternDict.h +++ b/core/src/fxcodec/jbig2/JBig2_PatternDict.h @@ -6,8 +6,8 @@ #ifndef _JBIG2_PATTERN_DICT_H_ #define _JBIG2_PATTERN_DICT_H_ -#include "JBig2_Define.h" -#include "JBig2_Image.h" +#include "core/src/fxcodec/jbig2/JBig2_Define.h" +#include "core/src/fxcodec/jbig2/JBig2_Image.h" class CJBig2_PatternDict { public: CJBig2_PatternDict(); diff --git a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp b/core/src/fxcodec/jbig2/JBig2_PddProc.cpp index 179077466c..ba4755ce59 100644 --- a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_PddProc.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_PddProc.h" +#include "core/src/fxcodec/jbig2/JBig2_PddProc.h" #include <memory> -#include "JBig2_GrdProc.h" -#include "JBig2_Image.h" -#include "JBig2_PatternDict.h" +#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h" +#include "core/src/fxcodec/jbig2/JBig2_Image.h" +#include "core/src/fxcodec/jbig2/JBig2_PatternDict.h" CJBig2_PatternDict* CJBig2_PDDProc::decode_Arith( CJBig2_ArithDecoder* pArithDecoder, diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.h b/core/src/fxcodec/jbig2/JBig2_SddProc.h index 77ac049baf..b01ce2fd66 100644 --- a/core/src/fxcodec/jbig2/JBig2_SddProc.h +++ b/core/src/fxcodec/jbig2/JBig2_SddProc.h @@ -9,8 +9,8 @@ #include <vector> -#include "JBig2_ArithDecoder.h" #include "core/include/fxcrt/fx_system.h" +#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h" class CJBig2_BitStream; class CJBig2_HuffmanTable; diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.cpp b/core/src/fxcodec/jbig2/JBig2_Segment.cpp index 41eeafee9e..21fa4d4572 100644 --- a/core/src/fxcodec/jbig2/JBig2_Segment.cpp +++ b/core/src/fxcodec/jbig2/JBig2_Segment.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_Segment.h" +#include "core/src/fxcodec/jbig2/JBig2_Segment.h" #include "core/include/fxcrt/fx_memory.h" diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.h b/core/src/fxcodec/jbig2/JBig2_Segment.h index 4aef27289a..f9e454b4a2 100644 --- a/core/src/fxcodec/jbig2/JBig2_Segment.h +++ b/core/src/fxcodec/jbig2/JBig2_Segment.h @@ -7,10 +7,10 @@ #ifndef _JBIG2_SEGMENT_H_ #define _JBIG2_SEGMENT_H_ -#include "JBig2_Define.h" -#include "JBig2_HuffmanTable.h" -#include "JBig2_PatternDict.h" -#include "JBig2_SymbolDict.h" +#include "core/src/fxcodec/jbig2/JBig2_Define.h" +#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h" +#include "core/src/fxcodec/jbig2/JBig2_PatternDict.h" +#include "core/src/fxcodec/jbig2/JBig2_SymbolDict.h" #define JBIG2_GET_INT32(buf) \ (((buf)[0] << 24) | ((buf)[1] << 16) | ((buf)[2] << 8) | (buf)[3]) diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp index 1e949c5d26..5db77250f0 100644 --- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp +++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_SymbolDict.h" +#include "core/src/fxcodec/jbig2/JBig2_SymbolDict.h" -#include "JBig2_Image.h" #include "core/include/fxcrt/fx_memory.h" +#include "core/src/fxcodec/jbig2/JBig2_Image.h" CJBig2_SymbolDict::CJBig2_SymbolDict() { } diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h index 6f6b303640..5880a83bef 100644 --- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h +++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h @@ -10,9 +10,9 @@ #include <memory> #include <vector> -#include "JBig2_ArithDecoder.h" -#include "JBig2_List.h" #include "core/include/fxcrt/fx_basic.h" +#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h" +#include "core/src/fxcodec/jbig2/JBig2_List.h" class CJBig2_Image; diff --git a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp index e3fd47894e..963c7b1f76 100644 --- a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp +++ b/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp @@ -4,14 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JBig2_TrdProc.h" +#include "core/src/fxcodec/jbig2/JBig2_TrdProc.h" #include <memory> -#include "JBig2_ArithDecoder.h" -#include "JBig2_ArithIntDecoder.h" -#include "JBig2_GrrdProc.h" -#include "JBig2_HuffmanDecoder.h" +#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h" +#include "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h" +#include "core/src/fxcodec/jbig2/JBig2_GrrdProc.h" +#include "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h" CJBig2_Image* CJBig2_TRDProc::decode_Huffman(CJBig2_BitStream* pStream, JBig2ArithCtx* grContext) { diff --git a/core/src/fxcodec/jbig2/JBig2_TrdProc.h b/core/src/fxcodec/jbig2/JBig2_TrdProc.h index 9e0802cde8..423b42f758 100644 --- a/core/src/fxcodec/jbig2/JBig2_TrdProc.h +++ b/core/src/fxcodec/jbig2/JBig2_TrdProc.h @@ -7,8 +7,8 @@ #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_TRDPROC_H_ #define CORE_SRC_FXCODEC_JBIG2_JBIG2_TRDPROC_H_ -#include "JBig2_Image.h" #include "core/include/fxcrt/fx_system.h" +#include "core/src/fxcodec/jbig2/JBig2_Image.h" class CJBig2_ArithDecoder; class CJBig2_ArithIaidDecoder; diff --git a/core/src/fxcodec/lbmp/fx_bmp.cpp b/core/src/fxcodec/lbmp/fx_bmp.cpp index 388daa434f..bfcf2f4722 100644 --- a/core/src/fxcodec/lbmp/fx_bmp.cpp +++ b/core/src/fxcodec/lbmp/fx_bmp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fx_bmp.h" +#include "core/src/fxcodec/lbmp/fx_bmp.h" #include <algorithm> diff --git a/core/src/fxcodec/lgif/fx_gif.cpp b/core/src/fxcodec/lgif/fx_gif.cpp index c00b7a74b2..0be7caad12 100644 --- a/core/src/fxcodec/lgif/fx_gif.cpp +++ b/core/src/fxcodec/lgif/fx_gif.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fx_gif.h" +#include "core/src/fxcodec/lgif/fx_gif.h" void CGifLZWDecoder::Input(uint8_t* src_buf, FX_DWORD src_size) { next_in = src_buf; avail_in = src_size; diff --git a/core/src/fxcrt/fx_arabic.cpp b/core/src/fxcrt/fx_arabic.cpp index 7fb93cfe07..14a57603e1 100644 --- a/core/src/fxcrt/fx_arabic.cpp +++ b/core/src/fxcrt/fx_arabic.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fxcrt/fx_ucd.h" -#include "fx_arabic.h" +#include "core/src/fxcrt/fx_arabic.h" namespace { diff --git a/core/src/fxcrt/fx_basic_list.cpp b/core/src/fxcrt/fx_basic_list.cpp index 81173d6a0b..5944a2c4af 100644 --- a/core/src/fxcrt/fx_basic_list.cpp +++ b/core/src/fxcrt/fx_basic_list.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fxcrt/fx_basic.h" -#include "plex.h" +#include "core/src/fxcrt/plex.h" CFX_PtrList::CFX_PtrList(int nBlockSize) : m_pNodeHead(NULL), diff --git a/core/src/fxcrt/fx_basic_maps.cpp b/core/src/fxcrt/fx_basic_maps.cpp index d9b634e649..2aa63fb088 100644 --- a/core/src/fxcrt/fx_basic_maps.cpp +++ b/core/src/fxcrt/fx_basic_maps.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fxcrt/fx_basic.h" -#include "plex.h" +#include "core/src/fxcrt/plex.h" CFX_MapPtrToPtr::CFX_MapPtrToPtr(int nBlockSize) : m_pHashTable(NULL), diff --git a/core/src/fxcrt/fx_basic_plex.cpp b/core/src/fxcrt/fx_basic_plex.cpp index 91cc1313bd..8689b97bb6 100644 --- a/core/src/fxcrt/fx_basic_plex.cpp +++ b/core/src/fxcrt/fx_basic_plex.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fxcrt/fx_memory.h" -#include "plex.h" +#include "core/src/fxcrt/plex.h" CFX_Plex* CFX_Plex::Create(CFX_Plex*& pHead, FX_DWORD nMax, diff --git a/core/src/fxcrt/fx_extension.cpp b/core/src/fxcrt/fx_extension.cpp index 8a6987b066..fa6245c9d3 100644 --- a/core/src/fxcrt/fx_extension.cpp +++ b/core/src/fxcrt/fx_extension.cpp @@ -6,7 +6,7 @@ #include "core/include/fxcrt/fx_basic.h" #include "core/include/fxcrt/fx_ext.h" -#include "extension.h" +#include "core/src/fxcrt/extension.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ #include <wincrypt.h> diff --git a/core/src/fxcrt/fx_xml_composer.cpp b/core/src/fxcrt/fx_xml_composer.cpp index 5e0b304efe..e539510372 100644 --- a/core/src/fxcrt/fx_xml_composer.cpp +++ b/core/src/fxcrt/fx_xml_composer.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xml_int.h" +#include "core/src/fxcrt/xml_int.h" #include "core/include/fxcrt/fx_xml.h" diff --git a/core/src/fxcrt/fx_xml_parser.cpp b/core/src/fxcrt/fx_xml_parser.cpp index fb8b1db39a..88789437c9 100644 --- a/core/src/fxcrt/fx_xml_parser.cpp +++ b/core/src/fxcrt/fx_xml_parser.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "xml_int.h" +#include "core/src/fxcrt/xml_int.h" #include "core/include/fxcrt/fx_ext.h" #include "core/include/fxcrt/fx_xml.h" diff --git a/core/src/fxcrt/fxcrt_platforms.cpp b/core/src/fxcrt/fxcrt_platforms.cpp index 4c123d3984..85081a237f 100644 --- a/core/src/fxcrt/fxcrt_platforms.cpp +++ b/core/src/fxcrt/fxcrt_platforms.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fxcrt_platforms.h" +#include "core/src/fxcrt/fxcrt_platforms.h" #include "core/include/fxcrt/fx_basic.h" diff --git a/core/src/fxcrt/fxcrt_platforms.h b/core/src/fxcrt/fxcrt_platforms.h index 393df694eb..7c659d3a5f 100644 --- a/core/src/fxcrt/fxcrt_platforms.h +++ b/core/src/fxcrt/fxcrt_platforms.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_ #define CORE_SRC_FXCRT_FXCRT_PLATFORMS_H_ -#include "extension.h" +#include "core/src/fxcrt/extension.h" #if _FX_OS_ == _FX_ANDROID_ void FXCRT_GetFileModeString(FX_DWORD dwModes, CFX_ByteString& bsMode); diff --git a/core/src/fxcrt/fxcrt_posix.cpp b/core/src/fxcrt/fxcrt_posix.cpp index f6710eb49b..1d3b0c2310 100644 --- a/core/src/fxcrt/fxcrt_posix.cpp +++ b/core/src/fxcrt/fxcrt_posix.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fxcrt_posix.h" +#include "core/src/fxcrt/fxcrt_posix.h" #include "core/include/fxcrt/fx_basic.h" diff --git a/core/src/fxcrt/fxcrt_posix.h b/core/src/fxcrt/fxcrt_posix.h index b24721dddd..f67618ff96 100644 --- a/core/src/fxcrt/fxcrt_posix.h +++ b/core/src/fxcrt/fxcrt_posix.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FXCRT_FXCRT_POSIX_H_ #define CORE_SRC_FXCRT_FXCRT_POSIX_H_ -#include "extension.h" +#include "core/src/fxcrt/extension.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_LINUX_ || \ _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ || \ diff --git a/core/src/fxcrt/fxcrt_windows.cpp b/core/src/fxcrt/fxcrt_windows.cpp index 6f379a127c..d5b535bb16 100644 --- a/core/src/fxcrt/fxcrt_windows.cpp +++ b/core/src/fxcrt/fxcrt_windows.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fxcrt_windows.h" +#include "core/src/fxcrt/fxcrt_windows.h" #include "core/include/fxcrt/fx_string.h" diff --git a/core/src/fxcrt/fxcrt_windows.h b/core/src/fxcrt/fxcrt_windows.h index b3a20a91e5..522ceec9e5 100644 --- a/core/src/fxcrt/fxcrt_windows.h +++ b/core/src/fxcrt/fxcrt_windows.h @@ -7,7 +7,7 @@ #ifndef CORE_SRC_FXCRT_FXCRT_WINDOWS_H_ #define CORE_SRC_FXCRT_FXCRT_WINDOWS_H_ -#include "extension.h" +#include "core/src/fxcrt/extension.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ class CFXCRT_FileAccess_Win64 : public IFXCRT_FileAccess { diff --git a/core/src/fxge/android/fpf_skiafont.cpp b/core/src/fxge/android/fpf_skiafont.cpp index 222b28ee8f..81d59a0707 100644 --- a/core/src/fxge/android/fpf_skiafont.cpp +++ b/core/src/fxge/android/fpf_skiafont.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fx_fpf.h" +#include "core/src/fxge/android/fx_fpf.h" #include <algorithm> #if _FX_OS_ == _FX_ANDROID_ -#include "fpf_skiafont.h" -#include "fpf_skiafontmgr.h" +#include "core/src/fxge/android/fpf_skiafont.h" +#include "core/src/fxge/android/fpf_skiafontmgr.h" #define FPF_EM_ADJUST(em, a) (em == 0 ? (a) : (a)*1000 / em) CFPF_SkiaFont::CFPF_SkiaFont() : m_pFontMgr(NULL), diff --git a/core/src/fxge/android/fpf_skiafontmgr.cpp b/core/src/fxge/android/fpf_skiafontmgr.cpp index 2b33228dd6..2c13a594e0 100644 --- a/core/src/fxge/android/fpf_skiafontmgr.cpp +++ b/core/src/fxge/android/fpf_skiafontmgr.cpp @@ -12,8 +12,8 @@ #define FPF_SKIAMATCHWEIGHT_NAME2 60 #define FPF_SKIAMATCHWEIGHT_1 16 #define FPF_SKIAMATCHWEIGHT_2 8 -#include "fpf_skiafontmgr.h" -#include "fpf_skiafont.h" +#include "core/src/fxge/android/fpf_skiafontmgr.h" +#include "core/src/fxge/android/fpf_skiafont.h" #ifdef __cplusplus extern "C" { #endif diff --git a/core/src/fxge/android/fpf_skiamodule.cpp b/core/src/fxge/android/fpf_skiamodule.cpp index fdc3398d30..2cae2c89d1 100644 --- a/core/src/fxge/android/fpf_skiamodule.cpp +++ b/core/src/fxge/android/fpf_skiamodule.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fx_fpf.h" +#include "core/src/fxge/android/fx_fpf.h" #if _FX_OS_ == _FX_ANDROID_ -#include "fpf_skiamodule.h" -#include "fpf_skiafontmgr.h" +#include "core/src/fxge/android/fpf_skiamodule.h" +#include "core/src/fxge/android/fpf_skiafontmgr.h" static IFPF_DeviceModule* gs_pPFModule = NULL; IFPF_DeviceModule* FPF_GetDeviceModule() { if (!gs_pPFModule) { diff --git a/core/src/fxge/android/fx_android_font.cpp b/core/src/fxge/android/fx_android_font.cpp index f4dfc290a3..653aa86853 100644 --- a/core/src/fxge/android/fx_android_font.cpp +++ b/core/src/fxge/android/fx_android_font.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fx_fpf.h" +#include "core/src/fxge/android/fx_fpf.h" #if _FX_OS_ == _FX_ANDROID_ CFX_AndroidFontInfo::CFX_AndroidFontInfo() : m_pFontMgr(NULL) {} FX_BOOL CFX_AndroidFontInfo::Init(IFPF_FontMgr* pFontMgr) { diff --git a/core/src/fxge/android/fx_android_imp.cpp b/core/src/fxge/android/fx_android_imp.cpp index 073a665560..a933ba60dc 100644 --- a/core/src/fxge/android/fx_android_imp.cpp +++ b/core/src/fxge/android/fx_android_imp.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "fx_fpf.h" +#include "core/src/fxge/android/fx_fpf.h" #if _FX_OS_ == _FX_ANDROID_ void CFX_GEModule::InitPlatform() { IFPF_DeviceModule* pDeviceModule = FPF_GetDeviceModule(); diff --git a/core/src/fxge/android/fx_fpf.h b/core/src/fxge/android/fx_fpf.h index 6096884ca9..7fb0ad7182 100644 --- a/core/src/fxge/android/fx_fpf.h +++ b/core/src/fxge/android/fx_fpf.h @@ -10,6 +10,6 @@ #include "core/include/fxge/fpf.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge.h" -#include "fx_android_font.h" +#include "core/src/fxge/android/fx_android_font.h" #endif // CORE_SRC_FXGE_ANDROID_FX_FPF_H_ diff --git a/core/src/fxge/apple/fx_apple_platform.cpp b/core/src/fxge/apple/fx_apple_platform.cpp index a448ae5050..470b19c084 100644 --- a/core/src/fxge/apple/fx_apple_platform.cpp +++ b/core/src/fxge/apple/fx_apple_platform.cpp @@ -9,7 +9,7 @@ #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "apple_int.h" +#include "core/src/fxge/apple/apple_int.h" #include "core/include/fxge/fx_freetype.h" #include "core/include/fxge/fx_ge_apple.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" diff --git a/core/src/fxge/apple/fx_mac_imp.cpp b/core/src/fxge/apple/fx_mac_imp.cpp index 166d3b46f9..1d2f68645d 100644 --- a/core/src/fxge/apple/fx_mac_imp.cpp +++ b/core/src/fxge/apple/fx_mac_imp.cpp @@ -5,7 +5,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include "core/include/fxge/fx_ge.h" -#include "apple_int.h" +#include "core/src/fxge/apple/apple_int.h" #if _FX_OS_ == _FX_MACOSX_ static const struct { diff --git a/core/src/fxge/apple/fx_quartz_device.cpp b/core/src/fxge/apple/fx_quartz_device.cpp index a7b0a9e082..c6c382ca28 100644 --- a/core/src/fxge/apple/fx_quartz_device.cpp +++ b/core/src/fxge/apple/fx_quartz_device.cpp @@ -12,7 +12,7 @@ #include "core/src/fxge/ge/fx_text_int.h" #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ -#include "apple_int.h" +#include "core/src/fxge/apple/apple_int.h" #include "core/include/fxge/fx_ge_apple.h" #ifndef CGFLOAT_IS_DOUBLE #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp index e284f62050..56bde94223 100644 --- a/core/src/fxge/dib/fx_dib_composite.cpp +++ b/core/src/fxge/dib/fx_dib_composite.cpp @@ -6,7 +6,7 @@ #include "core/include/fxge/fx_ge.h" #include "core/include/fxcodec/fx_codec.h" -#include "dib_int.h" +#include "core/src/fxge/dib/dib_int.h" const uint8_t _color_sqrt[256] = { 0x00, 0x03, 0x07, 0x0B, 0x0F, 0x12, 0x16, 0x19, 0x1D, 0x20, 0x23, 0x26, diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp index 16772ed003..de56567c51 100644 --- a/core/src/fxge/dib/fx_dib_engine.cpp +++ b/core/src/fxge/dib/fx_dib_engine.cpp @@ -8,7 +8,7 @@ #include "core/include/fxge/fx_dib.h" #include "core/include/fxge/fx_ge.h" -#include "dib_int.h" +#include "core/src/fxge/dib/dib_int.h" void CWeightTable::Calc(int dest_len, int dest_min, diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 87c113d4ae..484797d3cf 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -10,7 +10,7 @@ #include "core/include/fxge/fx_ge.h" #include "core/include/fxcodec/fx_codec.h" -#include "dib_int.h" +#include "core/src/fxge/dib/dib_int.h" FX_BOOL ConvertBuffer(FXDIB_Format dest_format, uint8_t* dest_buf, diff --git a/core/src/fxge/dib/fx_dib_transform.cpp b/core/src/fxge/dib/fx_dib_transform.cpp index d9740e0111..01c37d207e 100644 --- a/core/src/fxge/dib/fx_dib_transform.cpp +++ b/core/src/fxge/dib/fx_dib_transform.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "dib_int.h" +#include "core/src/fxge/dib/dib_int.h" #include "core/include/fxge/fx_dib.h" diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c b/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c index a653a097fa..ba763aa19d 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitDingbatsFontData [29513] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x11, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixed.c b/core/src/fxge/fontdata/chromefontdata/FoxitFixed.c index af224b448f..d0e6064b77 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitFixed.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitFixed.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitFixedFontData [17597] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0xe, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c b/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c index e4de5f59fa..d3e782c39d 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitFixedBoldFontData [18055] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x13, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.c index 8a90043b40..16d6a7b25b 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitFixedBoldItalicFontData [19151] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x19, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.c index 87d7da09f6..2570b97cc2 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitFixedItalicFontData [18746] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x15, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSans.c b/core/src/fxge/fontdata/chromefontdata/FoxitSans.c index 48465fc6c5..d5ce0620e3 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSans.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSans.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSansFontData [15025] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0xd, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.c b/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.c index 81507983a5..9ce9f3060a 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSansBold.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSansBoldFontData [16344] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x12, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.c index 91200e1026..b118b6a83f 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSansBoldItalicFontData [16418] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x17, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.c index ce6454e885..6612376490 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSansItalicFontData [16339] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x14, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.c b/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.c index dd138281c7..b2cfea9364 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSansMM.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSansMMFontData [66919] = { 0x80, 0x01, 0xD2, 0x29, 0x00, 0x00, 0x25, 0x21, 0x50, 0x53, 0x2D, 0x41, 0x64, 0x6F, 0x62, 0x65, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerif.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerif.c index 6f0c242351..225c68dff2 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSerif.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerif.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSerifFontData [19469] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0xe, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.c index 5f8a3739ad..98d68f0f79 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSerifBoldFontData [19395] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x13, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.c index 162bf496c2..5850a31da0 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSerifBoldItalicFontData [20733] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x19, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c index ff353f7a8c..5f2b269412 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSerifItalicFontData [21227] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0x15, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c b/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c index 49478b65d7..c287d686c1 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSerifMMFontData [113417] = { 0x80, 0x01, 0xD6, 0x29, 0x00, 0x00, 0x25, 0x21, 0x50, 0x53, 0x2D, 0x41, 0x64, 0x6F, 0x62, 0x65, diff --git a/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c b/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c index 465a2361ed..13092bc004 100644 --- a/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c +++ b/core/src/fxge/fontdata/chromefontdata/FoxitSymbol.c @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "chromefontdata.h" +#include "core/src/fxge/fontdata/chromefontdata/chromefontdata.h" const unsigned char g_FoxitSymbolFontData [16729] = {0x1, 0x0, 0x4, 0x2, 0x0, 0x1, 0x1, 0x1, 0xf, diff --git a/core/src/fxge/skia/fx_skia_blitter_new.cpp b/core/src/fxge/skia/fx_skia_blitter_new.cpp index 85391cb77a..f80ca9684d 100644 --- a/core/src/fxge/skia/fx_skia_blitter_new.cpp +++ b/core/src/fxge/skia/fx_skia_blitter_new.cpp @@ -8,7 +8,7 @@ #if defined(_SKIA_SUPPORT_) #include "SkBlitter.h" #include "core/include/fxcodec/fx_codec.h" -#include "fx_skia_blitter_new.h" +#include "core/src/fxge/skia/fx_skia_blitter_new.h" // We use our own renderer here to make it simple void CFX_SkiaRenderer::blitAntiH(int x, diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp index 2e0371f312..1bcbc53e9f 100644 --- a/core/src/fxge/skia/fx_skia_device.cpp +++ b/core/src/fxge/skia/fx_skia_device.cpp @@ -14,8 +14,8 @@ #include "SkStroke.h" #include "core/src/fxge/agg/include/fx_agg_driver.h" -#include "fx_skia_blitter_new.h" -#include "fx_skia_device.h" +#include "core/src/fxge/skia/fx_skia_blitter_new.h" +#include "core/src/fxge/skia/fx_skia_device.h" extern "C" { extern void FX_OUTPUT_LOG_FUNC(const char*, ...); diff --git a/core/src/fxge/win32/fx_win32_dib.cpp b/core/src/fxge/win32/fx_win32_dib.cpp index 1fdf3ae9b1..d3f8b60c08 100644 --- a/core/src/fxge/win32/fx_win32_dib.cpp +++ b/core/src/fxge/win32/fx_win32_dib.cpp @@ -10,7 +10,7 @@ #include <windows.h> #include "core/include/fxge/fx_ge_win32.h" -#include "win32_int.h" +#include "core/src/fxge/win32/win32_int.h" CFX_ByteString CFX_WindowsDIB::GetBitmapInfo(const CFX_DIBitmap* pBitmap) { CFX_ByteString result; diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp index 9e56ee7672..55b9bff2d1 100644 --- a/core/src/fxge/win32/fx_win32_dwrite.cpp +++ b/core/src/fxge/win32/fx_win32_dwrite.cpp @@ -10,7 +10,7 @@ #include <dwrite.h> #include "core/include/fxge/fx_ge_win32.h" -#include "dwrite_int.h" +#include "core/src/fxge/win32/dwrite_int.h" typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)( __in DWRITE_FACTORY_TYPE, diff --git a/core/src/fxge/win32/fx_win32_gdipext.cpp b/core/src/fxge/win32/fx_win32_gdipext.cpp index 2d37865437..aaf7c36919 100644 --- a/core/src/fxge/win32/fx_win32_gdipext.cpp +++ b/core/src/fxge/win32/fx_win32_gdipext.cpp @@ -17,7 +17,7 @@ using std::max; #include <gdiplus.h> #include "core/include/fxge/fx_ge_win32.h" -#include "win32_int.h" +#include "core/src/fxge/win32/win32_int.h" using namespace Gdiplus; using namespace Gdiplus::DllExports; diff --git a/core/src/fxge/win32/fx_win32_print.cpp b/core/src/fxge/win32/fx_win32_print.cpp index fc7cd790a7..4816c03e2c 100644 --- a/core/src/fxge/win32/fx_win32_print.cpp +++ b/core/src/fxge/win32/fx_win32_print.cpp @@ -14,7 +14,7 @@ #include "core/include/fxge/fx_ge_win32.h" #include "core/src/fxge/dib/dib_int.h" #include "core/src/fxge/ge/fx_text_int.h" -#include "win32_int.h" +#include "core/src/fxge/win32/win32_int.h" #define SIZETHRESHOLD 1000 #define OUTPUTPSLEN 4096 diff --git a/core/src/fxge/win32/win32_int.h b/core/src/fxge/win32/win32_int.h index 0616476676..97da0ac15c 100644 --- a/core/src/fxge/win32/win32_int.h +++ b/core/src/fxge/win32/win32_int.h @@ -8,6 +8,7 @@ #define CORE_SRC_FXGE_WIN32_WIN32_INT_H_ #include "core/include/fxge/fx_ge.h" +#include "core/src/fxge/win32/dwrite_int.h" struct WINDIB_Open_Args_; class CGdiplusExt { @@ -97,7 +98,6 @@ class CGdiplusExt { HMODULE m_hModule; HMODULE m_GdiModule; }; -#include "dwrite_int.h" class CWin32Platform { public: FX_BOOL m_bHalfTone; diff --git a/fpdfsdk/include/formfiller/FFL_CheckBox.h b/fpdfsdk/include/formfiller/FFL_CheckBox.h index 27af16be5a..4ffb143734 100644 --- a/fpdfsdk/include/formfiller/FFL_CheckBox.h +++ b/fpdfsdk/include/formfiller/FFL_CheckBox.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_ #define FPDFSDK_INCLUDE_FORMFILLER_FFL_CHECKBOX_H_ -#include "FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" class CFFL_CheckBox : public CFFL_Button { public: diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h index 5c36779df7..590a646d1d 100644 --- a/fpdfsdk/include/formfiller/FFL_ComboBox.h +++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_ #define FPDFSDK_INCLUDE_FORMFILLER_FFL_COMBOBOX_H_ -#include "FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" #include "core/include/fxcrt/fx_string.h" class CBA_FontMap; diff --git a/fpdfsdk/include/formfiller/FFL_ListBox.h b/fpdfsdk/include/formfiller/FFL_ListBox.h index 227f062e46..fe7fed1020 100644 --- a/fpdfsdk/include/formfiller/FFL_ListBox.h +++ b/fpdfsdk/include/formfiller/FFL_ListBox.h @@ -9,7 +9,7 @@ #include <set> -#include "FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" class CBA_FontMap; diff --git a/fpdfsdk/include/formfiller/FFL_PushButton.h b/fpdfsdk/include/formfiller/FFL_PushButton.h index 13d60855b9..a4d0236321 100644 --- a/fpdfsdk/include/formfiller/FFL_PushButton.h +++ b/fpdfsdk/include/formfiller/FFL_PushButton.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_ #define FPDFSDK_INCLUDE_FORMFILLER_FFL_PUSHBUTTON_H_ -#include "FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" class CFFL_PushButton : public CFFL_Button { public: diff --git a/fpdfsdk/include/formfiller/FFL_RadioButton.h b/fpdfsdk/include/formfiller/FFL_RadioButton.h index 3a8280336a..a4e7928e31 100644 --- a/fpdfsdk/include/formfiller/FFL_RadioButton.h +++ b/fpdfsdk/include/formfiller/FFL_RadioButton.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_ #define FPDFSDK_INCLUDE_FORMFILLER_FFL_RADIOBUTTON_H_ -#include "FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" class CFFL_RadioButton : public CFFL_Button { public: diff --git a/fpdfsdk/include/formfiller/FFL_TextField.h b/fpdfsdk/include/formfiller/FFL_TextField.h index 12ac15abb8..f810d8ff64 100644 --- a/fpdfsdk/include/formfiller/FFL_TextField.h +++ b/fpdfsdk/include/formfiller/FFL_TextField.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_ #define FPDFSDK_INCLUDE_FORMFILLER_FFL_TEXTFIELD_H_ -#include "FFL_FormFiller.h" +#include "fpdfsdk/include/formfiller/FFL_FormFiller.h" #define BF_ALIGN_LEFT 0 #define BF_ALIGN_MIDDLE 1 diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h index b5672d178d..920ea64e08 100644 --- a/fpdfsdk/include/fsdk_actionhandler.h +++ b/fpdfsdk/include/fsdk_actionhandler.h @@ -12,7 +12,7 @@ #include "core/include/fpdfdoc/fpdf_doc.h" #include "core/include/fxcrt/fx_string.h" -#include "fsdk_baseform.h" +#include "fpdfsdk/include/fsdk_baseform.h" class CPDFSDK_Annot; class CPDFSDK_Document; diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 5fdf645306..b6944ec80b 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -12,13 +12,13 @@ #include <vector> #include "core/include/fpdftext/fpdf_text.h" -#include "fsdk_actionhandler.h" -#include "fsdk_annothandler.h" -#include "fsdk_baseannot.h" -#include "fsdk_baseform.h" -#include "fsdk_common.h" -#include "fsdk_define.h" -#include "fx_systemhandler.h" +#include "fpdfsdk/include/fsdk_actionhandler.h" +#include "fpdfsdk/include/fsdk_annothandler.h" +#include "fpdfsdk/include/fsdk_baseannot.h" +#include "fpdfsdk/include/fsdk_baseform.h" +#include "fpdfsdk/include/fsdk_common.h" +#include "fpdfsdk/include/fsdk_define.h" +#include "fpdfsdk/include/fx_systemhandler.h" #include "javascript/IJavaScript.h" #include "public/fpdf_formfill.h" #include "public/fpdf_fwlevent.h" // cross platform keycode and events define. diff --git a/fpdfsdk/include/fsdk_rendercontext.h b/fpdfsdk/include/fsdk_rendercontext.h index 8c007b567f..4a542902f9 100644 --- a/fpdfsdk/include/fsdk_rendercontext.h +++ b/fpdfsdk/include/fsdk_rendercontext.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_ #define FPDFSDK_INCLUDE_FSDK_RENDERCONTEXT_H_ -#include "fsdk_define.h" +#include "fpdfsdk/include/fsdk_define.h" #include "public/fpdf_progressive.h" // Everything about rendering is put here: for OOM recovery diff --git a/fpdfsdk/include/fxedit/fxet_list.h b/fpdfsdk/include/fxedit/fxet_list.h index 2700b92cf0..a2f9524b2e 100644 --- a/fpdfsdk/include/fxedit/fxet_list.h +++ b/fpdfsdk/include/fxedit/fxet_list.h @@ -8,7 +8,7 @@ #define FPDFSDK_INCLUDE_FXEDIT_FXET_LIST_H_ #include "core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point. -#include "fx_edit.h" +#include "fpdfsdk/include/fxedit/fx_edit.h" class IFX_Edit; diff --git a/fpdfsdk/include/pdfwindow/PWL_Button.h b/fpdfsdk/include/pdfwindow/PWL_Button.h index 28a026c3bf..5c65c78160 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Button.h +++ b/fpdfsdk/include/pdfwindow/PWL_Button.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_BUTTON_H_ -#include "PWL_Wnd.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CPWL_Button : public CPWL_Wnd { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_Caret.h b/fpdfsdk/include/pdfwindow/PWL_Caret.h index c2a2caf979..a1a5022b25 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Caret.h +++ b/fpdfsdk/include/pdfwindow/PWL_Caret.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_CARET_H_ -#include "PWL_Wnd.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" struct PWL_CARET_INFO { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h index b174f022b8..a6f6a7b591 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ComboBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ComboBox.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_COMBOBOX_H_ -#include "PWL_Edit.h" -#include "PWL_ListBox.h" -#include "PWL_Wnd.h" +#include "fpdfsdk/include/pdfwindow/PWL_Edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_ListBox.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CPWL_CBEdit : public CPWL_Edit { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h index 0d5c931148..9bb40a7de1 100644 --- a/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_EditCtrl.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDITCTRL_H_ -#include "PWL_Wnd.h" #include "core/include/fxcrt/fx_string.h" #include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CPWL_Caret; class CPWL_Edit; diff --git a/fpdfsdk/include/pdfwindow/PWL_Icon.h b/fpdfsdk/include/pdfwindow/PWL_Icon.h index 0d2596f83b..4db62f81be 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Icon.h +++ b/fpdfsdk/include/pdfwindow/PWL_Icon.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICON_H_ -#include "PWL_Wnd.h" #include "core/include/fxcrt/fx_string.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CPWL_Image : public CPWL_Wnd { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_IconList.h b/fpdfsdk/include/pdfwindow/PWL_IconList.h index 0a21bbe8b9..e4c18a8c03 100644 --- a/fpdfsdk/include/pdfwindow/PWL_IconList.h +++ b/fpdfsdk/include/pdfwindow/PWL_IconList.h @@ -7,9 +7,9 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_ICONLIST_H_ -#include "PWL_ListCtrl.h" -#include "PWL_Wnd.h" #include "core/include/fxcrt/fx_string.h" +#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class IPWL_IconList_Notify; class CPWL_IconList_Item; diff --git a/fpdfsdk/include/pdfwindow/PWL_Label.h b/fpdfsdk/include/pdfwindow/PWL_Label.h index aba84fbf79..bed519fe6d 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Label.h +++ b/fpdfsdk/include/pdfwindow/PWL_Label.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LABEL_H_ -#include "PWL_Wnd.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class IFX_Edit; diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h index 807f11ef30..1f42d43fc6 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTBOX_H_ -#include "PWL_Wnd.h" #include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CPDF_ListCtrl; class CPWL_List_Notify; diff --git a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h index 4c96d436c8..7b04a0cdb5 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h +++ b/fpdfsdk/include/pdfwindow/PWL_ListCtrl.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_LISTCTRL_H_ -#include "PWL_Wnd.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CPWL_ListCtrl : public CPWL_Wnd { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_Note.h b/fpdfsdk/include/pdfwindow/PWL_Note.h index 9946f4473d..2d5b564a7f 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Note.h +++ b/fpdfsdk/include/pdfwindow/PWL_Note.h @@ -7,11 +7,11 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_NOTE_H_ -#include "PWL_Button.h" -#include "PWL_Edit.h" -#include "PWL_ListCtrl.h" -#include "PWL_ScrollBar.h" -#include "PWL_Wnd.h" +#include "fpdfsdk/include/pdfwindow/PWL_Button.h" +#include "fpdfsdk/include/pdfwindow/PWL_Edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h" +#include "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CPWL_Label; class CPWL_Note; diff --git a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h index 891079e39e..439bb65ed2 100644 --- a/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h +++ b/fpdfsdk/include/pdfwindow/PWL_ScrollBar.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SCROLLBAR_H_ -#include "PWL_Wnd.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CPWL_SBButton; class CPWL_ScrollBar; diff --git a/fpdfsdk/include/pdfwindow/PWL_Signature.h b/fpdfsdk/include/pdfwindow/PWL_Signature.h index 0dbd906f20..1f2fa733b2 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Signature.h +++ b/fpdfsdk/include/pdfwindow/PWL_Signature.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SIGNATURE_H_ -#include "PWL_Icon.h" -#include "PWL_Wnd.h" +#include "fpdfsdk/include/pdfwindow/PWL_Icon.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CFX_DIBSource; class CPWL_Label; diff --git a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h index a62d18d257..5d372e826f 100644 --- a/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h +++ b/fpdfsdk/include/pdfwindow/PWL_SpecialButton.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_SPECIALBUTTON_H_ -#include "PWL_Button.h" +#include "fpdfsdk/include/pdfwindow/PWL_Button.h" class CPWL_PushButton : public CPWL_Button { public: diff --git a/fpdfsdk/include/pdfwindow/PWL_Utils.h b/fpdfsdk/include/pdfwindow/PWL_Utils.h index 3cc7e0177e..cd033d7bc7 100644 --- a/fpdfsdk/include/pdfwindow/PWL_Utils.h +++ b/fpdfsdk/include/pdfwindow/PWL_Utils.h @@ -7,10 +7,10 @@ #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_ #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_UTILS_H_ -#include "PWL_Wnd.h" #include "core/include/fpdfapi/fpdf_parser.h" // For CPDF_Point. #include "core/include/fpdfdoc/fpdf_vt.h" // For CPVT_WordRange. #include "fpdfsdk/include/fxedit/fx_edit.h" +#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" class CFX_PathData; struct CPWL_Color; diff --git a/fpdfsdk/src/fpdfview_c_api_test.c b/fpdfsdk/src/fpdfview_c_api_test.c index fdf83bec6d..52bbd11b00 100644 --- a/fpdfsdk/src/fpdfview_c_api_test.c +++ b/fpdfsdk/src/fpdfview_c_api_test.c @@ -7,7 +7,7 @@ #include <stdio.h> -#include "fpdfview_c_api_test.h" +#include "fpdfsdk/src/fpdfview_c_api_test.h" #include "public/fpdf_dataavail.h" #include "public/fpdf_doc.h" diff --git a/fpdfsdk/src/javascript/Consts.cpp b/fpdfsdk/src/javascript/Consts.cpp index 7f6b8f8c6a..261f8257a8 100644 --- a/fpdfsdk/src/javascript/Consts.cpp +++ b/fpdfsdk/src/javascript/Consts.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "Consts.h" +#include "fpdfsdk/src/javascript/Consts.h" -#include "JS_Define.h" -#include "JS_Object.h" -#include "JS_Value.h" #include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Value.h" /* ------------------------------ border ------------------------------ */ diff --git a/fpdfsdk/src/javascript/Consts.h b/fpdfsdk/src/javascript/Consts.h index 57c843e660..6cd1d1d809 100644 --- a/fpdfsdk/src/javascript/Consts.h +++ b/fpdfsdk/src/javascript/Consts.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_CONSTS_H_ #define FPDFSDK_SRC_JAVASCRIPT_CONSTS_H_ -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" /* ------------------------------ border ------------------------------ */ diff --git a/fpdfsdk/src/javascript/Document.cpp b/fpdfsdk/src/javascript/Document.cpp index e869e72310..c2638d012d 100644 --- a/fpdfsdk/src/javascript/Document.cpp +++ b/fpdfsdk/src/javascript/Document.cpp @@ -4,20 +4,20 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "Document.h" - -#include "Field.h" -#include "Icon.h" -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_EventHandler.h" -#include "JS_Object.h" -#include "JS_Runtime.h" -#include "JS_Value.h" -#include "app.h" +#include "fpdfsdk/src/javascript/Document.h" + #include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. #include "fpdfsdk/include/javascript/IJavaScript.h" -#include "resource.h" +#include "fpdfsdk/src/javascript/Field.h" +#include "fpdfsdk/src/javascript/Icon.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Runtime.h" +#include "fpdfsdk/src/javascript/JS_Value.h" +#include "fpdfsdk/src/javascript/app.h" +#include "fpdfsdk/src/javascript/resource.h" #include "third_party/base/numerics/safe_math.h" static v8::Isolate* GetIsolate(IJS_Context* cc) { diff --git a/fpdfsdk/src/javascript/Document.h b/fpdfsdk/src/javascript/Document.h index 2295fd7328..c36893fd87 100644 --- a/fpdfsdk/src/javascript/Document.h +++ b/fpdfsdk/src/javascript/Document.h @@ -10,7 +10,7 @@ #include <list> #include <memory> -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" class PrintParamsObj : public CJS_EmbedObj { public: diff --git a/fpdfsdk/src/javascript/Field.cpp b/fpdfsdk/src/javascript/Field.cpp index 24acd6029c..82187c2453 100644 --- a/fpdfsdk/src/javascript/Field.cpp +++ b/fpdfsdk/src/javascript/Field.cpp @@ -4,24 +4,24 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "Field.h" +#include "fpdfsdk/src/javascript/Field.h" #include <algorithm> #include <memory> #include <vector> -#include "Document.h" -#include "Icon.h" -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_EventHandler.h" -#include "JS_Object.h" -#include "JS_Runtime.h" -#include "JS_Value.h" -#include "PublicMethods.h" -#include "color.h" #include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. #include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/src/javascript/Document.h" +#include "fpdfsdk/src/javascript/Icon.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Runtime.h" +#include "fpdfsdk/src/javascript/JS_Value.h" +#include "fpdfsdk/src/javascript/PublicMethods.h" +#include "fpdfsdk/src/javascript/color.h" BEGIN_JS_STATIC_CONST(CJS_Field) END_JS_STATIC_CONST() diff --git a/fpdfsdk/src/javascript/Field.h b/fpdfsdk/src/javascript/Field.h index cd817956d4..21552c4ec7 100644 --- a/fpdfsdk/src/javascript/Field.h +++ b/fpdfsdk/src/javascript/Field.h @@ -9,8 +9,8 @@ #include <string> // For std::wstring. -#include "JS_Define.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. +#include "fpdfsdk/src/javascript/JS_Define.h" class CPDFSDK_Widget; class Document; diff --git a/fpdfsdk/src/javascript/Icon.cpp b/fpdfsdk/src/javascript/Icon.cpp index bce66c0d99..0bad2c5656 100644 --- a/fpdfsdk/src/javascript/Icon.cpp +++ b/fpdfsdk/src/javascript/Icon.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "Icon.h" +#include "fpdfsdk/src/javascript/Icon.h" -#include "JS_Define.h" -#include "JS_Object.h" -#include "JS_Value.h" #include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Value.h" /* ---------------------- Icon ---------------------- */ diff --git a/fpdfsdk/src/javascript/Icon.h b/fpdfsdk/src/javascript/Icon.h index 6ea3153974..512002dce1 100644 --- a/fpdfsdk/src/javascript/Icon.h +++ b/fpdfsdk/src/javascript/Icon.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_ICON_H_ #define FPDFSDK_SRC_JAVASCRIPT_ICON_H_ -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" class Icon : public CJS_EmbedObj { public: diff --git a/fpdfsdk/src/javascript/JS_Context.cpp b/fpdfsdk/src/javascript/JS_Context.cpp index 9dbf5ed50a..304abfaae2 100644 --- a/fpdfsdk/src/javascript/JS_Context.cpp +++ b/fpdfsdk/src/javascript/JS_Context.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Context.h" -#include "JS_EventHandler.h" -#include "JS_Runtime.h" #include "fpdfsdk/include/javascript/IJavaScript.h" -#include "resource.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_Runtime.h" +#include "fpdfsdk/src/javascript/resource.h" /* -------------------------- CJS_Context -------------------------- */ diff --git a/fpdfsdk/src/javascript/JS_Define.h b/fpdfsdk/src/javascript/JS_Define.h index 02b36f9322..3b45ea20a1 100644 --- a/fpdfsdk/src/javascript/JS_Define.h +++ b/fpdfsdk/src/javascript/JS_Define.h @@ -7,10 +7,10 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_ #define FPDFSDK_SRC_JAVASCRIPT_JS_DEFINE_H_ -#include "JS_Object.h" -#include "JS_Value.h" #include "fpdfsdk/include/jsapi/fxjs_v8.h" -#include "resource.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Value.h" +#include "fpdfsdk/src/javascript/resource.h" struct JSConstSpec { const wchar_t* pName; diff --git a/fpdfsdk/src/javascript/JS_EventHandler.cpp b/fpdfsdk/src/javascript/JS_EventHandler.cpp index e413166328..e11cfa39ae 100644 --- a/fpdfsdk/src/javascript/JS_EventHandler.cpp +++ b/fpdfsdk/src/javascript/JS_EventHandler.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JS_EventHandler.h" - -#include "Document.h" -#include "Field.h" -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_Object.h" -#include "JS_Runtime.h" -#include "JS_Value.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" + #include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/src/javascript/Document.h" +#include "fpdfsdk/src/javascript/Field.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Runtime.h" +#include "fpdfsdk/src/javascript/JS_Value.h" /* ---------------------------- CJS_EventHandler ---------------------------- */ diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp index 4d6edc898d..1491d018e7 100644 --- a/fpdfsdk/src/javascript/JS_GlobalData.cpp +++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JS_GlobalData.h" +#include "fpdfsdk/src/javascript/JS_GlobalData.h" #include "core/include/fdrm/fx_crypt.h" #include "fpdfsdk/include/javascript/IJavaScript.h" diff --git a/fpdfsdk/src/javascript/JS_Object.cpp b/fpdfsdk/src/javascript/JS_Object.cpp index 058ec02925..ca9bd00774 100644 --- a/fpdfsdk/src/javascript/JS_Object.cpp +++ b/fpdfsdk/src/javascript/JS_Object.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Object.h" -#include "JS_Context.h" -#include "JS_Define.h" #include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" #include "fpdfsdk/include/javascript/IJavaScript.h" namespace { diff --git a/fpdfsdk/src/javascript/JS_Object.h b/fpdfsdk/src/javascript/JS_Object.h index fe9e5ec5d2..deae2d2a8f 100644 --- a/fpdfsdk/src/javascript/JS_Object.h +++ b/fpdfsdk/src/javascript/JS_Object.h @@ -10,9 +10,9 @@ #include <map> #include <memory> -#include "JS_Runtime.h" #include "fpdfsdk/include/fsdk_define.h" // For FX_UINT #include "fpdfsdk/include/jsapi/fxjs_v8.h" +#include "fpdfsdk/src/javascript/JS_Runtime.h" class CJS_Context; class CJS_Object; diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp index 95f392487a..76221db3f2 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.cpp +++ b/fpdfsdk/src/javascript/JS_Runtime.cpp @@ -4,28 +4,28 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JS_Runtime.h" - -#include "Consts.h" -#include "Document.h" -#include "Field.h" -#include "Icon.h" -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_EventHandler.h" -#include "JS_GlobalData.h" -#include "JS_Object.h" -#include "JS_Value.h" -#include "PublicMethods.h" -#include "app.h" -#include "color.h" -#include "console.h" -#include "event.h" +#include "fpdfsdk/src/javascript/JS_Runtime.h" + #include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. #include "fpdfsdk/include/javascript/IJavaScript.h" -#include "global.h" -#include "report.h" -#include "util.h" +#include "fpdfsdk/src/javascript/Consts.h" +#include "fpdfsdk/src/javascript/Document.h" +#include "fpdfsdk/src/javascript/Field.h" +#include "fpdfsdk/src/javascript/Icon.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_GlobalData.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Value.h" +#include "fpdfsdk/src/javascript/PublicMethods.h" +#include "fpdfsdk/src/javascript/app.h" +#include "fpdfsdk/src/javascript/color.h" +#include "fpdfsdk/src/javascript/console.h" +#include "fpdfsdk/src/javascript/event.h" +#include "fpdfsdk/src/javascript/global.h" +#include "fpdfsdk/src/javascript/report.h" +#include "fpdfsdk/src/javascript/util.h" #include "third_party/base/stl_util.h" #ifdef PDF_ENABLE_XFA diff --git a/fpdfsdk/src/javascript/JS_Runtime.h b/fpdfsdk/src/javascript/JS_Runtime.h index decc553974..6fc3894f44 100644 --- a/fpdfsdk/src/javascript/JS_Runtime.h +++ b/fpdfsdk/src/javascript/JS_Runtime.h @@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "JS_EventHandler.h" #include "core/include/fxcrt/fx_basic.h" #include "fpdfsdk/include/javascript/IJavaScript.h" #include "fpdfsdk/include/jsapi/fxjs_v8.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" class CJS_Context; diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp index c63963a110..17b0d8738d 100644 --- a/fpdfsdk/src/javascript/JS_Value.cpp +++ b/fpdfsdk/src/javascript/JS_Value.cpp @@ -4,16 +4,16 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "JS_Value.h" +#include "fpdfsdk/src/javascript/JS_Value.h" #include <time.h> #include <algorithm> #include <cmath> #include <limits> -#include "Document.h" -#include "JS_Define.h" -#include "JS_Object.h" +#include "fpdfsdk/src/javascript/Document.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Object.h" static const FX_DWORD g_nan[2] = {0, 0x7FF80000}; static double GetNan() { diff --git a/fpdfsdk/src/javascript/PublicMethods.cpp b/fpdfsdk/src/javascript/PublicMethods.cpp index 1a5c83cc46..f510d51d64 100644 --- a/fpdfsdk/src/javascript/PublicMethods.cpp +++ b/fpdfsdk/src/javascript/PublicMethods.cpp @@ -4,23 +4,23 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "PublicMethods.h" +#include "fpdfsdk/src/javascript/PublicMethods.h" #include <algorithm> -#include "Field.h" -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_EventHandler.h" -#include "JS_Object.h" -#include "JS_Runtime.h" -#include "JS_Value.h" -#include "color.h" #include "core/include/fxcrt/fx_ext.h" #include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. #include "fpdfsdk/include/javascript/IJavaScript.h" -#include "resource.h" -#include "util.h" +#include "fpdfsdk/src/javascript/Field.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Runtime.h" +#include "fpdfsdk/src/javascript/JS_Value.h" +#include "fpdfsdk/src/javascript/color.h" +#include "fpdfsdk/src/javascript/resource.h" +#include "fpdfsdk/src/javascript/util.h" #define DOUBLE_CORRECT 0.000000000000001 diff --git a/fpdfsdk/src/javascript/PublicMethods.h b/fpdfsdk/src/javascript/PublicMethods.h index 26640bc40b..aa9be94ec7 100644 --- a/fpdfsdk/src/javascript/PublicMethods.h +++ b/fpdfsdk/src/javascript/PublicMethods.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_PUBLICMETHODS_H_ #define FPDFSDK_SRC_JAVASCRIPT_PUBLICMETHODS_H_ -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" class CJS_PublicMethods : public CJS_Object { public: diff --git a/fpdfsdk/src/javascript/app.cpp b/fpdfsdk/src/javascript/app.cpp index 3a971cf146..a9227a7bdb 100644 --- a/fpdfsdk/src/javascript/app.cpp +++ b/fpdfsdk/src/javascript/app.cpp @@ -4,20 +4,20 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "app.h" +#include "fpdfsdk/src/javascript/app.h" #include <memory> -#include "Document.h" -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_EventHandler.h" -#include "JS_Object.h" -#include "JS_Runtime.h" -#include "JS_Value.h" #include "fpdfsdk/include/fsdk_mgr.h" // For CPDFDoc_Environment. #include "fpdfsdk/include/javascript/IJavaScript.h" -#include "resource.h" +#include "fpdfsdk/src/javascript/Document.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Runtime.h" +#include "fpdfsdk/src/javascript/JS_Value.h" +#include "fpdfsdk/src/javascript/resource.h" BEGIN_JS_STATIC_CONST(CJS_TimerObj) END_JS_STATIC_CONST() diff --git a/fpdfsdk/src/javascript/app.h b/fpdfsdk/src/javascript/app.h index 1eef13e7bb..0b3e50e63d 100644 --- a/fpdfsdk/src/javascript/app.h +++ b/fpdfsdk/src/javascript/app.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_APP_H_ #define FPDFSDK_SRC_JAVASCRIPT_APP_H_ -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" class CJS_Runtime; diff --git a/fpdfsdk/src/javascript/color.cpp b/fpdfsdk/src/javascript/color.cpp index b9c4804727..5c02ca28da 100644 --- a/fpdfsdk/src/javascript/color.cpp +++ b/fpdfsdk/src/javascript/color.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "color.h" - -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_EventHandler.h" -#include "JS_Object.h" -#include "JS_Runtime.h" -#include "JS_Value.h" +#include "fpdfsdk/src/javascript/color.h" + #include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Runtime.h" +#include "fpdfsdk/src/javascript/JS_Value.h" /* -------------------------- color -------------------------- */ diff --git a/fpdfsdk/src/javascript/color.h b/fpdfsdk/src/javascript/color.h index 0cc3f3c289..20f5244a58 100644 --- a/fpdfsdk/src/javascript/color.h +++ b/fpdfsdk/src/javascript/color.h @@ -7,8 +7,8 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_COLOR_H_ #define FPDFSDK_SRC_JAVASCRIPT_COLOR_H_ -#include "JS_Define.h" #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h" // For CPWL_Color. +#include "fpdfsdk/src/javascript/JS_Define.h" class color : public CJS_EmbedObj { public: diff --git a/fpdfsdk/src/javascript/console.cpp b/fpdfsdk/src/javascript/console.cpp index 072e5b7f0d..5666bec255 100644 --- a/fpdfsdk/src/javascript/console.cpp +++ b/fpdfsdk/src/javascript/console.cpp @@ -4,13 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "console.h" +#include "fpdfsdk/src/javascript/console.h" -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_EventHandler.h" -#include "JS_Object.h" -#include "JS_Value.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Value.h" #include "fpdfsdk/include/javascript/IJavaScript.h" /* ------------------------ console ------------------------ */ diff --git a/fpdfsdk/src/javascript/console.h b/fpdfsdk/src/javascript/console.h index f4901045e4..a810184b41 100644 --- a/fpdfsdk/src/javascript/console.h +++ b/fpdfsdk/src/javascript/console.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_CONSOLE_H_ #define FPDFSDK_SRC_JAVASCRIPT_CONSOLE_H_ -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" class console : public CJS_EmbedObj { public: diff --git a/fpdfsdk/src/javascript/event.cpp b/fpdfsdk/src/javascript/event.cpp index 2362c01287..f0f52f77cc 100644 --- a/fpdfsdk/src/javascript/event.cpp +++ b/fpdfsdk/src/javascript/event.cpp @@ -4,15 +4,15 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "event.h" - -#include "Field.h" -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_EventHandler.h" -#include "JS_Object.h" -#include "JS_Value.h" +#include "fpdfsdk/src/javascript/event.h" + #include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/src/javascript/Field.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Value.h" /* -------------------------- event -------------------------- */ diff --git a/fpdfsdk/src/javascript/event.h b/fpdfsdk/src/javascript/event.h index 7ebe571f86..cf37bf6b08 100644 --- a/fpdfsdk/src/javascript/event.h +++ b/fpdfsdk/src/javascript/event.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_EVENT_H_ #define FPDFSDK_SRC_JAVASCRIPT_EVENT_H_ -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" class event : public CJS_EmbedObj { public: diff --git a/fpdfsdk/src/javascript/global.cpp b/fpdfsdk/src/javascript/global.cpp index 7a43b677e9..32995ffbb1 100644 --- a/fpdfsdk/src/javascript/global.cpp +++ b/fpdfsdk/src/javascript/global.cpp @@ -4,17 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "global.h" - -#include "JS_Context.h" -#include "JS_Define.h" -#include "JS_EventHandler.h" -#include "JS_GlobalData.h" -#include "JS_Object.h" -#include "JS_Value.h" +#include "fpdfsdk/src/javascript/global.h" + #include "core/include/fxcrt/fx_ext.h" #include "fpdfsdk/include/javascript/IJavaScript.h" -#include "resource.h" +#include "fpdfsdk/src/javascript/JS_Context.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_EventHandler.h" +#include "fpdfsdk/src/javascript/JS_GlobalData.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Value.h" +#include "fpdfsdk/src/javascript/resource.h" /* ---------------------------- global ---------------------------- */ diff --git a/fpdfsdk/src/javascript/global.h b/fpdfsdk/src/javascript/global.h index 6d2f632645..c2fb076b8c 100644 --- a/fpdfsdk/src/javascript/global.h +++ b/fpdfsdk/src/javascript/global.h @@ -9,7 +9,7 @@ #include <map> -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" class CJS_GlobalData; class CJS_GlobalVariableArray; diff --git a/fpdfsdk/src/javascript/report.cpp b/fpdfsdk/src/javascript/report.cpp index 2ec07fb1e4..952ed21a20 100644 --- a/fpdfsdk/src/javascript/report.cpp +++ b/fpdfsdk/src/javascript/report.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "report.h" +#include "fpdfsdk/src/javascript/report.h" -#include "JS_Define.h" -#include "JS_Object.h" -#include "JS_Value.h" #include "fpdfsdk/include/javascript/IJavaScript.h" +#include "fpdfsdk/src/javascript/JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Object.h" +#include "fpdfsdk/src/javascript/JS_Value.h" /* ---------------------- report ---------------------- */ diff --git a/fpdfsdk/src/javascript/report.h b/fpdfsdk/src/javascript/report.h index 36d1f686f1..dc43912cb1 100644 --- a/fpdfsdk/src/javascript/report.h +++ b/fpdfsdk/src/javascript/report.h @@ -7,7 +7,7 @@ #ifndef FPDFSDK_SRC_JAVASCRIPT_REPORT_H_ #define FPDFSDK_SRC_JAVASCRIPT_REPORT_H_ -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" class Report : public CJS_EmbedObj { public: diff --git a/fpdfsdk/src/javascript/resource.cpp b/fpdfsdk/src/javascript/resource.cpp index d99e7ce95a..7031da34d1 100644 --- a/fpdfsdk/src/javascript/resource.cpp +++ b/fpdfsdk/src/javascript/resource.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "resource.h" +#include "fpdfsdk/src/javascript/resource.h" CFX_WideString JSGetStringFromID(CJS_Context* pContext, FX_UINT id) { switch (id) { diff --git a/fpdfsdk/src/javascript/util.h b/fpdfsdk/src/javascript/util.h index 7b9a18c878..22a8358150 100644 --- a/fpdfsdk/src/javascript/util.h +++ b/fpdfsdk/src/javascript/util.h @@ -9,7 +9,7 @@ #include <string> // For std::wstring. -#include "JS_Define.h" +#include "fpdfsdk/src/javascript/JS_Define.h" class util : public CJS_EmbedObj { public: diff --git a/samples/image_diff.cc b/samples/image_diff.cc index d24652910f..3aa626be65 100644 --- a/samples/image_diff.cc +++ b/samples/image_diff.cc @@ -19,7 +19,7 @@ #include <string> #include <vector> -#include "image_diff_png.h" +#include "samples/image_diff_png.h" #include "third_party/base/logging.h" #include "third_party/base/numerics/safe_conversions.h" diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc index 5f0228ce9e..09913fbe4a 100644 --- a/samples/image_diff_png.cc +++ b/samples/image_diff_png.cc @@ -9,7 +9,7 @@ // This is a duplicate of ui/gfx/codec/png_codec.cc, after removing code related // to Skia, that we can use when running layout tests with minimal dependencies. -#include "image_diff_png.h" +#include "samples/image_diff_png.h" #include <stdlib.h> #include <string.h> diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc index 11afc2fcd6..f2c1e960b2 100644 --- a/samples/pdfium_test.cc +++ b/samples/pdfium_test.cc @@ -13,13 +13,13 @@ #include <utility> #include <vector> -#include "image_diff_png.h" #include "public/fpdf_dataavail.h" #include "public/fpdf_edit.h" #include "public/fpdf_ext.h" #include "public/fpdf_formfill.h" #include "public/fpdf_text.h" #include "public/fpdfview.h" +#include "samples/image_diff_png.h" #include "testing/test_support.h" #ifdef PDF_ENABLE_V8 diff --git a/testing/embedder_test_mock_delegate.h b/testing/embedder_test_mock_delegate.h index 47e795a992..4d43b5c0ec 100644 --- a/testing/embedder_test_mock_delegate.h +++ b/testing/embedder_test_mock_delegate.h @@ -5,7 +5,7 @@ #ifndef TESTING_EMBEDDER_TEST_MOCK_DELEGATE_H_ #define TESTING_EMBEDDER_TEST_MOCK_DELEGATE_H_ -#include "embedder_test.h" +#include "testing/embedder_test.h" #include "testing/gmock/include/gmock/gmock.h" class EmbedderTestMockDelegate : public EmbedderTest::Delegate { diff --git a/testing/embedder_test_timer_handling_delegate.h b/testing/embedder_test_timer_handling_delegate.h index a704bd49df..cb0c31bd95 100644 --- a/testing/embedder_test_timer_handling_delegate.h +++ b/testing/embedder_test_timer_handling_delegate.h @@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "embedder_test.h" -#include "test_support.h" +#include "testing/embedder_test.h" +#include "testing/test_support.h" class EmbedderTestTimerHandlingDelegate : public EmbedderTest::Delegate { public: diff --git a/testing/fx_string_testhelpers.cpp b/testing/fx_string_testhelpers.cpp index 1ee705fa4c..aebe1a82b4 100644 --- a/testing/fx_string_testhelpers.cpp +++ b/testing/fx_string_testhelpers.cpp @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "fx_string_testhelpers.h" +#include "testing/fx_string_testhelpers.h" #include <ios> #include <iomanip> |