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/fxcodec/codec/codec_int.h | 2 +- core/src/fxcodec/codec/fx_codec.cpp | 4 ++-- core/src/fxcodec/codec/fx_codec_fax.cpp | 2 +- core/src/fxcodec/codec/fx_codec_flate.cpp | 4 ++-- core/src/fxcodec/codec/fx_codec_icc.cpp | 2 +- core/src/fxcodec/codec/fx_codec_jbig.cpp | 2 +- core/src/fxcodec/codec/fx_codec_jpeg.cpp | 6 +++--- core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) (limited to 'core/src/fxcodec/codec') diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index e8e5b37107..43d9f4cabc 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -11,8 +11,8 @@ #include #include -#include "../../../include/fxcodec/fx_codec.h" #include "../jbig2/JBig2_Context.h" +#include "core/include/fxcodec/fx_codec.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp index 78424bdcad..7b6aacea2d 100644 --- a/core/src/fxcodec/codec/fx_codec.cpp +++ b/core/src/fxcodec/codec/fx_codec.cpp @@ -4,12 +4,12 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcodec/fx_codec.h" +#include "core/include/fxcodec/fx_codec.h" #include -#include "../../../include/fxcrt/fx_safe_types.h" #include "codec_int.h" +#include "core/include/fxcrt/fx_safe_types.h" #include "third_party/base/logging.h" CCodec_ModuleMgr::CCodec_ModuleMgr() diff --git a/core/src/fxcodec/codec/fx_codec_fax.cpp b/core/src/fxcodec/codec/fx_codec_fax.cpp index 5af1d9e7ce..d376fe293b 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 "../../../include/fxcodec/fx_codec.h" #include "codec_int.h" +#include "core/include/fxcodec/fx_codec.h" namespace { diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp index d4e56bf000..8fba3af882 100644 --- a/core/src/fxcodec/codec/fx_codec_flate.cpp +++ b/core/src/fxcodec/codec/fx_codec_flate.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxcodec/fx_codec_flate.h" #include "codec_int.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxcodec/fx_codec_flate.h" #include "third_party/base/nonstd_unique_ptr.h" #include "third_party/zlib_v128/zlib.h" diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp index 67e3d6422e..862872010b 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 "../../../include/fxcodec/fx_codec.h" #include "codec_int.h" +#include "core/include/fxcodec/fx_codec.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 1524b68df0..aa9f1811b7 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 "../../../include/fxcodec/fx_codec.h" #include "codec_int.h" +#include "core/include/fxcodec/fx_codec.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 78ed013b0b..e8016d2ab5 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -6,10 +6,10 @@ #include -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxcrt/fx_safe_types.h" -#include "../../../include/fxge/fx_dib.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" 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 02efdb73b9..3f71035eb3 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -8,9 +8,9 @@ #include #include -#include "../../../include/fxcodec/fx_codec.h" -#include "../../../include/fxcrt/fx_safe_types.h" #include "codec_int.h" +#include "core/include/fxcodec/fx_codec.h" +#include "core/include/fxcrt/fx_safe_types.h" #include "third_party/lcms2-2.6/include/lcms2.h" #include "third_party/libopenjpeg20/openjpeg.h" -- cgit v1.2.3