diff options
Diffstat (limited to 'core/src/fpdfapi/fpdf_parser')
11 files changed, 37 insertions, 23 deletions
diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp index e68fcb6800..ff0519c9b5 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp @@ -5,9 +5,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com #include <limits.h> -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fxcodec/fx_codec.h" + +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxcodec/fx_codec.h" #define _STREAM_MAX_SIZE_ 20 * 1024 * 1024 diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp index bcade63831..279151a87a 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp @@ -6,9 +6,9 @@ #include <string> #include "../../../../testing/fx_string_testhelpers.h" -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fxcrt/fx_basic.h" #include "../../../testing/embedder_test.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxcrt/fx_basic.h" #include "testing/gtest/include/gtest/gtest.h" class FPDFParserDecodeEmbeddertest : public EmbedderTest {}; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp index f01e21293c..95d7c84ace 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_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/include/fpdfapi/fpdf_parser.h" #include "testing/gtest/include/gtest/gtest.h" -#include "../../../include/fpdfapi/fpdf_parser.h" - TEST(fpdf_parser_decode, HexDecode) { { // Empty src string. diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp index 3b77fb275b..2e38837137 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp @@ -4,8 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_parser.h" CPDF_Document::CPDF_Document(CPDF_Parser* pParser) : CPDF_IndirectObjects(pParser) { diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp index 125b7e0bf5..363864e588 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp @@ -4,9 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "core/include/fpdfapi/fpdf_parser.h" + #include <time.h> -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fdrm/fx_crypt.h" + +#include "core/include/fdrm/fx_crypt.h" + const uint8_t defpasscode[32] = { 0x28, 0xbf, 0x4e, 0x5e, 0x4e, 0x75, 0x8a, 0x41, 0x64, 0x00, 0x4e, 0x56, 0xff, 0xfa, 0x01, 0x08, 0x2e, 0x2e, 0x00, 0xb6, 0xd0, 0x68, diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp index c766dd397f..d22711c6e4 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp @@ -4,7 +4,8 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_serial.h" +#include "core/include/fpdfapi/fpdf_serial.h" + CFDF_Document::CFDF_Document() : CPDF_IndirectObjects(NULL) { m_pRootDict = NULL; m_pFile = NULL; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp index cfd76aef40..c36e1466a2 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp @@ -4,8 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fxcrt/fx_string.h" +#include "core/include/fpdfapi/fpdf_parser.h" + +#include "core/include/fxcrt/fx_string.h" // static int CPDF_Object::s_nCurRefDepth = 0; diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp index 96f15ecb9d..2fa2762906 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp @@ -4,16 +4,17 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "parser_int.h" + #include <set> #include <utility> #include <vector> -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fxcrt/fx_safe_types.h" #include "../fpdf_page/pageint.h" -#include "parser_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxcrt/fx_safe_types.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/base/stl_util.h" diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp index b86c20e9da..8e953a6ee3 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_unittest.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_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/include/fpdfapi/fpdf_parser.h" +#include "core/include/fxcrt/fx_stream.h" #include "testing/gtest/include/gtest/gtest.h" - -#include "../../../include/fpdfapi/fpdf_parser.h" -#include "../../../include/fxcrt/fx_stream.h" #include "testing/utils/path_service.h" class CPDF_TestParser : public CPDF_Parser { diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp index 335101e85b..89a5deb62d 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp @@ -4,7 +4,7 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_parser.h" +#include "core/include/fpdfapi/fpdf_parser.h" // Indexed by 8-bit character code, contains either: // 'W' - for whitespace: NUL, TAB, CR, LF, FF, 0x80, 0xff diff --git a/core/src/fpdfapi/fpdf_parser/parser_int.h b/core/src/fpdfapi/fpdf_parser/parser_int.h index 5e4dffa8b7..fba6663238 100644 --- a/core/src/fpdfapi/fpdf_parser/parser_int.h +++ b/core/src/fpdfapi/fpdf_parser/parser_int.h @@ -7,7 +7,14 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_PARSER_PARSER_INT_H_ #define CORE_SRC_FPDFAPI_FPDF_PARSER_PARSER_INT_H_ +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_stream.h" + +class CFX_BitStream; class CPDF_DataAvail; +class CPDF_Dictionary; +class CPDF_Stream; +class IFX_DownloadHints; class CPDF_HintTables { public: @@ -17,6 +24,7 @@ class CPDF_HintTables { m_nFirstPageSharedObjs(0), m_szFirstPageObjOffset(0) {} ~CPDF_HintTables(); + FX_BOOL GetPagePos(int index, FX_FILESIZE& szPageStartPos, FX_FILESIZE& szPageLength, @@ -44,4 +52,5 @@ class CPDF_HintTables { CFX_FileSizeArray m_szPageOffsetArray; CFX_FileSizeArray m_szSharedObjOffsetArray; }; + #endif // CORE_SRC_FPDFAPI_FPDF_PARSER_PARSER_INT_H_ |