summaryrefslogtreecommitdiff
path: root/core/src/fxcodec
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
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')
-rw-r--r--core/src/fxcodec/codec/fx_codec_flate.cpp2
-rw-r--r--core/src/fxcodec/codec/fx_codec_icc.cpp2
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpeg.cpp9
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpx_opj.cpp2
-rw-r--r--core/src/fxcodec/fx_zlib/include/fx_zlib.h15
-rw-r--r--core/src/fxcodec/lcms2/fx_lcms2.h12
-rw-r--r--core/src/fxcodec/lcms2/fx_lcms2_plugin.h12
-rw-r--r--core/src/fxcodec/libjpeg/fx_libjpeg.h12
8 files changed, 8 insertions, 58 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 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" {
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)
diff --git a/core/src/fxcodec/fx_zlib/include/fx_zlib.h b/core/src/fxcodec/fx_zlib/include/fx_zlib.h
deleted file mode 100644
index 88742f48d3..0000000000
--- a/core/src/fxcodec/fx_zlib/include/fx_zlib.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_
-#define CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../../../../../third_party/zlib_v128/zlib.h"
-
-#endif // CORE_SRC_FXCODEC_FX_ZLIB_INCLUDE_FX_ZLIB_H_
diff --git a/core/src/fxcodec/lcms2/fx_lcms2.h b/core/src/fxcodec/lcms2/fx_lcms2.h
deleted file mode 100644
index 86b4fad472..0000000000
--- a/core/src/fxcodec/lcms2/fx_lcms2.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_
-#define CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_
-
-#include "../../../../third_party/lcms2-2.6/include/lcms2.h"
-
-#endif // CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_
diff --git a/core/src/fxcodec/lcms2/fx_lcms2_plugin.h b/core/src/fxcodec/lcms2/fx_lcms2_plugin.h
deleted file mode 100644
index 86b722d261..0000000000
--- a/core/src/fxcodec/lcms2/fx_lcms2_plugin.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_
-#define CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_
-
-#include "../../../../third_party/lcms2-2.6/include/lcms2_plugin.h"
-
-#endif // CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_
diff --git a/core/src/fxcodec/libjpeg/fx_libjpeg.h b/core/src/fxcodec/libjpeg/fx_libjpeg.h
deleted file mode 100644
index 7cab1a4deb..0000000000
--- a/core/src/fxcodec/libjpeg/fx_libjpeg.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef CORE_SRC_FXCODEC_LIBJPEG_FX_LIBJPEG_H_
-#define CORE_SRC_FXCODEC_LIBJPEG_FX_LIBJPEG_H_
-
-#include "../../../../third_party/libjpeg/jpeglib.h"
-
-#endif // CORE_SRC_FXCODEC_LIBJPEG_FX_LIBJPEG_H_