ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#165433 Fix PDF imports with (system) poppler >= 25.02.0

Browse Source 
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 <xiscofauli@libreoffice.org>
This commit is contained in:
Robin Candau
2025-02-27 14:48:12 +01:00
committed by Xisco Fauli
parent 660d2140c3
commit 406afe1171
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+4
View File
@@ -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