diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-19 13:56:28 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-19 13:56:28 -0700 |
| commit | c49828916f5b0766f8d6f0fd5bf0a6cc5bd3c1ec (patch) | |
| tree | c8305ef66d7ecad9cad2c1054c71da53bd8e89a6 /core/src/fxcodec/codec | |
| parent | 6f93de501d591a6c2980d38a1ff0a6b5e434b80a (diff) | |
| download | pdfium-c49828916f5b0766f8d6f0fd5bf0a6cc5bd3c1ec.tar.xz | |
Merge to XF: Disintermediation.
(cherry picked from commit 012ada613a1462f109eb59790f8e5ee91aacdb7e)
Review URL: https://codereview.chromium.org/1199553002.
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1197893002.
Diffstat (limited to 'core/src/fxcodec/codec')
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_flate.cpp | 2 | ||||
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_icc.cpp | 2 | ||||
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 9 | ||||
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 2 |
4 files changed, 8 insertions, 7 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp index 8add31f089..99643e4470 100644 --- a/core/src/fxcodec/codec/fx_codec_flate.cpp +++ b/core/src/fxcodec/codec/fx_codec_flate.cpp @@ -5,8 +5,8 @@ // 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 "../fx_zlib/include/fx_zlib.h" #include "codec_int.h" extern "C" diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp index f33d085f56..703d00a496 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 "../../../../third_party/lcms2-2.6/include/lcms2.h" #include "../../../include/fxcodec/fx_codec.h" -#include "../lcms2/fx_lcms2.h" #include "codec_int.h" const FX_DWORD N_COMPONENT_LAB = 3; diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 3115ca25e3..52f83586be 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -12,6 +12,11 @@ #include "codec_int.h" extern "C" { +#undef FAR +#include "../../../../third_party/libjpeg/jpeglib.h" +} + +extern "C" { static void _JpegScanSOI(const uint8_t*& src_buf, FX_DWORD& src_size) { if (src_size == 0) { @@ -29,10 +34,6 @@ extern "C" { } }; extern "C" { -#undef FAR -#include "../libjpeg/fx_libjpeg.h" -} -extern "C" { static void _src_do_nothing(struct jpeg_decompress_struct* cinfo) {} }; 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 8b1759e3ad..2d395b0b4b 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp @@ -7,9 +7,9 @@ #include <algorithm> #include <limits> +#include "../../../../third_party/lcms2-2.6/include/lcms2.h" #include "../../../../third_party/libopenjpeg20/openjpeg.h" #include "../../../include/fxcodec/fx_codec.h" -#include "../lcms2/fx_lcms2.h" #include "codec_int.h" static void fx_error_callback(const char *msg, void *client_data) |