From c49828916f5b0766f8d6f0fd5bf0a6cc5bd3c1ec Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 19 Jun 2015 13:56:28 -0700 Subject: 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. --- core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp | 2 +- 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 +- core/src/fxcodec/fx_lpng/lpng_v163/pngstruct.h | 2 +- core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c | 2 +- core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c | 2 +- core/src/fxcodec/fx_zlib/include/fx_zlib.h | 15 --------------- core/src/fxcodec/lcms2/fx_lcms2.h | 12 ------------ core/src/fxcodec/lcms2/fx_lcms2_plugin.h | 12 ------------ core/src/fxcodec/libjpeg/fx_libjpeg.h | 12 ------------ 12 files changed, 12 insertions(+), 62 deletions(-) delete mode 100644 core/src/fxcodec/fx_zlib/include/fx_zlib.h delete mode 100644 core/src/fxcodec/lcms2/fx_lcms2.h delete mode 100644 core/src/fxcodec/lcms2/fx_lcms2_plugin.h delete mode 100644 core/src/fxcodec/libjpeg/fx_libjpeg.h (limited to 'core/src') diff --git a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp index ead5e2474a..ac48dc6c65 100644 --- a/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp +++ b/core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp @@ -4,10 +4,10 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com +#include "../../../../third_party/zlib_v128/zlib.h" #include "../../../include/fpdfapi/fpdf_parser.h" #include "../../../include/fxcodec/fx_codec.h" #include "../../../include/fpdfapi/fpdf_module.h" -#include "../../fxcodec/fx_zlib/include/fx_zlib.h" #include "filters_int.h" CFX_DataFilter::CFX_DataFilter() 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 @@ -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 #include +#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_lpng/lpng_v163/pngstruct.h b/core/src/fxcodec/fx_lpng/lpng_v163/pngstruct.h index 269470531e..25355c4012 100644 --- a/core/src/fxcodec/fx_lpng/lpng_v163/pngstruct.h +++ b/core/src/fxcodec/fx_lpng/lpng_v163/pngstruct.h @@ -28,7 +28,7 @@ /* We must ensure that zlib uses 'const' in declarations. */ # define ZLIB_CONST #endif -#include "../../fx_zlib/include/fx_zlib.h" +#include "../../../third_party/zlib_v128/zlib.h" #ifdef const /* zlib.h sometimes #defines const to nothing, undo this. */ # undef const diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c index 9521338da3..eba913e286 100644 --- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c +++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c @@ -89,7 +89,7 @@ */ #include "tif_predict.h" -#include "../../fx_zlib/include/fx_zlib.h" +#include "../../../../../third_party/zlib_v128/zlib.h" #include #include diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c b/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c index f6e235842b..131db72b47 100644 --- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c +++ b/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c @@ -46,7 +46,7 @@ * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz. */ #include "tif_predict.h" -#include "../../fx_zlib/include/fx_zlib.h" +#include "../../../../../third_party/zlib_v128/zlib.h" #include 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_ -- cgit v1.2.3