sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit c680052f44c394d037cdddcde54f795a8b2a51b4
Author: Robin Candau <robincan...@protonmail.com>
AuthorDate: Thu Feb 27 10:26:53 2025 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Feb 27 16:36:58 2025 +0100
tdf#165433 Fix PDF imports with (system) poppler >= 25.02.0
Since poppler 25.02.0, GlobalParams doesn't have a constructor
that accepts a nullptr anymore,
see upstream poppler b50390f748b59cb0a64b912636ecf6527bd0d12a commit.
As such, the data directory location defined for SYSTEM_POPPLER
needs to be updated accordingly (when SYSTEM_POPPLER >= 25.02.0),
otherwise PDF imports fail with
"General Error / General input/output error".
Change-Id: I2a60b03a9ae20aab8d36db2a6827f1f3b9618115
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182282
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 406afe11711df9fcabbc829fcff00aef2f44c1d9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182308
diff --git a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
index ebed120708cc..9b63559be44d 100644
--- a/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
@@ -110,7 +110,11 @@ int main(int argc, char **argv)
/* Get data directory location */
#ifdef SYSTEM_POPPLER
+#if POPPLER_CHECK_VERSION(25, 0, 2)
+ const std::string datadir = "";
+#else
const char* datadir = nullptr;
+#endif
#else
/* Creates an absolute path to the poppler_data directory, by taking the
path
* to the xpdfimport executable (provided in argv[0], and concatenating a
