From a9fa50f723654c4e8b26909bb686eaa3721df155 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Tue, 10 Nov 2015 09:45:32 -0800 Subject: 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 . --- core/src/fxge/dib/dib_int.h | 5 +++++ core/src/fxge/dib/fx_dib_composite.cpp | 5 +++-- core/src/fxge/dib/fx_dib_convert.cpp | 7 ++++--- core/src/fxge/dib/fx_dib_engine.cpp | 4 ++-- core/src/fxge/dib/fx_dib_main.cpp | 11 +++++++---- core/src/fxge/dib/fx_dib_transform.cpp | 3 ++- 6 files changed, 23 insertions(+), 12 deletions(-) (limited to 'core/src/fxge/dib') diff --git a/core/src/fxge/dib/dib_int.h b/core/src/fxge/dib/dib_int.h index 69f28234eb..c90e3b105e 100644 --- a/core/src/fxge/dib/dib_int.h +++ b/core/src/fxge/dib/dib_int.h @@ -7,6 +7,11 @@ #ifndef CORE_SRC_FXGE_DIB_DIB_INT_H_ #define CORE_SRC_FXGE_DIB_DIB_INT_H_ +#include "core/include/fxcrt/fx_coordinates.h" +#include "core/include/fxge/fx_dib.h" + +class IFX_ScanlineComposer; + extern const int SDP_Table[513]; class CPDF_FixedMatrix { diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp index 85741fdc54..e89fdcec99 100644 --- a/core/src/fxge/dib/fx_dib_composite.cpp +++ b/core/src/fxge/dib/fx_dib_composite.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_ge.h" +#include "core/include/fxcodec/fx_codec.h" #include "dib_int.h" + const uint8_t _color_sqrt[256] = { 0x00, 0x03, 0x07, 0x0B, 0x0F, 0x12, 0x16, 0x19, 0x1D, 0x20, 0x23, 0x26, 0x29, 0x2C, 0x2F, 0x32, 0x35, 0x37, 0x3A, 0x3C, 0x3F, 0x41, 0x43, 0x46, diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp index d29f00923d..6a01c1f10d 100644 --- a/core/src/fxge/dib/fx_dib_convert.cpp +++ b/core/src/fxge/dib/fx_dib_convert.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_dib.h" -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxcodec/fx_codec.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxge/fx_dib.h" +#include "core/include/fxge/fx_ge.h" + const FX_DWORD g_dwWinPalette[256] = { 0xff000000, 0xff800000, 0xff008000, 0xff808000, 0xff000080, 0xff800080, 0xff008080, 0xff808080, 0xffC0DCC0, 0xffA6CAF0, 0xff2A3FAA, 0xff2A3FFF, diff --git a/core/src/fxge/dib/fx_dib_engine.cpp b/core/src/fxge/dib/fx_dib_engine.cpp index 56bb5abafa..314b600b6c 100644 --- a/core/src/fxge/dib/fx_dib_engine.cpp +++ b/core/src/fxge/dib/fx_dib_engine.cpp @@ -6,8 +6,8 @@ #include -#include "../../../include/fxge/fx_dib.h" -#include "../../../include/fxge/fx_ge.h" +#include "core/include/fxge/fx_dib.h" +#include "core/include/fxge/fx_ge.h" #include "dib_int.h" void CWeightTable::Calc(int dest_len, diff --git a/core/src/fxge/dib/fx_dib_main.cpp b/core/src/fxge/dib/fx_dib_main.cpp index 8c7e831e8c..d8335f96bd 100644 --- a/core/src/fxge/dib/fx_dib_main.cpp +++ b/core/src/fxge/dib/fx_dib_main.cpp @@ -4,11 +4,14 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_dib.h" -#include "../../../include/fxge/fx_ge.h" -#include "../../../include/fxcodec/fx_codec.h" -#include "dib_int.h" +#include "core/include/fxge/fx_dib.h" + #include + +#include "core/include/fxge/fx_ge.h" +#include "core/include/fxcodec/fx_codec.h" +#include "dib_int.h" + FX_BOOL ConvertBuffer(FXDIB_Format dest_format, uint8_t* dest_buf, int dest_pitch, diff --git a/core/src/fxge/dib/fx_dib_transform.cpp b/core/src/fxge/dib/fx_dib_transform.cpp index d368a95c35..99c38afe22 100644 --- a/core/src/fxge/dib/fx_dib_transform.cpp +++ b/core/src/fxge/dib/fx_dib_transform.cpp @@ -4,9 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxge/fx_dib.h" #include "dib_int.h" +#include "core/include/fxge/fx_dib.h" + const int SDP_Table[513] = { 256, 256, 256, 256, 256, 256, 256, 256, 256, 255, 255, 255, 255, 255, 255, 254, 254, 254, 254, 253, 253, 253, 252, 252, 252, 251, 251, 251, 250, 250, -- cgit v1.2.3