From 021187273ac8b0e7965b814da19cdbb487b44268 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 18 Sep 2018 21:07:10 +0200 Subject: pdfium: update to 3550 Allows dropping all the backports, so only one custom API patch remains. Reviewed-on: https://gerrit.libreoffice.org/60697 Tested-by: Jenkins Reviewed-by: Miklos Vajna (cherry picked from commit 56ac8214ab35387f8861044b62c79fae6d7ccac5) Change-Id: I13dc4f62be86d0859862cbd95bb14e07bbcf53d6 --- external/pdfium/Library_pdfium.mk | 37 +++++++++++++++++++------------ external/pdfium/UnpackedTarball_pdfium.mk | 3 ++- external/pdfium/build.patch.1 | 6 ++--- 3 files changed, 28 insertions(+), 18 deletions(-) (limited to 'external') diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index 8c2c15293e65..8283f6dd0aa1 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -67,7 +67,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_fieldaction \ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_filewriteadapter \ UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_helpers \ - UnpackedTarball/pdfium/fpdfsdk/cpdfsdk_memoryaccess \ UnpackedTarball/pdfium/fpdfsdk/fpdf_annot \ UnpackedTarball/pdfium/fpdfsdk/fpdf_attachment \ UnpackedTarball/pdfium/fpdfsdk/fpdf_catalog \ @@ -240,7 +239,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_read_validator \ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_charposlist \ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_devicebuffer \ - UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_dibsource \ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_dibtransferfunc \ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_docrenderdata \ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_imagecacheentry \ @@ -281,6 +279,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_cross_ref_avail \ UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_pagecontentmanager \ UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_transparency \ + UnpackedTarball/pdfium/core/fpdfapi/render/cpdf_dibbase \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_object_stream \ + UnpackedTarball/pdfium/core/fpdfapi/parser/cpdf_cross_ref_table \ + UnpackedTarball/pdfium/core/fpdfapi/edit/cpdf_stringarchivestream \ )) # fpdfdoc @@ -331,12 +333,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ # fxcodec $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec \ - UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_fax \ - UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_flate \ - UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_icc \ - UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jbig \ - UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpeg \ - UnpackedTarball/pdfium/core/fxcodec/codec/fx_codec_jpx_opj \ UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_ArithDecoder \ UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_ArithIntDecoder \ UnpackedTarball/pdfium/core/fxcodec/jbig2/JBig2_BitStream \ @@ -358,6 +354,13 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gif \ UnpackedTarball/pdfium/core/fxcodec/gif/cfx_gifcontext \ UnpackedTarball/pdfium/core/fxcodec/gif/cfx_lzwdecompressor \ + UnpackedTarball/pdfium/core/fxcodec/codec/cfx_codec_memory \ + UnpackedTarball/pdfium/core/fxcodec/codec/ccodec_faxmodule \ + UnpackedTarball/pdfium/core/fxcodec/codec/ccodec_iccmodule \ + UnpackedTarball/pdfium/core/fxcodec/codec/ccodec_jbig2module \ + UnpackedTarball/pdfium/core/fxcodec/codec/ccodec_jpxmodule \ + UnpackedTarball/pdfium/core/fxcodec/codec/ccodec_jpegmodule \ + UnpackedTarball/pdfium/core/fxcodec/codec/ccodec_flatemodule \ )) # fxcrt @@ -402,8 +405,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcrt/bytestring \ UnpackedTarball/pdfium/core/fxcrt/cfx_binarybuf \ UnpackedTarball/pdfium/core/fxcrt/cfx_bitstream \ - UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_posix \ - UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_windows \ UnpackedTarball/pdfium/core/fxcrt/cfx_utf8decoder \ UnpackedTarball/pdfium/core/fxcrt/cfx_widetextbuf \ UnpackedTarball/pdfium/core/fxcrt/fx_random \ @@ -412,6 +413,8 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcrt/cfx_seekablemultistream \ UnpackedTarball/pdfium/core/fxcrt/css/cfx_cssdata \ UnpackedTarball/pdfium/core/fxcrt/fx_codepage \ + UnpackedTarball/pdfium/core/fxcrt/cfx_utf8encoder \ + UnpackedTarball/pdfium/core/fxcrt/cfx_readonlymemorystream \ )) # fxge @@ -420,7 +423,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxge/dib/cfx_bitmapstorer \ UnpackedTarball/pdfium/core/fxge/dib/cfx_dibextractor \ UnpackedTarball/pdfium/core/fxge/dib/cfx_dibitmap \ - UnpackedTarball/pdfium/core/fxge/dib/cfx_dibsource \ UnpackedTarball/pdfium/core/fxge/dib/cfx_filtereddib \ UnpackedTarball/pdfium/core/fxge/dib/cfx_imagerenderer \ UnpackedTarball/pdfium/core/fxge/dib/cfx_imagestretcher \ @@ -466,6 +468,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxge/fx_ge_fontmap \ UnpackedTarball/pdfium/core/fxge/fx_ge_linux \ UnpackedTarball/pdfium/core/fxge/fx_ge_text \ + UnpackedTarball/pdfium/core/fxge/dib/cfx_dibbase \ )) # javascript, build with pdf_enable_v8 disabled. @@ -542,6 +545,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/page_allocator \ UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/spin_lock \ UnpackedTarball/pdfium/third_party/base/allocator/partition_allocator/partition_alloc \ + UnpackedTarball/pdfium/third_party/base/debug/alias \ )) # skia_shared @@ -599,6 +603,13 @@ $(eval $(call gb_Library_add_generated_cobjects,pdfium,\ UnpackedTarball/pdfium/third_party/freetype/src/src/smooth/smooth \ UnpackedTarball/pdfium/third_party/freetype/src/src/truetype/truetype \ UnpackedTarball/pdfium/third_party/freetype/src/src/type1/type1 \ + UnpackedTarball/pdfium/third_party/freetype/src/src/base/ftdebug \ +)) +endif + +ifneq ($(OS),WNT) +$(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ + UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_posix \ )) endif @@ -611,6 +622,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxge/win32/fx_win32_dib \ UnpackedTarball/pdfium/core/fxge/win32/fx_win32_gdipext \ UnpackedTarball/pdfium/core/fxge/win32/fx_win32_print \ + UnpackedTarball/pdfium/core/fxcrt/cfx_fileaccess_windows \ )) $(eval $(call gb_Library_use_system_win32_libs,pdfium,\ @@ -640,9 +652,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxge/android/cfpf_skiafontmgr \ UnpackedTarball/pdfium/core/fxge/android/cfx_androidfontinfo \ UnpackedTarball/pdfium/core/fxge/android/fx_android_imp \ - UnpackedTarball/pdfium/core/fxge/android/cfpf_skiabufferfont \ - UnpackedTarball/pdfium/core/fxge/android/cfpf_skiafilefont \ - UnpackedTarball/pdfium/core/fxge/android/cfpf_skiafontdescriptor \ UnpackedTarball/pdfium/core/fxge/android/cfpf_skiapathfont \ )) endif diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk index 0dcfe354c741..aaaab0c25ac1 100644 --- a/external/pdfium/UnpackedTarball_pdfium.mk +++ b/external/pdfium/UnpackedTarball_pdfium.mk @@ -35,7 +35,8 @@ $(eval $(call gb_UnpackedTarball_set_post_action,pdfium,\ mv third_party/base/allocator/partition_allocator/address_space_randomization.cc third_party/base/allocator/partition_allocator/address_space_randomization.cpp && \ mv third_party/base/allocator/partition_allocator/page_allocator.cc third_party/base/allocator/partition_allocator/page_allocator.cpp && \ mv third_party/base/allocator/partition_allocator/partition_alloc.cc third_party/base/allocator/partition_allocator/partition_alloc.cpp && \ - mv third_party/base/allocator/partition_allocator/spin_lock.cc third_party/base/allocator/partition_allocator/spin_lock.cpp \ + mv third_party/base/allocator/partition_allocator/spin_lock.cc third_party/base/allocator/partition_allocator/spin_lock.cpp && \ + mv third_party/base/debug/alias.cc third_party/base/debug/alias.cpp \ )) # vim: set noet sw=4 ts=4: diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1 index 901edbbf4e56..721c1784719d 100644 --- a/external/pdfium/build.patch.1 +++ b/external/pdfium/build.patch.1 @@ -125,12 +125,12 @@ diff --git a/core/fpdfdoc/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h index 7f4eb86c0..5e227f86e 100644 --- a/core/fpdfdoc/cpdf_dest.h +++ b/core/fpdfdoc/cpdf_dest.h -@@ -46,7 +46,7 @@ class CPDF_Dest { +@@ -41,7 +41,7 @@ float* pZoom) const; private: -- UnownedPtr const m_pObj; -+ UnownedPtr m_pObj; +- UnownedPtr const m_pArray; ++ UnownedPtr m_pArray; }; #endif // CORE_FPDFDOC_CPDF_DEST_H_ -- cgit v1.2.1