download.lst | 4 - external/pdfium/Library_pdfium.mk | 1 external/pdfium/build.patch.1 | 52 ++++++++++++++++++------- external/pdfium/inc/pch/precompiled_pdfium.hxx | 3 + external/pdfium/system-abseil.diff | 4 - 5 files changed, 47 insertions(+), 17 deletions(-)
New commits: commit 99500569187101cd47b2a491ca8d8878eb034b2e Author: Miklos Vajna <[email protected]> AuthorDate: Fri Jun 14 08:23:58 2024 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Fri Jun 14 13:58:40 2024 +0200 Update pdfium to 6536 Drop part of build.patch.1, which is no longer needed. Change-Id: Ie68364d473d344904fd55ced2cd0915534fa816c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168838 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/download.lst b/download.lst index 9630b35bced9..130cc04e4033 100644 --- a/download.lst +++ b/download.lst @@ -523,8 +523,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -PDFIUM_SHA256SUM := fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c -PDFIUM_TARBALL := pdfium-6425.tar.bz2 +PDFIUM_SHA256SUM := 9c2db89e9ea96f632108170bce7d901dbfc773bb09d03b7cd0ac68ebe26b9092 +PDFIUM_TARBALL := pdfium-6536.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index 648b4d22ca96..589a610e3195 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -377,6 +377,7 @@ $(eval $(call gb_Library_add_generated_exception_objects,pdfium,\ UnpackedTarball/pdfium/core/fxcodec/icc/icc_transform \ UnpackedTarball/pdfium/core/fxcodec/jbig2/jbig2_decoder \ UnpackedTarball/pdfium/core/fxcodec/jpeg/jpeg_common \ + UnpackedTarball/pdfium/core/fxcodec/data_and_bytes_consumed \ )) # fxcrt diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1 index 1a5a35f1cdc7..8a70c96f67ee 100644 --- a/external/pdfium/build.patch.1 +++ b/external/pdfium/build.patch.1 @@ -12,19 +12,6 @@ index 31564f45f..5858549ef 100644 std::vector<UnsupportedFeature> unsupported; CheckForSharedFormInternal(/*depth=*/0, doc->GetRoot(), &unsupported); -diff --git a/third_party/libopenjpeg/openjpeg.c b/third_party/libopenjpeg/openjpeg.c -index 9dd4256d7..949d65830 100644 ---- a/third_party/libopenjpeg/openjpeg.c -+++ b/third_party/libopenjpeg/openjpeg.c -@@ -358,7 +358,7 @@ OPJ_BOOL OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, - return OPJ_FALSE; - } - --OPJ_API OPJ_BOOL OPJ_CALLCONV opj_decoder_set_strict_mode(opj_codec_t *p_codec, -+OPJ_BOOL OPJ_CALLCONV opj_decoder_set_strict_mode(opj_codec_t *p_codec, - OPJ_BOOL strict) - { - if (p_codec) { diff --git a/core/fxge/cfx_face.cpp b/core/fxge/cfx_face.cpp index 7d9cd0f44..0d0a311aa 100644 --- a/core/fxge/cfx_face.cpp @@ -38,3 +25,42 @@ index 7d9cd0f44..0d0a311aa 100644 } FX_RECT CFX_Face::GetCharBBox(uint32_t code, int glyph_index) { +diff --git a/core/fpdfdoc/cpdf_action.cpp b/core/fpdfdoc/cpdf_action.cpp +index a5b687d76..076a260d5 100644 +--- a/core/fpdfdoc/cpdf_action.cpp ++++ b/core/fpdfdoc/cpdf_action.cpp +@@ -21,7 +21,7 @@ + + namespace { + +-constexpr auto kActionTypeStrings = fxcrt::ToArray<const char*>({ ++std::array<const char*, 18> kActionTypeStrings = { + "GoTo", + "GoToR", + "GoToE", +@@ -40,7 +40,7 @@ constexpr auto kActionTypeStrings = fxcrt::ToArray<const char*>({ + "Rendition", + "Trans", + "GoTo3DView", +-}); ++}; + + } // namespace + +diff --git a/core/fpdfdoc/cpdf_dest.cpp b/core/fpdfdoc/cpdf_dest.cpp +index 8026a75d5..34c20d62f 100644 +--- a/core/fpdfdoc/cpdf_dest.cpp ++++ b/core/fpdfdoc/cpdf_dest.cpp +@@ -21,9 +21,9 @@ namespace { + + // These arrays are indexed by the PDFDEST_VIEW_* constants. + +-constexpr auto kZoomModes = +- fxcrt::ToArray<const char*>({"Unknown", "XYZ", "Fit", "FitH", "FitV", +- "FitR", "FitB", "FitBH", "FitBV"}); ++std::array<const char*, 9> kZoomModes = { ++ "Unknown", "XYZ", "Fit", "FitH", "FitV", ++ "FitR", "FitB", "FitBH", "FitBV"}; + + constexpr auto kZoomModeMaxParamCount = + fxcrt::ToArray<const uint8_t>({0, 3, 0, 1, 1, 4, 0, 1, 1}); diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx b/external/pdfium/inc/pch/precompiled_pdfium.hxx index f3e3330c65f4..5b94cea8372d 100644 --- a/external/pdfium/inc/pch/precompiled_pdfium.hxx +++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx @@ -82,6 +82,8 @@ #include <constants/stream_dict_common.h> #include <constants/transparency.h> #include <core/fdrm/fx_crypt.h> +#include <core/fdrm/fx_crypt_aes.h> +#include <core/fdrm/fx_crypt_sha.h> #include <core/fpdfapi/cmaps/CNS1/cmaps_cns1.h> #include <core/fpdfapi/cmaps/GB1/cmaps_gb1.h> #include <core/fpdfapi/cmaps/Japan1/cmaps_japan1.h> @@ -244,6 +246,7 @@ #include <core/fpdftext/unicodenormalizationdata.h> #include <core/fxcodec/basic/basicmodule.h> #include <core/fxcodec/cfx_codec_memory.h> +#include <core/fxcodec/data_and_bytes_consumed.h> #include <core/fxcodec/fax/faxmodule.h> #include <core/fxcodec/flate/flatemodule.h> #include <core/fxcodec/fx_codec.h> diff --git a/external/pdfium/system-abseil.diff b/external/pdfium/system-abseil.diff index 841bc8ce9468..e8dba67b112b 100644 --- a/external/pdfium/system-abseil.diff +++ b/external/pdfium/system-abseil.diff @@ -1,7 +1,7 @@ --- core/fpdfapi/page/cpdf_sampledfunc.cpp 2023-12-15 23:27:10.955659091 +0100 +++ core/fpdfapi/page/cpdf_sampledfunc.cpp 2023-12-15 23:27:43.420136476 +0100 -@@ -16,8 +16,11 @@ - #include "core/fxcrt/cfx_bitstream.h" +@@ -17,8 +17,11 @@ + #include "core/fxcrt/compiler_specific.h" #include "core/fxcrt/fx_memory_wrappers.h" #include "core/fxcrt/fx_safe_types.h" +#ifdef USE_SYSTEM_ABSEIL
