download.lst | 4 +- external/pdfium/build.patch.1 | 35 +++++++++++++++---------- external/pdfium/inc/pch/precompiled_pdfium.hxx | 3 -- 3 files changed, 25 insertions(+), 17 deletions(-)
New commits: commit 44e1e93f5262af345a9616916e43dcfb4682b173 Author: Miklos Vajna <[email protected]> AuthorDate: Tue Dec 16 11:57:38 2025 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Dec 16 14:16:32 2025 +0100 Update pdfium to 7578 Patch out the single unconditional usage of `raw_ptr`, which belongs to the partition allocator, that we disable using `-DMEMORY_TOOL_REPLACES_ALLOCATOR`. Change-Id: Iac9239c741af2de59b2f88d7748e41e540019254 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195700 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/download.lst b/download.lst index 3ebe95db7119..29d209918ab8 100644 --- a/download.lst +++ b/download.lst @@ -569,8 +569,8 @@ PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts -PDFIUM_SHA256SUM := 7144b0fa78fd408997e7b84ffd3c257db602e392a1bb1584828d80e60b6b27c5 -PDFIUM_TARBALL := pdfium-7471.tar.bz2 +PDFIUM_SHA256SUM := 2d7124bf2481abfd24f9ff0c3544beeea4d46716b6de5aeb9191487785058d59 +PDFIUM_TARBALL := pdfium-7578.tar.bz2 # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/pdfium/build.patch.1 b/external/pdfium/build.patch.1 index 32c7b9c84203..49d00a99525d 100644 --- a/external/pdfium/build.patch.1 +++ b/external/pdfium/build.patch.1 @@ -1,17 +1,4 @@ -*- Mode: diff -*- -diff --git a/core/fxge/cfx_face.cpp b/core/fxge/cfx_face.cpp -index 7d9cd0f44..0d0a311aa 100644 ---- a/core/fxge/cfx_face.cpp -+++ b/core/fxge/cfx_face.cpp -@@ -654,7 +654,7 @@ int CFX_Face::GetCharIndex(uint32_t code) { - } - - int CFX_Face::GetNameIndex(const char* name) { -- return FT_Get_Name_Index(GetRec(), name); -+ return FT_Get_Name_Index(GetRec(), const_cast<char*>(name)); - } - - FX_RECT CFX_Face::GetCharBBox(uint32_t code, int glyph_index) { --- a/core/fxcrt/fx_memory_wrappers.h 2025-02-13 13:38:35.761778900 +0100 +++ b/core/fxcrt/fx_memory_wrappers.h 2025-02-13 13:38:48.136654800 +0100 @@ -33,9 +33,6 @@ @@ -168,3 +155,25 @@ index bad07b723..b960f90b4 100644 friend constexpr auto operator<=>( span lhs, span<OtherElementType, OtherExtent, OtherInternalPtrType> rhs) { +diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp +index 76e3e2626..15287a263 100644 +--- a/fpdfsdk/fpdf_editpage.cpp ++++ b/fpdfsdk/fpdf_editpage.cpp +@@ -168,7 +168,7 @@ RetainPtr<const CPDF_Object> GetParamObject(void* out_value, + + struct ParamsAndObject { + RetainPtr<CPDF_Dictionary> params; +- raw_ptr<CPDF_PageObject> page_obj; ++ UnownedPtr<CPDF_PageObject> page_obj; + }; + + ParamsAndObject SetParamValueHelper(FPDF_DOCUMENT document, +@@ -179,7 +179,7 @@ ParamsAndObject SetParamValueHelper(FPDF_DOCUMENT document, + return {nullptr, nullptr}; + } + RetainPtr<CPDF_Dictionary> params = GetOrCreateMarkParamsDict(document, mark); +- return {params, page_obj}; ++ return {params, UnownedPtr<CPDF_PageObject>(page_obj)}; + } + + } // namespace diff --git a/external/pdfium/inc/pch/precompiled_pdfium.hxx b/external/pdfium/inc/pch/precompiled_pdfium.hxx index 712315385039..454de05d7f04 100644 --- a/external/pdfium/inc/pch/precompiled_pdfium.hxx +++ b/external/pdfium/inc/pch/precompiled_pdfium.hxx @@ -162,6 +162,7 @@ #include <core/fpdfapi/page/cpdf_transferfunc.h> #include <core/fpdfapi/page/cpdf_transferfuncdib.h> #include <core/fpdfapi/page/cpdf_transparency.h> +#include <core/fpdfapi/page/jpx_decode_conversion.h> #include <core/fpdfapi/parser/cfdf_document.h> #include <core/fpdfapi/parser/cpdf_array.h> #include <core/fpdfapi/parser/cpdf_boolean.h> @@ -481,7 +482,6 @@ #include <public/fpdf_text.h> #include <public/fpdf_transformpage.h> #include <public/fpdfview.h> -#include <third_party/abseil-cpp/absl/container/flat_hash_set.h> #include <third_party/agg23/agg_clip_liang_barsky.h> #include <third_party/agg23/agg_conv_dash.h> #include <third_party/agg23/agg_conv_stroke.h> @@ -491,7 +491,6 @@ #include <third_party/agg23/agg_rasterizer_scanline_aa.h> #include <third_party/agg23/agg_renderer_scanline.h> #include <third_party/agg23/agg_scanline_u.h> -#include <third_party/fast_float/src/include/fast_float/fast_float.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #endif // PCH_LEVEL >= 4
