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/fx_codec_jpeg.cpp | |
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/fx_codec_jpeg.cpp')
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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" { |