diff options
author | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
---|---|---|
committer | Lei Zhang <thestig@chromium.org> | 2015-11-05 18:39:40 -0800 |
commit | 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c (patch) | |
tree | 422e979cbfdeab9781c07a4040aee94a9dd0a7f6 /core/src/fxcodec/codec | |
parent | ba2d95fb6d7b6eb3b27ca8e6eb41d9aae1a8b691 (diff) | |
download | pdfium-34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c.tar.xz |
Fix all relative includes to third_party.chromium/2560chromium/2559chromium/2558chromium/2557
- In non-standalone builds, use the provided jpeg library.
- Run gn format over all the GN files.
- Also roll DEPS for buildtools to c2f2598.
BUG=541704
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1425153006 .
Diffstat (limited to 'core/src/fxcodec/codec')
-rw-r--r-- | core/src/fxcodec/codec/codec_int.h | 4 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_flate.cpp | 4 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_icc.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 8 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 4 |
6 files changed, 15 insertions, 9 deletions
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index 1fd228996d..baf06d60a1 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -11,10 +11,10 @@ #include <list> #include <map> -#include "../../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../../third_party/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. #include "../../../include/fxcodec/fx_codec.h" #include "../jbig2/JBig2_Context.h" +#include "third_party/base/nonstd_unique_ptr.h" +#include "third_party/libopenjpeg20/openjpeg.h" // For OPJ_SIZE_T. class CFX_IccProfileCache; class CFX_IccTransformCache; diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp index 46f479e0b1..2f3bd7a6da 100644 --- a/core/src/fxcodec/codec/fx_codec.cpp +++ b/core/src/fxcodec/codec/fx_codec.cpp @@ -8,9 +8,9 @@ #include <cmath> -#include "../../../../third_party/base/logging.h" #include "../../../include/fxcrt/fx_safe_types.h" #include "codec_int.h" +#include "third_party/base/logging.h" CCodec_ModuleMgr::CCodec_ModuleMgr() : m_pBasicModule(new CCodec_BasicModule), diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp index 519ff00522..d4e56bf000 100644 --- a/core/src/fxcodec/codec/fx_codec_flate.cpp +++ b/core/src/fxcodec/codec/fx_codec_flate.cpp @@ -4,11 +4,11 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../third_party/base/nonstd_unique_ptr.h" -#include "../../../../third_party/zlib_v128/zlib.h" #include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fxcodec/fx_codec_flate.h" #include "codec_int.h" +#include "third_party/base/nonstd_unique_ptr.h" +#include "third_party/zlib_v128/zlib.h" extern "C" { static void* my_alloc_func(void* opaque, diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp index 2a8ccc364c..67e3d6422e 100644 --- a/core/src/fxcodec/codec/fx_codec_icc.cpp +++ b/core/src/fxcodec/codec/fx_codec_icc.cpp @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../../third_party/lcms2-2.6/include/lcms2.h" #include "../../../include/fxcodec/fx_codec.h" #include "codec_int.h" +#include "third_party/lcms2-2.6/include/lcms2.h" const FX_DWORD N_COMPONENT_LAB = 3; const FX_DWORD N_COMPONENT_GRAY = 1; diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 544a6d14cf..925864f2e2 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -13,7 +13,13 @@ extern "C" { #undef FAR -#include "../../../../third_party/libjpeg/jpeglib.h" +#if defined(USE_SYSTEM_LIBJPEG) +#include <jpeglib.h> +#elif defined(USE_LIBJPEG_TURBO) +#include "third_party/libjpeg_turbo/jpeglib.h" +#else +#include "third_party/libjpeg/jpeglib.h" +#endif } extern "C" { diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp index 616af36b00..02efdb73b9 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -8,11 +8,11 @@ #include <limits> #include <vector> -#include "../../../../third_party/lcms2-2.6/include/lcms2.h" -#include "../../../../third_party/libopenjpeg20/openjpeg.h" #include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fxcrt/fx_safe_types.h" #include "codec_int.h" +#include "third_party/lcms2-2.6/include/lcms2.h" +#include "third_party/libopenjpeg20/openjpeg.h" static void fx_error_callback(const char* msg, void* client_data) { (void)client_data; |