diff options
-rw-r--r-- | BUILD.gn | 57 | ||||
-rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpeg.cpp | 2 | ||||
-rw-r--r-- | core/src/fxcodec/libjpeg/fx_libjpeg.h (renamed from core/src/fx_jpeglib.h) | 8 | ||||
-rw-r--r-- | core/src/fxcodec/libjpeg/makefile | 8 | ||||
-rw-r--r-- | pdfium.gyp | 57 | ||||
-rw-r--r-- | third_party/BUILD.gn | 65 | ||||
-rw-r--r-- | third_party/libjpeg/cderror.h (renamed from core/src/fxcodec/libjpeg/cderror.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/cdjpeg.h (renamed from core/src/fxcodec/libjpeg/cdjpeg.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcapimin.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcapimin.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcapistd.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcapistd.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jccoefct.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jccoefct.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jccolor.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jccolor.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcdctmgr.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcdctmgr.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jchuff.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jchuff.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcinit.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcinit.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcmainct.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcmainct.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcmarker.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcmarker.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcmaster.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcmaster.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcomapi.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcomapi.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcparam.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcparam.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcphuff.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcphuff.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcprepct.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcprepct.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jcsample.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jcsample.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jctrans.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jctrans.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdapimin.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdapimin.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdapistd.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdapistd.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdcoefct.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdcoefct.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdcolor.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdcolor.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jddctmgr.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jddctmgr.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdhuff.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdhuff.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdinput.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdinput.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdmainct.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdmainct.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdmarker.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdmarker.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdmaster.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdmaster.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdmerge.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdmerge.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdphuff.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdphuff.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdpostct.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdpostct.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdsample.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdsample.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jdtrans.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jdtrans.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jerror.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jerror.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jfdctfst.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jfdctfst.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jfdctint.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jfdctint.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jidctfst.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jidctfst.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jidctint.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jidctint.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jidctred.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jidctred.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jmemmgr.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jmemmgr.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jmemnobs.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jmemnobs.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/fpdfapi_jutils.c (renamed from core/src/fxcodec/libjpeg/fpdfapi_jutils.c) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jchuff.h (renamed from core/src/fxcodec/libjpeg/jchuff.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jconfig.h (renamed from core/src/fxcodec/libjpeg/jconfig.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jdct.h (renamed from core/src/fxcodec/libjpeg/jdct.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jdhuff.h (renamed from core/src/fxcodec/libjpeg/jdhuff.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jerror.h (renamed from core/src/fxcodec/libjpeg/jerror.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jinclude.h (renamed from core/src/fxcodec/libjpeg/jinclude.h) | 2 | ||||
-rw-r--r-- | third_party/libjpeg/jmemsys.h (renamed from core/src/fxcodec/libjpeg/jmemsys.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jmorecfg.h (renamed from core/src/fxcodec/libjpeg/jmorecfg.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jpegint.h (renamed from core/src/fxcodec/libjpeg/jpegint.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jpeglib.h (renamed from core/src/fxcodec/libjpeg/jpeglib.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/jversion.h (renamed from core/src/fxcodec/libjpeg/jversion.h) | 0 | ||||
-rw-r--r-- | third_party/libjpeg/transupp.h (renamed from core/src/fxcodec/libjpeg/transupp.h) | 0 | ||||
-rw-r--r-- | third_party/third_party.gyp | 70 |
61 files changed, 145 insertions, 124 deletions
@@ -316,6 +316,7 @@ static_library("fpdftext") { static_library("fxcodec") { deps = [ "third_party:fx_lcms2", + "third_party:fx_libjpeg", ] sources = [ "core/include/fxcodec/fx_codec.h", @@ -459,61 +460,7 @@ static_library("fxcodec") { "core/src/fxcodec/lcms2/fx_lcms2_plugin.h", "core/src/fxcodec/lgif/fx_gif.cpp", "core/src/fxcodec/lgif/fx_gif.h", - "core/src/fxcodec/libjpeg/cderror.h", - "core/src/fxcodec/libjpeg/cdjpeg.h", - "core/src/fxcodec/libjpeg/fpdfapi_jcapimin.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcapistd.c", - "core/src/fxcodec/libjpeg/fpdfapi_jccoefct.c", - "core/src/fxcodec/libjpeg/fpdfapi_jccolor.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcdctmgr.c", - "core/src/fxcodec/libjpeg/fpdfapi_jchuff.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcinit.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcmainct.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcmarker.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcmaster.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcomapi.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcparam.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcphuff.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcprepct.c", - "core/src/fxcodec/libjpeg/fpdfapi_jcsample.c", - "core/src/fxcodec/libjpeg/fpdfapi_jctrans.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdapimin.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdapistd.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdcoefct.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdcolor.c", - "core/src/fxcodec/libjpeg/fpdfapi_jddctmgr.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdhuff.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdinput.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdmainct.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdmarker.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdmaster.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdmerge.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdphuff.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdpostct.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdsample.c", - "core/src/fxcodec/libjpeg/fpdfapi_jdtrans.c", - "core/src/fxcodec/libjpeg/fpdfapi_jerror.c", - "core/src/fxcodec/libjpeg/fpdfapi_jfdctfst.c", - "core/src/fxcodec/libjpeg/fpdfapi_jfdctint.c", - "core/src/fxcodec/libjpeg/fpdfapi_jidctfst.c", - "core/src/fxcodec/libjpeg/fpdfapi_jidctint.c", - "core/src/fxcodec/libjpeg/fpdfapi_jidctred.c", - "core/src/fxcodec/libjpeg/fpdfapi_jmemmgr.c", - "core/src/fxcodec/libjpeg/fpdfapi_jmemnobs.c", - "core/src/fxcodec/libjpeg/fpdfapi_jutils.c", - "core/src/fxcodec/libjpeg/jchuff.h", - "core/src/fxcodec/libjpeg/jconfig.h", - "core/src/fxcodec/libjpeg/jdct.h", - "core/src/fxcodec/libjpeg/jdhuff.h", - "core/src/fxcodec/libjpeg/jerror.h", - "core/src/fxcodec/libjpeg/jinclude.h", - "core/src/fxcodec/libjpeg/jmemsys.h", - "core/src/fxcodec/libjpeg/jmorecfg.h", - "core/src/fxcodec/libjpeg/jpegint.h", - "core/src/fxcodec/libjpeg/jpeglib.h", - "core/src/fxcodec/libjpeg/jversion.h", - "core/src/fxcodec/libjpeg/makefile", - "core/src/fxcodec/libjpeg/transupp.h", + "core/src/fxcodec/libjpeg/fx_libjpeg.h", ] configs -= [ "//build/config/compiler:chromium_code" ] diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index 5a6e1b547f..3115ca25e3 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -30,7 +30,7 @@ extern "C" { }; extern "C" { #undef FAR -#include "../../fx_jpeglib.h" +#include "../libjpeg/fx_libjpeg.h" } extern "C" { static void _src_do_nothing(struct jpeg_decompress_struct* cinfo) {} diff --git a/core/src/fx_jpeglib.h b/core/src/fxcodec/libjpeg/fx_libjpeg.h index 9b6a2d345c..7cab1a4deb 100644 --- a/core/src/fx_jpeglib.h +++ b/core/src/fxcodec/libjpeg/fx_libjpeg.h @@ -4,9 +4,9 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#ifndef CORE_SRC_FX_JPEGLIB_H_ -#define CORE_SRC_FX_JPEGLIB_H_ +#ifndef CORE_SRC_FXCODEC_LIBJPEG_FX_LIBJPEG_H_ +#define CORE_SRC_FXCODEC_LIBJPEG_FX_LIBJPEG_H_ -#include "fxcodec/libjpeg/jpeglib.h" +#include "../../../../third_party/libjpeg/jpeglib.h" -#endif // CORE_SRC_FX_JPEGLIB_H_ +#endif // CORE_SRC_FXCODEC_LIBJPEG_FX_LIBJPEG_H_ diff --git a/core/src/fxcodec/libjpeg/makefile b/core/src/fxcodec/libjpeg/makefile deleted file mode 100644 index 777d83b15a..0000000000 --- a/core/src/fxcodec/libjpeg/makefile +++ /dev/null @@ -1,8 +0,0 @@ -sources = fpdfapi_jcapimin.c fpdfapi_jcapistd.c fpdfapi_jccoefct.c fpdfapi_jccolor.c fpdfapi_jcdctmgr.c fpdfapi_jchuff.c fpdfapi_jcinit.c fpdfapi_jcmainct.c fpdfapi_jcmarker.c fpdfapi_jcmaster.c \ - fpdfapi_jcomapi.c fpdfapi_jcparam.c fpdfapi_jcphuff.c fpdfapi_jcprepct.c fpdfapi_jcsample.c fpdfapi_jctrans.c fpdfapi_jdapimin.c fpdfapi_jdapistd.c fpdfapi_jdcoefct.c \ - fpdfapi_jdcolor.c fpdfapi_jddctmgr.c fpdfapi_jdhuff.c fpdfapi_jdinput.c fpdfapi_jdmainct.c fpdfapi_jdmarker.c fpdfapi_jdmaster.c fpdfapi_jdmerge.c fpdfapi_jdphuff.c fpdfapi_jdpostct.c fpdfapi_jdsample.c \ - fpdfapi_jdtrans.c fpdfapi_jerror.c fpdfapi_jfdctfst.c fpdfapi_jfdctint.c fpdfapi_jcapimin.c fpdfapi_jidctfst.c fpdfapi_jidctint.c fpdfapi_jidctred.c fpdfapi_jmemmgr.c \ - fpdfapi_jmemnobs.c fpdfapi_jutils.c -armsources=$(sources) -armsourcesc=$(sources) -include ../../src/makefile diff --git a/pdfium.gyp b/pdfium.gyp index 8a4fb0bb41..c702de0567 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -330,6 +330,7 @@ 'type': 'static_library', 'dependencies': [ 'third_party/third_party.gyp:fx_lcms2', + 'third_party/third_party.gyp:fx_libjpeg', ], 'ldflags': [ '-L<(PRODUCT_DIR)',], 'sources': [ @@ -475,61 +476,7 @@ 'core/src/fxcodec/lcms2/fx_lcms2_plugin.h', 'core/src/fxcodec/lgif/fx_gif.cpp', 'core/src/fxcodec/lgif/fx_gif.h', - 'core/src/fxcodec/libjpeg/cderror.h', - 'core/src/fxcodec/libjpeg/cdjpeg.h', - 'core/src/fxcodec/libjpeg/fpdfapi_jcapimin.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcapistd.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jccoefct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jccolor.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcdctmgr.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jchuff.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcinit.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcmainct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcmarker.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcmaster.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcomapi.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcparam.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcphuff.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcprepct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jcsample.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jctrans.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdapimin.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdapistd.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdcoefct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdcolor.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jddctmgr.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdhuff.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdinput.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdmainct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdmarker.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdmaster.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdmerge.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdphuff.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdpostct.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdsample.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jdtrans.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jerror.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jfdctfst.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jfdctint.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jidctfst.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jidctint.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jidctred.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jmemmgr.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jmemnobs.c', - 'core/src/fxcodec/libjpeg/fpdfapi_jutils.c', - 'core/src/fxcodec/libjpeg/jchuff.h', - 'core/src/fxcodec/libjpeg/jconfig.h', - 'core/src/fxcodec/libjpeg/jdct.h', - 'core/src/fxcodec/libjpeg/jdhuff.h', - 'core/src/fxcodec/libjpeg/jerror.h', - 'core/src/fxcodec/libjpeg/jinclude.h', - 'core/src/fxcodec/libjpeg/jmemsys.h', - 'core/src/fxcodec/libjpeg/jmorecfg.h', - 'core/src/fxcodec/libjpeg/jpegint.h', - 'core/src/fxcodec/libjpeg/jpeglib.h', - 'core/src/fxcodec/libjpeg/jversion.h', - 'core/src/fxcodec/libjpeg/makefile', - 'core/src/fxcodec/libjpeg/transupp.h', + 'core/src/fxcodec/libjpeg/fx_libjpeg.h', ], 'msvs_settings': { 'VCCLCompilerTool': { diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index f5f0626ea7..c1c63db6b9 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -131,6 +131,71 @@ source_set("fx_lcms2") { ] } +source_set("fx_libjpeg") { + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ + "//build/config/compiler:no_chromium_code", + "//third_party/pdfium:pdfium_config", + ] + sources = [ + "libjpeg/cderror.h", + "libjpeg/cdjpeg.h", + "libjpeg/fpdfapi_jcapimin.c", + "libjpeg/fpdfapi_jcapistd.c", + "libjpeg/fpdfapi_jccoefct.c", + "libjpeg/fpdfapi_jccolor.c", + "libjpeg/fpdfapi_jcdctmgr.c", + "libjpeg/fpdfapi_jchuff.c", + "libjpeg/fpdfapi_jcinit.c", + "libjpeg/fpdfapi_jcmainct.c", + "libjpeg/fpdfapi_jcmarker.c", + "libjpeg/fpdfapi_jcmaster.c", + "libjpeg/fpdfapi_jcomapi.c", + "libjpeg/fpdfapi_jcparam.c", + "libjpeg/fpdfapi_jcphuff.c", + "libjpeg/fpdfapi_jcprepct.c", + "libjpeg/fpdfapi_jcsample.c", + "libjpeg/fpdfapi_jctrans.c", + "libjpeg/fpdfapi_jdapimin.c", + "libjpeg/fpdfapi_jdapistd.c", + "libjpeg/fpdfapi_jdcoefct.c", + "libjpeg/fpdfapi_jdcolor.c", + "libjpeg/fpdfapi_jddctmgr.c", + "libjpeg/fpdfapi_jdhuff.c", + "libjpeg/fpdfapi_jdinput.c", + "libjpeg/fpdfapi_jdmainct.c", + "libjpeg/fpdfapi_jdmarker.c", + "libjpeg/fpdfapi_jdmaster.c", + "libjpeg/fpdfapi_jdmerge.c", + "libjpeg/fpdfapi_jdphuff.c", + "libjpeg/fpdfapi_jdpostct.c", + "libjpeg/fpdfapi_jdsample.c", + "libjpeg/fpdfapi_jdtrans.c", + "libjpeg/fpdfapi_jerror.c", + "libjpeg/fpdfapi_jfdctfst.c", + "libjpeg/fpdfapi_jfdctint.c", + "libjpeg/fpdfapi_jidctfst.c", + "libjpeg/fpdfapi_jidctint.c", + "libjpeg/fpdfapi_jidctred.c", + "libjpeg/fpdfapi_jmemmgr.c", + "libjpeg/fpdfapi_jmemnobs.c", + "libjpeg/fpdfapi_jutils.c", + "libjpeg/jchuff.h", + "libjpeg/jconfig.h", + "libjpeg/jdct.h", + "libjpeg/jdhuff.h", + "libjpeg/jerror.h", + "libjpeg/jinclude.h", + "libjpeg/jmemsys.h", + "libjpeg/jmorecfg.h", + "libjpeg/jpegint.h", + "libjpeg/jpeglib.h", + "libjpeg/jversion.h", + "libjpeg/makefile", + "libjpeg/transupp.h", + ] +} + component("pdfium_base") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ diff --git a/core/src/fxcodec/libjpeg/cderror.h b/third_party/libjpeg/cderror.h index 70435e161c..70435e161c 100644 --- a/core/src/fxcodec/libjpeg/cderror.h +++ b/third_party/libjpeg/cderror.h diff --git a/core/src/fxcodec/libjpeg/cdjpeg.h b/third_party/libjpeg/cdjpeg.h index 3d728ee9c7..3d728ee9c7 100644 --- a/core/src/fxcodec/libjpeg/cdjpeg.h +++ b/third_party/libjpeg/cdjpeg.h diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcapimin.c b/third_party/libjpeg/fpdfapi_jcapimin.c index ec04fd2f15..ec04fd2f15 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcapimin.c +++ b/third_party/libjpeg/fpdfapi_jcapimin.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcapistd.c b/third_party/libjpeg/fpdfapi_jcapistd.c index 9d765e6f01..9d765e6f01 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcapistd.c +++ b/third_party/libjpeg/fpdfapi_jcapistd.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jccoefct.c b/third_party/libjpeg/fpdfapi_jccoefct.c index 08910ef6f3..08910ef6f3 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jccoefct.c +++ b/third_party/libjpeg/fpdfapi_jccoefct.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jccolor.c b/third_party/libjpeg/fpdfapi_jccolor.c index 809a05b5a1..809a05b5a1 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jccolor.c +++ b/third_party/libjpeg/fpdfapi_jccolor.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcdctmgr.c b/third_party/libjpeg/fpdfapi_jcdctmgr.c index cbd7d11207..cbd7d11207 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcdctmgr.c +++ b/third_party/libjpeg/fpdfapi_jcdctmgr.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jchuff.c b/third_party/libjpeg/fpdfapi_jchuff.c index 2a65aa253b..2a65aa253b 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jchuff.c +++ b/third_party/libjpeg/fpdfapi_jchuff.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcinit.c b/third_party/libjpeg/fpdfapi_jcinit.c index 58e5d18764..58e5d18764 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcinit.c +++ b/third_party/libjpeg/fpdfapi_jcinit.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcmainct.c b/third_party/libjpeg/fpdfapi_jcmainct.c index 4bf2c403ea..4bf2c403ea 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcmainct.c +++ b/third_party/libjpeg/fpdfapi_jcmainct.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcmarker.c b/third_party/libjpeg/fpdfapi_jcmarker.c index f1c89d92a9..f1c89d92a9 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcmarker.c +++ b/third_party/libjpeg/fpdfapi_jcmarker.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcmaster.c b/third_party/libjpeg/fpdfapi_jcmaster.c index 45322a53b3..45322a53b3 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcmaster.c +++ b/third_party/libjpeg/fpdfapi_jcmaster.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcomapi.c b/third_party/libjpeg/fpdfapi_jcomapi.c index aad37d8879..aad37d8879 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcomapi.c +++ b/third_party/libjpeg/fpdfapi_jcomapi.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcparam.c b/third_party/libjpeg/fpdfapi_jcparam.c index f3ea109878..f3ea109878 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcparam.c +++ b/third_party/libjpeg/fpdfapi_jcparam.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcphuff.c b/third_party/libjpeg/fpdfapi_jcphuff.c index 6d89b6b2c0..6d89b6b2c0 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcphuff.c +++ b/third_party/libjpeg/fpdfapi_jcphuff.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcprepct.c b/third_party/libjpeg/fpdfapi_jcprepct.c index 57f3fc1108..57f3fc1108 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcprepct.c +++ b/third_party/libjpeg/fpdfapi_jcprepct.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jcsample.c b/third_party/libjpeg/fpdfapi_jcsample.c index 5e1e828740..5e1e828740 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jcsample.c +++ b/third_party/libjpeg/fpdfapi_jcsample.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jctrans.c b/third_party/libjpeg/fpdfapi_jctrans.c index 40d166736b..40d166736b 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jctrans.c +++ b/third_party/libjpeg/fpdfapi_jctrans.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdapimin.c b/third_party/libjpeg/fpdfapi_jdapimin.c index 80c52cd29f..80c52cd29f 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdapimin.c +++ b/third_party/libjpeg/fpdfapi_jdapimin.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdapistd.c b/third_party/libjpeg/fpdfapi_jdapistd.c index 4c31f7640c..4c31f7640c 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdapistd.c +++ b/third_party/libjpeg/fpdfapi_jdapistd.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdcoefct.c b/third_party/libjpeg/fpdfapi_jdcoefct.c index 099833a8d6..099833a8d6 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdcoefct.c +++ b/third_party/libjpeg/fpdfapi_jdcoefct.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdcolor.c b/third_party/libjpeg/fpdfapi_jdcolor.c index c17329b86d..c17329b86d 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdcolor.c +++ b/third_party/libjpeg/fpdfapi_jdcolor.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jddctmgr.c b/third_party/libjpeg/fpdfapi_jddctmgr.c index 5226456414..5226456414 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jddctmgr.c +++ b/third_party/libjpeg/fpdfapi_jddctmgr.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdhuff.c b/third_party/libjpeg/fpdfapi_jdhuff.c index dc37db58a9..dc37db58a9 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdhuff.c +++ b/third_party/libjpeg/fpdfapi_jdhuff.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdinput.c b/third_party/libjpeg/fpdfapi_jdinput.c index 6e714e928e..6e714e928e 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdinput.c +++ b/third_party/libjpeg/fpdfapi_jdinput.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdmainct.c b/third_party/libjpeg/fpdfapi_jdmainct.c index 1483e6fff0..1483e6fff0 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdmainct.c +++ b/third_party/libjpeg/fpdfapi_jdmainct.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdmarker.c b/third_party/libjpeg/fpdfapi_jdmarker.c index bcd017f920..bcd017f920 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdmarker.c +++ b/third_party/libjpeg/fpdfapi_jdmarker.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdmaster.c b/third_party/libjpeg/fpdfapi_jdmaster.c index dae51e0fd2..dae51e0fd2 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdmaster.c +++ b/third_party/libjpeg/fpdfapi_jdmaster.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdmerge.c b/third_party/libjpeg/fpdfapi_jdmerge.c index c229f86aa5..c229f86aa5 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdmerge.c +++ b/third_party/libjpeg/fpdfapi_jdmerge.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdphuff.c b/third_party/libjpeg/fpdfapi_jdphuff.c index 128e412662..128e412662 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdphuff.c +++ b/third_party/libjpeg/fpdfapi_jdphuff.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdpostct.c b/third_party/libjpeg/fpdfapi_jdpostct.c index 13b1b1bb0c..13b1b1bb0c 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdpostct.c +++ b/third_party/libjpeg/fpdfapi_jdpostct.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdsample.c b/third_party/libjpeg/fpdfapi_jdsample.c index da9c38ce38..da9c38ce38 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdsample.c +++ b/third_party/libjpeg/fpdfapi_jdsample.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jdtrans.c b/third_party/libjpeg/fpdfapi_jdtrans.c index ae44f36043..ae44f36043 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jdtrans.c +++ b/third_party/libjpeg/fpdfapi_jdtrans.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jerror.c b/third_party/libjpeg/fpdfapi_jerror.c index 282f889ebd..282f889ebd 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jerror.c +++ b/third_party/libjpeg/fpdfapi_jerror.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jfdctfst.c b/third_party/libjpeg/fpdfapi_jfdctfst.c index b978b468d7..b978b468d7 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jfdctfst.c +++ b/third_party/libjpeg/fpdfapi_jfdctfst.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jfdctint.c b/third_party/libjpeg/fpdfapi_jfdctint.c index 488505b062..488505b062 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jfdctint.c +++ b/third_party/libjpeg/fpdfapi_jfdctint.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jidctfst.c b/third_party/libjpeg/fpdfapi_jidctfst.c index 26a8f68a27..26a8f68a27 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jidctfst.c +++ b/third_party/libjpeg/fpdfapi_jidctfst.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jidctint.c b/third_party/libjpeg/fpdfapi_jidctint.c index 78a8d66552..78a8d66552 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jidctint.c +++ b/third_party/libjpeg/fpdfapi_jidctint.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jidctred.c b/third_party/libjpeg/fpdfapi_jidctred.c index 8b4b807192..8b4b807192 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jidctred.c +++ b/third_party/libjpeg/fpdfapi_jidctred.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jmemmgr.c b/third_party/libjpeg/fpdfapi_jmemmgr.c index 630102fc2e..630102fc2e 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jmemmgr.c +++ b/third_party/libjpeg/fpdfapi_jmemmgr.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jmemnobs.c b/third_party/libjpeg/fpdfapi_jmemnobs.c index f1f789a1a6..f1f789a1a6 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jmemnobs.c +++ b/third_party/libjpeg/fpdfapi_jmemnobs.c diff --git a/core/src/fxcodec/libjpeg/fpdfapi_jutils.c b/third_party/libjpeg/fpdfapi_jutils.c index c6f7248af8..c6f7248af8 100644 --- a/core/src/fxcodec/libjpeg/fpdfapi_jutils.c +++ b/third_party/libjpeg/fpdfapi_jutils.c diff --git a/core/src/fxcodec/libjpeg/jchuff.h b/third_party/libjpeg/jchuff.h index a9599fc1e6..a9599fc1e6 100644 --- a/core/src/fxcodec/libjpeg/jchuff.h +++ b/third_party/libjpeg/jchuff.h diff --git a/core/src/fxcodec/libjpeg/jconfig.h b/third_party/libjpeg/jconfig.h index ea3c397799..ea3c397799 100644 --- a/core/src/fxcodec/libjpeg/jconfig.h +++ b/third_party/libjpeg/jconfig.h diff --git a/core/src/fxcodec/libjpeg/jdct.h b/third_party/libjpeg/jdct.h index 04192a266a..04192a266a 100644 --- a/core/src/fxcodec/libjpeg/jdct.h +++ b/third_party/libjpeg/jdct.h diff --git a/core/src/fxcodec/libjpeg/jdhuff.h b/third_party/libjpeg/jdhuff.h index ae19b6cafd..ae19b6cafd 100644 --- a/core/src/fxcodec/libjpeg/jdhuff.h +++ b/third_party/libjpeg/jdhuff.h diff --git a/core/src/fxcodec/libjpeg/jerror.h b/third_party/libjpeg/jerror.h index 06d344067a..06d344067a 100644 --- a/core/src/fxcodec/libjpeg/jerror.h +++ b/third_party/libjpeg/jerror.h diff --git a/core/src/fxcodec/libjpeg/jinclude.h b/third_party/libjpeg/jinclude.h index 5cfc6e1fc9..bae2b02a37 100644 --- a/core/src/fxcodec/libjpeg/jinclude.h +++ b/third_party/libjpeg/jinclude.h @@ -20,7 +20,7 @@ #include "jconfig.h" /* auto configuration options */ #define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */ -#include "../../../include/fxcrt/fx_system.h" +#include "../../core/include/fxcrt/fx_system.h" /* * We need the NULL macro and size_t typedef. * On an ANSI-conforming system it is sufficient to include <stddef.h>. diff --git a/core/src/fxcodec/libjpeg/jmemsys.h b/third_party/libjpeg/jmemsys.h index 896688181b..896688181b 100644 --- a/core/src/fxcodec/libjpeg/jmemsys.h +++ b/third_party/libjpeg/jmemsys.h diff --git a/core/src/fxcodec/libjpeg/jmorecfg.h b/third_party/libjpeg/jmorecfg.h index 88d210954c..88d210954c 100644 --- a/core/src/fxcodec/libjpeg/jmorecfg.h +++ b/third_party/libjpeg/jmorecfg.h diff --git a/core/src/fxcodec/libjpeg/jpegint.h b/third_party/libjpeg/jpegint.h index 95b00d405c..95b00d405c 100644 --- a/core/src/fxcodec/libjpeg/jpegint.h +++ b/third_party/libjpeg/jpegint.h diff --git a/core/src/fxcodec/libjpeg/jpeglib.h b/third_party/libjpeg/jpeglib.h index 7de5ab726e..7de5ab726e 100644 --- a/core/src/fxcodec/libjpeg/jpeglib.h +++ b/third_party/libjpeg/jpeglib.h diff --git a/core/src/fxcodec/libjpeg/jversion.h b/third_party/libjpeg/jversion.h index 6472c58d35..6472c58d35 100644 --- a/core/src/fxcodec/libjpeg/jversion.h +++ b/third_party/libjpeg/jversion.h diff --git a/core/src/fxcodec/libjpeg/transupp.h b/third_party/libjpeg/transupp.h index 5c2d32aff5..5c2d32aff5 100644 --- a/core/src/fxcodec/libjpeg/transupp.h +++ b/third_party/libjpeg/transupp.h diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index 524416289e..6dbff565a4 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -130,6 +130,76 @@ ], }, { + 'target_name': 'fx_libjpeg', + 'type': 'static_library', + 'sources': [ + 'libjpeg/cderror.h', + 'libjpeg/cdjpeg.h', + 'libjpeg/fpdfapi_jcapimin.c', + 'libjpeg/fpdfapi_jcapistd.c', + 'libjpeg/fpdfapi_jccoefct.c', + 'libjpeg/fpdfapi_jccolor.c', + 'libjpeg/fpdfapi_jcdctmgr.c', + 'libjpeg/fpdfapi_jchuff.c', + 'libjpeg/fpdfapi_jcinit.c', + 'libjpeg/fpdfapi_jcmainct.c', + 'libjpeg/fpdfapi_jcmarker.c', + 'libjpeg/fpdfapi_jcmaster.c', + 'libjpeg/fpdfapi_jcomapi.c', + 'libjpeg/fpdfapi_jcparam.c', + 'libjpeg/fpdfapi_jcphuff.c', + 'libjpeg/fpdfapi_jcprepct.c', + 'libjpeg/fpdfapi_jcsample.c', + 'libjpeg/fpdfapi_jctrans.c', + 'libjpeg/fpdfapi_jdapimin.c', + 'libjpeg/fpdfapi_jdapistd.c', + 'libjpeg/fpdfapi_jdcoefct.c', + 'libjpeg/fpdfapi_jdcolor.c', + 'libjpeg/fpdfapi_jddctmgr.c', + 'libjpeg/fpdfapi_jdhuff.c', + 'libjpeg/fpdfapi_jdinput.c', + 'libjpeg/fpdfapi_jdmainct.c', + 'libjpeg/fpdfapi_jdmarker.c', + 'libjpeg/fpdfapi_jdmaster.c', + 'libjpeg/fpdfapi_jdmerge.c', + 'libjpeg/fpdfapi_jdphuff.c', + 'libjpeg/fpdfapi_jdpostct.c', + 'libjpeg/fpdfapi_jdsample.c', + 'libjpeg/fpdfapi_jdtrans.c', + 'libjpeg/fpdfapi_jerror.c', + 'libjpeg/fpdfapi_jfdctfst.c', + 'libjpeg/fpdfapi_jfdctint.c', + 'libjpeg/fpdfapi_jidctfst.c', + 'libjpeg/fpdfapi_jidctint.c', + 'libjpeg/fpdfapi_jidctred.c', + 'libjpeg/fpdfapi_jmemmgr.c', + 'libjpeg/fpdfapi_jmemnobs.c', + 'libjpeg/fpdfapi_jutils.c', + 'libjpeg/jchuff.h', + 'libjpeg/jconfig.h', + 'libjpeg/jdct.h', + 'libjpeg/jdhuff.h', + 'libjpeg/jerror.h', + 'libjpeg/jinclude.h', + 'libjpeg/jmemsys.h', + 'libjpeg/jmorecfg.h', + 'libjpeg/jpegint.h', + 'libjpeg/jpeglib.h', + 'libjpeg/jversion.h', + 'libjpeg/makefile', + 'libjpeg/transupp.h', + ], + 'conditions': [ + ['os_posix==1', { + 'cflags': [ + '-Wno-main', + '-Wno-missing-braces', + '-Wno-unused', + ], + }], + ], + }, + { 'target_name': 'pdfium_base', 'type': 'none', 'sources': [ |