download.lst | 4 ++--
external/poppler/clang-std-ranges.patch.1 | 4 ++--
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 9 ++++++---
sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx | 17 ++++++++++++-----
4 files changed, 22 insertions(+), 12 deletions(-)
New commits:
commit 4f13305178c1bf88dffceb42ec15d0944b808a5c
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Apr 2 16:27:00 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Apr 2 21:14:34 2025 +0200
poppler: upgrade to 25.04.0
After 032d035220702523cf10d924fd436c9e6c83d24c
"Enforce error checking on stream::reset" the return from reset
has to be checked, otherwise it fails with
error: ignoring return value of ‘bool ImageStream::reset()’, declared with
attribute ‘nodiscard’ [-Werror=unused-result]
Downloaded from https://poppler.freedesktop.org/poppler-25.04.0.tar.xz
Change-Id: I5c6022b11c307f4293e4b2ea566e811053e3ab6f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183632
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 55970c17a789..e2e64dbc0439 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 :=
21234cb2a9647d73c752ce4031e65a79d11a511a835f2798284c2497b8701dee
-POPPLER_TARBALL := poppler-25.02.0.tar.xz
+POPPLER_SHA256SUM :=
b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d
+POPPLER_TARBALL := poppler-25.04.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/clang-std-ranges.patch.1
b/external/poppler/clang-std-ranges.patch.1
index 0ba895cf1024..c1484d9ab81b 100644
--- a/external/poppler/clang-std-ranges.patch.1
+++ b/external/poppler/clang-std-ranges.patch.1
@@ -311,8 +311,8 @@ In file included from
/opt/rh/gcc-toolset-12/root/usr/lib/gcc/x86_64-redhat-linu
}
lines.push_back(std::move(words));
-@@ -5456,7 +5460,11 @@
- for (word = rawWords; word; word = word->next) {
+@@ -5385,7 +5385,11 @@
+ for (TextWord *word = rawWords; word; word = word->next) {
s.clear();
uText.resize(word->len());
+#ifndef __clang__
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index e2c241d9c3ff..dcc1932f7ad7 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -231,7 +231,8 @@ static void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream*
str )
#else
str = ((DCTStream *)str)->getRawStream();
#endif
- str->reset();
+ if (!str->reset())
+ return;
o_rOutputBuf.clear();
ExtractJpegData(str, o_rOutputBuf);
@@ -267,7 +268,8 @@ static void writePbm_(OutputBuffer& o_rOutputBuf, Stream*
str, int width, int he
o_rOutputBuf.resize(header_size);
// initialize stream
- str->reset();
+ if (!str->reset())
+ return;
// copy the raw stream
if( bInvert )
@@ -324,7 +326,8 @@ static void writePpm_( OutputBuffer& o_rOutputBuf,
width,
colorMap->getNumPixelComps(),
colorMap->getBits()));
- imgStr->reset();
+ if (!imgStr->reset())
+ return;
for( int y=0; y<height; ++y)
{
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
index 798555fe2f54..c0547e761e59 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
@@ -214,7 +214,8 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
int nLineSize = (width + 7)/8;
aScanlines.reserve( nLineSize * height + height );
- str->reset();
+ if (!str->reset())
+ return;
for( int y = 0; y < height; y++ )
{
// determine filter type (none) for this scanline
@@ -252,7 +253,8 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
width,
colorMap->getNumPixelComps(),
colorMap->getBits()));
- imgStr->reset();
+ if (!imgStr->reset())
+ return;
// create scan line data buffer
OutputBuffer aScanlines;
@@ -289,7 +291,9 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
maskColorMap->getNumPixelComps(),
maskColorMap->getBits()));
- imgStrMask->reset();
+ if (!imgStrMask->reset())
+ return;
+
for( int y = 0; y < maskHeight; ++y )
{
pm = imgStrMask->getLine();
@@ -337,7 +341,8 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
width,
colorMap->getNumPixelComps(),
colorMap->getBits()));
- imgStr->reset();
+ if (!imgStr->reset())
+ return;
// create scan line data buffer
OutputBuffer aScanlines;
@@ -371,7 +376,9 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
std::unique_ptr<ImageStream> imgStrMask(
new ImageStream(maskStr, maskWidth, 1, 1));
- imgStrMask->reset();
+ if (!imgStrMask->reset())
+ return;
+
for( int y = 0; y < maskHeight; ++y )
{
for( int x = 0; x < maskWidth; ++x )
