From 012ada613a1462f109eb59790f8e5ee91aacdb7e Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Fri, 19 Jun 2015 13:38:19 -0700
Subject: Disintermediation.

Removed several header files that simply proxy other headers.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1199553002.
---
 core/src/fxcodec/codec/fx_codec_flate.cpp   | 2 +-
 core/src/fxcodec/codec/fx_codec_icc.cpp     | 2 +-
 core/src/fxcodec/codec/fx_codec_jpeg.cpp    | 9 +++++----
 core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'core/src/fxcodec/codec')

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 ff7e241e2f..7666ac6083 100644
--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
@@ -11,6 +11,11 @@
 #include "../../../include/fxge/fx_dib.h"
 #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)
     {
@@ -28,10 +33,6 @@ extern "C" {
         }
     }
 };
-extern "C" {
-#undef FAR
-#include "../libjpeg/fx_libjpeg.h"
-}
 extern "C" {
     static void _src_do_nothing(struct jpeg_decompress_struct* cinfo) {}
 };
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)
-- 
cgit v1.2.3