Martin Schreiner
2b4851e1ae
* Add fix_poppler_26.01.0.patch * Add fix_poppler_26.02.0.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=1254
128 lines
4.4 KiB
Diff
128 lines
4.4 KiB
Diff
From b307d254a88a87fe59f9c041346657790c75ac16 Mon Sep 17 00:00:00 2001
|
|
From: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
Date: Wed, 7 Jan 2026 14:06:55 +0100
|
|
Subject: [PATCH] poppler: upgrade to 26.01.0
|
|
|
|
Adapt external/poppler/poppler-config.patch.1 after
|
|
commit 808094b11c07b1895bc9a1d03e338584045e6087
|
|
Author: Albert Astals Cid <aacid@kde.org>
|
|
Date: Fri Dec 5 01:59:41 2025 +0100
|
|
|
|
cmakedefine -> cmakedefine01
|
|
|
|
Downloaded from https://poppler.freedesktop.org/poppler-26.01.0.tar.xz
|
|
|
|
Change-Id: I8cf88d535e6fbd85fa0761fa23ac790c01711e01
|
|
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196684
|
|
Tested-by: Jenkins
|
|
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
|
|
---
|
|
.../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 15 +-
|
|
.../pdfimport/xpdfwrapper/pnghelper.cxx | 25 +-
|
|
4 files changed, 81 insertions(+), 184 deletions(-)
|
|
|
|
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
index a3b34db15464d..6b9184809803d 100644
|
|
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
|
|
@@ -231,7 +231,10 @@ static void writeJpeg_( OutputBuffer& o_rOutputBuf, Stream* str )
|
|
#else
|
|
str = ((DCTStream *)str)->getRawStream();
|
|
#endif
|
|
-#if POPPLER_CHECK_VERSION(25, 2, 0)
|
|
+#if POPPLER_CHECK_VERSION(26, 1, 0)
|
|
+ if (!str->rewind())
|
|
+ return;
|
|
+#elif POPPLER_CHECK_VERSION(25, 2, 0)
|
|
if (!str->reset())
|
|
return;
|
|
#else
|
|
@@ -272,7 +275,10 @@ static void writePbm_(OutputBuffer& o_rOutputBuf, Stream* str, int width, int he
|
|
o_rOutputBuf.resize(header_size);
|
|
|
|
// initialize stream
|
|
-#if POPPLER_CHECK_VERSION(25, 2, 0)
|
|
+#if POPPLER_CHECK_VERSION(26, 1, 0)
|
|
+ if (!str->rewind())
|
|
+ return;
|
|
+#elif POPPLER_CHECK_VERSION(25, 2, 0)
|
|
if (!str->reset())
|
|
return;
|
|
#else
|
|
@@ -334,7 +340,10 @@ static void writePpm_( OutputBuffer& o_rOutputBuf,
|
|
width,
|
|
colorMap->getNumPixelComps(),
|
|
colorMap->getBits()));
|
|
-#if POPPLER_CHECK_VERSION(25, 2, 0)
|
|
+#if POPPLER_CHECK_VERSION(26, 1, 0)
|
|
+ if (!imgStr->rewind())
|
|
+ return;
|
|
+#elif POPPLER_CHECK_VERSION(25, 2, 0)
|
|
if (!imgStr->reset())
|
|
return;
|
|
#else
|
|
diff --git a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
|
|
index e21d9192f563e..6e9784d4aa6bb 100644
|
|
--- a/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
|
|
+++ b/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx
|
|
@@ -214,7 +214,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
|
|
int nLineSize = (width + 7)/8;
|
|
aScanlines.reserve( nLineSize * height + height );
|
|
|
|
-#if POPPLER_CHECK_VERSION(25, 2, 0)
|
|
+#if POPPLER_CHECK_VERSION(26, 1, 0)
|
|
+ if (!str->rewind())
|
|
+ return;
|
|
+#elif POPPLER_CHECK_VERSION(25, 2, 0)
|
|
if (!str->reset())
|
|
return;
|
|
#else
|
|
@@ -257,7 +260,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
|
|
width,
|
|
colorMap->getNumPixelComps(),
|
|
colorMap->getBits()));
|
|
-#if POPPLER_CHECK_VERSION(25, 2, 0)
|
|
+#if POPPLER_CHECK_VERSION(26, 1, 0)
|
|
+ if (!imgStr->rewind())
|
|
+ return;
|
|
+#elif POPPLER_CHECK_VERSION(25, 2, 0)
|
|
if (!imgStr->reset())
|
|
return;
|
|
#else
|
|
@@ -299,7 +305,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
|
|
maskColorMap->getNumPixelComps(),
|
|
maskColorMap->getBits()));
|
|
|
|
-#if POPPLER_CHECK_VERSION(25, 2, 0)
|
|
+#if POPPLER_CHECK_VERSION(26, 1, 0)
|
|
+ if (!imgStrMask->rewind())
|
|
+ return;
|
|
+#elif POPPLER_CHECK_VERSION(25, 2, 0)
|
|
if (!imgStrMask->reset())
|
|
return;
|
|
#else
|
|
@@ -353,7 +362,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
|
|
width,
|
|
colorMap->getNumPixelComps(),
|
|
colorMap->getBits()));
|
|
-#if POPPLER_CHECK_VERSION(25, 2, 0)
|
|
+#if POPPLER_CHECK_VERSION(26, 1, 0)
|
|
+ if (!imgStr->rewind())
|
|
+ return;
|
|
+#elif POPPLER_CHECK_VERSION(25, 2, 0)
|
|
if (!imgStr->reset())
|
|
return;
|
|
#else
|
|
@@ -392,7 +404,10 @@ void PngHelper::createPng( OutputBuffer& o_rOutputBuf,
|
|
std::unique_ptr<ImageStream> imgStrMask(
|
|
new ImageStream(maskStr, maskWidth, 1, 1));
|
|
|
|
-#if POPPLER_CHECK_VERSION(25, 2, 0)
|
|
+#if POPPLER_CHECK_VERSION(26, 1, 0)
|
|
+ if (!imgStrMask->rewind())
|
|
+ return;
|
|
+#elif POPPLER_CHECK_VERSION(25, 2, 0)
|
|
if (!imgStrMask->reset())
|
|
return;
|
|
#else
|