diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-10 09:45:32 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-10 09:45:32 -0800 |
| commit | a9fa50f723654c4e8b26909bb686eaa3721df155 (patch) | |
| tree | dc6b8bc03ed574872a84120d482ab7196ec1cc54 /core/src/fpdfapi/fpdf_edit | |
| parent | d88a364c1c79b294b980c20ebc9356ea42635bff (diff) | |
| download | pdfium-a9fa50f723654c4e8b26909bb686eaa3721df155.tar.xz | |
Merge to XFA: Fix relative includes within core/
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1427633010 .
(cherry picked from commit 9fb27cb9797937499c9678bc74cf7846cbf5d2b8)
Review URL: https://codereview.chromium.org/1438573002 .
Diffstat (limited to 'core/src/fpdfapi/fpdf_edit')
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/editint.h | 7 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp | 6 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp | 7 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp | 8 | ||||
| -rw-r--r-- | core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp | 9 |
5 files changed, 24 insertions, 13 deletions
diff --git a/core/src/fpdfapi/fpdf_edit/editint.h b/core/src/fpdfapi/fpdf_edit/editint.h index 445ea83967..e80fdd3e64 100644 --- a/core/src/fpdfapi/fpdf_edit/editint.h +++ b/core/src/fpdfapi/fpdf_edit/editint.h @@ -7,6 +7,13 @@ #ifndef CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_ #define CORE_SRC_FPDFAPI_FPDF_EDIT_EDITINT_H_ +#include "core/include/fxcrt/fx_basic.h" +#include "core/include/fxcrt/fx_stream.h" +#include "core/include/fxcrt/fx_system.h" + +class CPDF_Creator; +class CPDF_Object; + class CPDF_ObjectStream { public: CPDF_ObjectStream(); diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp index 383284e6f9..452bf0eaa0 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_serial.h" -#include "../../../include/fpdfapi/fpdf_module.h" #include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_serial.h" CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& ar, CFX_AffineMatrix& matrix) { ar << matrix.a << " " << matrix.b << " " << matrix.c << " " << matrix.d << " " diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp index fec4e4f8e1..88cdf2c5dc 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp @@ -4,11 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcrt/fx_ext.h" -#include "../../../include/fpdfapi/fpdf_serial.h" -#include "../../../include/fpdfapi/fpdf_parser.h" #include "editint.h" +#include "core/include/fxcrt/fx_ext.h" +#include "core/include/fpdfapi/fpdf_serial.h" +#include "core/include/fpdfapi/fpdf_parser.h" + #define PDF_OBJECTSTREAM_MAXLENGTH (256 * 1024) #define PDF_XREFSTREAM_MAXSIZE 10000 diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp index 9c1c292fb7..8944d4eba7 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp @@ -4,10 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../fpdf_page/pageint.h" #include <limits.h> + +#include "../fpdf_page/pageint.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" + CPDF_Document::CPDF_Document() : CPDF_IndirectObjects(NULL) { m_pRootDict = NULL; m_pInfoDict = NULL; diff --git a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp index 1dd0ae6170..2ec5727444 100644 --- a/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp +++ b/core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fpdfapi/fpdf_module.h" -#include "../../../include/fpdfapi/fpdf_page.h" -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fpdfapi/fpdf_render.h" #include "../fpdf_page/pageint.h" #include "../fpdf_render/render_int.h" +#include "core/include/fpdfapi/fpdf_module.h" +#include "core/include/fpdfapi/fpdf_page.h" +#include "core/include/fpdfapi/fpdf_render.h" +#include "core/include/fxcodec/fx_codec.h" + CPDF_Dictionary* CPDF_Image::InitJPEG(uint8_t* pData, FX_DWORD size) { int32_t width; int32_t height; |