diff options
-rw-r--r-- | BUILD.gn | 4 | ||||
-rw-r--r-- | core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_flate.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_icc.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 9 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpx_opj.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/fx_zlib/include/fx_zlib.h | 15 | ||||
-rw-r--r-- | core/src/fxcodec/lcms2/fx_lcms2.h | 12 | ||||
-rw-r--r-- | core/src/fxcodec/lcms2/fx_lcms2_plugin.h | 12 | ||||
-rw-r--r-- | core/src/fxcodec/libjpeg/fx_libjpeg.h | 12 | ||||
-rw-r--r-- | pdfium.gyp | 4 | ||||
-rw-r--r-- | samples/fx_lpng/lpng_v163/pngstruct.h | 2 | ||||
-rw-r--r-- | samples/image_diff_png.cc | 2 |
13 files changed, 11 insertions, 69 deletions
@@ -353,7 +353,6 @@ static_library("fxcodec") { "core/src/fxcodec/codec/fx_codec_jbig_enc.cpp", "core/src/fxcodec/codec/fx_codec_jpeg.cpp", "core/src/fxcodec/codec/fx_codec_jpx_opj.cpp", - "core/src/fxcodec/fx_zlib/include/fx_zlib.h", "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h", "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp", "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h", @@ -382,9 +381,6 @@ static_library("fxcodec") { "core/src/fxcodec/jbig2/JBig2_Segment.h", "core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp", "core/src/fxcodec/jbig2/JBig2_SymbolDict.h", - "core/src/fxcodec/lcms2/fx_lcms2.h", - "core/src/fxcodec/lcms2/fx_lcms2_plugin.h", - "core/src/fxcodec/libjpeg/fx_libjpeg.h", ] configs -= [ "//build/config/compiler:chromium_code" ] 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 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_ diff --git a/pdfium.gyp b/pdfium.gyp index 7cfb298622..2ced8e4d9e 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -344,7 +344,6 @@ 'core/src/fxcodec/codec/fx_codec_jbig_enc.cpp', 'core/src/fxcodec/codec/fx_codec_jpeg.cpp', 'core/src/fxcodec/codec/fx_codec_jpx_opj.cpp', - 'core/src/fxcodec/fx_zlib/include/fx_zlib.h', 'core/src/fxcodec/jbig2/JBig2_ArithDecoder.h', 'core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp', 'core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h', @@ -373,9 +372,6 @@ 'core/src/fxcodec/jbig2/JBig2_Segment.h', 'core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp', 'core/src/fxcodec/jbig2/JBig2_SymbolDict.h', - 'core/src/fxcodec/lcms2/fx_lcms2.h', - 'core/src/fxcodec/lcms2/fx_lcms2_plugin.h', - 'core/src/fxcodec/libjpeg/fx_libjpeg.h', ], 'msvs_settings': { 'VCCLCompilerTool': { diff --git a/samples/fx_lpng/lpng_v163/pngstruct.h b/samples/fx_lpng/lpng_v163/pngstruct.h index 269470531e..25355c4012 100644 --- a/samples/fx_lpng/lpng_v163/pngstruct.h +++ b/samples/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/samples/image_diff_png.cc b/samples/image_diff_png.cc index 04c2591b60..4ece285aa7 100644 --- a/samples/image_diff_png.cc +++ b/samples/image_diff_png.cc @@ -17,7 +17,7 @@ #include <string> #include "../third_party/base/logging.h" -#include "../core/src/fxcodec/fx_zlib/include/fx_zlib.h" +#include "../third_party/zlib_v128/zlib.h" #include "fx_lpng/include/fx_png.h" namespace image_diff_png { |