Fix compilation with poppler version >= 25.01.

Forwarded: https://gitlab.com/gambas/gambas/-/merge_requests/383

Gbp-Pq: Name Fix-compilation-with-poppler-version-25.01.patch

diff --git a/gb.pdf/configure.ac b/gb.pdf/configure.ac
index ca36347c8989aa5b8b85a3d4754618b0acf6f3da..aabf3f2eedeb27857d8a477244ccae50e09e142c 100644 (file)
--- a/gb.pdf/configure.ac
+++ b/gb.pdf/configure.ac
@@ -42,6 +42,8 @@ if test "$have_poppler" = "yes"; then
   AC_DEFINE_UNQUOTED(POPPLER_VERSION_24_11_0, $((1-$?)), Poppler version >= 24.11.0)
   $PKG_CONFIG --atleast-version=24.12.0 poppler
   AC_DEFINE_UNQUOTED(POPPLER_VERSION_24_12_0, $((1-$?)), Poppler version >= 24.12.0)
+  $PKG_CONFIG --atleast-version=25.01.0 poppler
+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_25_01_0, $((1-$?)), Poppler version >= 25.01.0)
 fi
 
 AC_CONFIG_FILES([\

diff --git a/gb.pdf/src/CPdfDocument.cpp b/gb.pdf/src/CPdfDocument.cpp
index d66b4a82b049c73b0abf924ab6207e5de46f5356..65e33a9a4f8521adb604e9b4a13cc36493eb4998 100644 (file)
--- a/gb.pdf/src/CPdfDocument.cpp
+++ b/gb.pdf/src/CPdfDocument.cpp
@@ -1028,7 +1028,11 @@ END_PROPERTY
 BEGIN_METHOD(PDFPAGE_select, GB_INTEGER X; GB_INTEGER Y; GB_INTEGER W; GB_INTEGER H)
 
        TextOutputDev *dev;
+#if POPPLER_VERSION_25_01_0
+       GooString str;
+# else
        GooString *str;
+#endif
 #if POPPLER_VERSION_24_12_0
        std::unique_ptr<Gfx> _gfx;
 #endif
@@ -1060,6 +1064,9 @@ BEGIN_METHOD(PDFPAGE_select, GB_INTEGER X; GB_INTEGER Y; GB_INTEGER W; GB_INTEGE
 #endif
        delete dev;
 
+#if POPPLER_VERSION_25_01_0
+       GB.ReturnNewString(str.getCString(),str.getLength());
+#else
        if (!str)
        {
                GB.ReturnNewZeroString("");
@@ -1068,6 +1075,7 @@ BEGIN_METHOD(PDFPAGE_select, GB_INTEGER X; GB_INTEGER Y; GB_INTEGER W; GB_INTEGE
        
        GB.ReturnNewString(str->getCString(),str->getLength()); 
        delete str;
+#endif
 
 END_METHOD