download.lst | 4 ++--
external/poppler/poppler-config.patch.1 | 14 +++++++-------
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 8 ++++++++
3 files changed, 17 insertions(+), 9 deletions(-)
New commits:
commit 0ee2636304ac049f21415c67e92040f7d6c14d35
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Mon May 5 10:03:10 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon May 5 11:12:22 2025 +0200
poppler: uggrade to 25.05
Downloaded from https://poppler.freedesktop.org/poppler-25.05.0.tar.xz
Change-Id: Icd2b318cc01bedc5baeb4445a463a136ed6d7c48
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184953
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 33c53c0ba422..05de89904e7b 100644
--- a/download.lst
+++ b/download.lst
@@ -578,8 +578,8 @@ LIBTIFF_TARBALL := tiff-4.7.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-POPPLER_SHA256SUM :=
b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d
-POPPLER_TARBALL := poppler-25.04.0.tar.xz
+POPPLER_SHA256SUM :=
9b1627c5b76816ac5e4052a03f5b605ba40b45cf06b02cadd0479620b499ab38
+POPPLER_TARBALL := poppler-25.05.0.tar.xz
POPPLER_DATA_SHA256SUM :=
c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74
POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
# three static lines
diff --git a/external/poppler/poppler-config.patch.1
b/external/poppler/poppler-config.patch.1
index ff1af699add4..573c23ab284f 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -164,7 +164,7 @@ index 0fbd336a..451213f8 100644
+/* #undef WORDS_BIGENDIAN */
+
+/* Define as const if the declaration of iconv() needs const. */
-+#define ICONV_CONST
++#define ICONV_CONST
+
+/* Generate OPI comments in PS output. */
+#define OPI_SUPPORT 1
@@ -179,7 +179,7 @@ index 0fbd336a..451213f8 100644
+#define PACKAGE_NAME "poppler"
+
+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING "poppler 25.01.0"
++#define PACKAGE_STRING "poppler 25.05.0"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "poppler"
@@ -188,7 +188,7 @@ index 0fbd336a..451213f8 100644
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
-+#define PACKAGE_VERSION "25.01.0"
++#define PACKAGE_VERSION "25.05.0"
+
+/* Poppler data dir */
+#define POPPLER_DATADIR "/usr/local/share/poppler"
@@ -206,7 +206,7 @@ index 0fbd336a..451213f8 100644
+/* #undef USE_FLOAT */
+
+/* Version number of package */
-+#define VERSION "25.01.0"
++#define VERSION "25.05.0"
+
+#if defined(__APPLE__)
+#elif defined (_WIN32)
@@ -290,7 +290,7 @@ index 0fbd336a..451213f8 100644
+
+/* Defines the poppler version. */
+#ifndef POPPLER_VERSION
-+#define POPPLER_VERSION "25.01.0"
++#define POPPLER_VERSION "25.05.0"
+#endif
+
+/* Use single precision arithmetic in the Splash backend */
@@ -437,9 +437,9 @@ index 0fbd336a..451213f8 100644
+
+#include "poppler-global.h"
+
-+#define POPPLER_VERSION "25.01.0"
++#define POPPLER_VERSION "25.05.0"
+#define POPPLER_VERSION_MAJOR 25
-+#define POPPLER_VERSION_MINOR 1
++#define POPPLER_VERSION_MINOR 5
+#define POPPLER_VERSION_MICRO 0
+
+namespace poppler
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index dcc1932f7ad7..604ba3b7db2c 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -1320,11 +1320,19 @@ poppler_bool PDFOutDev::tilingPatternFill(GfxState
*state, Gfx *, Catalog *,
}
}
+#if POPPLER_CHECK_VERSION(25, 5, 0)
+ std::unique_ptr<MemStream> pRgbStr(new MemStream(pBitmapData, 0,
+ nBitmapWidth * nBitmapHeight * 3, Object::null()));
+ std::unique_ptr<MemStream> pAlphaStr(new MemStream(reinterpret_cast<char
*>(pSplashBitmap->getAlphaPtr()),
+ 0, nBitmapWidth * nBitmapHeight, Object::null()));
+ auto aDecode = Object::null();
+#else
std::unique_ptr<MemStream> pRgbStr(new MemStream(pBitmapData, 0,
nBitmapWidth * nBitmapHeight * 3, Object(objNull)));
std::unique_ptr<MemStream> pAlphaStr(new MemStream(reinterpret_cast<char
*>(pSplashBitmap->getAlphaPtr()),
0, nBitmapWidth * nBitmapHeight, Object(objNull)));
auto aDecode = Object(objNull);
+#endif
#if POPPLER_CHECK_VERSION(24, 10, 0)
std::unique_ptr<GfxImageColorMap> pRgbIdentityColorMap(new
GfxImageColorMap(8, &aDecode,
std::make_unique<GfxDeviceRGBColorSpace>()));
