description: build using system openjpeg author: Michael Gilbert --- a/third_party/pdfium/third_party/BUILD.gn +++ b/third_party/pdfium/third_party/BUILD.gn @@ -367,39 +367,11 @@ config("fx_libopenjpeg_warnings") { } } -source_set("fx_libopenjpeg") { - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ - "//build/config/compiler:no_chromium_code", - "//build/config/sanitizers:cfi_icall_generalize_pointers", - ":pdfium_third_party_config", - - # Must be after no_chromium_code for warning flags to be ordered correctly. - ":fx_libopenjpeg_warnings", - ] - sources = [ - "libopenjpeg20/bio.c", - "libopenjpeg20/cio.c", - "libopenjpeg20/dwt.c", - "libopenjpeg20/event.c", - "libopenjpeg20/function_list.c", - "libopenjpeg20/image.c", - "libopenjpeg20/invert.c", - "libopenjpeg20/j2k.c", - "libopenjpeg20/jp2.c", - "libopenjpeg20/mct.c", - "libopenjpeg20/mqc.c", - "libopenjpeg20/openjpeg.c", - "libopenjpeg20/opj_clock.c", - "libopenjpeg20/pi.c", - "libopenjpeg20/sparse_array.c", - "libopenjpeg20/sparse_array.h", - "libopenjpeg20/t1.c", - "libopenjpeg20/t2.c", - "libopenjpeg20/tcd.c", - "libopenjpeg20/tgt.c", - "libopenjpeg20/thread.c", - ] +pkg_config("libopenjpeg_from_pkgconfig") { + packages = [ "libopenjp2" ] +} +group("fx_libopenjpeg") { + public_configs = [ ":libopenjpeg_from_pkgconfig" ] } config("system_libpng_config") { --- a/third_party/pdfium/core/fxcodec/codec/codec_int.h +++ b/third_party/pdfium/core/fxcodec/codec/codec_int.h @@ -10,7 +10,7 @@ #include #include "core/fxcodec/jbig2/JBig2_Context.h" -#include "third_party/libopenjpeg20/openjpeg.h" +#include class CPDF_ColorSpace; --- a/third_party/pdfium/core/fxcodec/codec/ccodec_jpxmodule.cpp +++ b/third_party/pdfium/core/fxcodec/codec/ccodec_jpxmodule.cpp @@ -17,8 +17,6 @@ #include "core/fxcrt/fx_memory.h" #include "core/fxcrt/fx_safe_types.h" #include "third_party/base/ptr_util.h" -#include "third_party/libopenjpeg20/openjpeg.h" -#include "third_party/libopenjpeg20/opj_malloc.h" namespace { @@ -515,7 +513,6 @@ bool CJPX_Decoder::Init(pdfium::spanpdfium_use_colorspace = !!m_ColorSpace; if (!m_Parameters.nb_tile_to_decode) { if (!opj_set_decode_area(m_Codec.Get(), m_Image.Get(), m_Parameters.DA_x0, @@ -549,7 +546,7 @@ bool CJPX_Decoder::Init(pdfium::spanicc_profile_buf); + free(m_Image->icc_profile_buf); m_Image->icc_profile_buf = nullptr; m_Image->icc_profile_len = 0; } --- a/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h +++ b/third_party/pdfium/core/fxcodec/codec/cjpx_decoder.h @@ -13,7 +13,7 @@ #include "core/fxcodec/codec/codec_int.h" #include "core/fxcrt/unowned_ptr.h" #include "third_party/base/span.h" -#include "third_party/libopenjpeg20/openjpeg.h" +#include class CPDF_ColorSpace; --- a/third_party/pdfium/BUILD.gn +++ b/third_party/pdfium/BUILD.gn @@ -21,7 +21,6 @@ config("pdfium_common_config") { ldflags = [] include_dirs = [ "." ] defines = [ - "OPJ_STATIC", "PNG_PREFIX", "PNG_USE_READ_MACROS", ] @@ -78,7 +77,6 @@ config("pdfium_core_config") { if (is_linux) { if (current_cpu == "x64") { defines += [ "_FX_CPU_=_FX_X64_" ] - cflags += [ "-fPIC" ] } else if (current_cpu == "x86") { defines += [ "_FX_CPU_=_FX_X86_" ] }