summaryrefslogtreecommitdiff
path: root/core/src/fxcodec/codec/fx_codec_jpeg.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-19 13:38:19 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-19 13:38:19 -0700
commit012ada613a1462f109eb59790f8e5ee91aacdb7e (patch)
treedddb1175411ec861c2deb0f052ca3836c16fe337 /core/src/fxcodec/codec/fx_codec_jpeg.cpp
parent959eb05140a8f5af7724a2da4cf5d04e2e50f4a6 (diff)
downloadpdfium-012ada613a1462f109eb59790f8e5ee91aacdb7e.tar.xz
Disintermediation.
Removed several header files that simply proxy other headers. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1199553002.
Diffstat (limited to 'core/src/fxcodec/codec/fx_codec_jpeg.cpp')
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpeg.cpp9
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 ff7e241e2f..7666ac6083 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" {