Fix warnings when building against Poppler 25.03.00

rouault · Mar 9, 2025 · 2e5e16f · 2e5e16f
1 parent 5674a68
commit 2e5e16f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
@@ -171,7 +171,7 @@ class GDALPDFOutputDev : public SplashOutputDev
                                            invert, interpolate, inlineImg);
         else
         {
-            str->reset();
+            VSIPDFFileStream::resetNoCheckReturnValue(str);
             if (inlineImg)
             {
                 skipBytes(str, width, height, 1, 1);
@@ -209,7 +209,7 @@ class GDALPDFOutputDev : public SplashOutputDev
                                        interpolate, maskColors, inlineImg);
         else
         {
-            str->reset();
+            VSIPDFFileStream::resetNoCheckReturnValue(str);
             if (inlineImg)
             {
                 skipBytes(str, width, height, colorMap->getNumPixelComps(),

diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
@@ -260,7 +260,7 @@ void VSIPDFFileStream::reset()
 /************************************************************************/
 
 #if POPPLER_MAJOR_VERSION > 25 ||                                              \
-    (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION > 2)
+    (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 3)
 bool VSIPDFFileStream::unfilteredReset()
 {
     return reset();

diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
@@ -54,8 +54,18 @@ class VSIPDFFileStream final : public BaseStream
     virtual void reset() override;
 #endif
 
+    static void resetNoCheckReturnValue(Stream *str)
+    {
+#if POPPLER_MAJOR_VERSION > 25 ||                                              \
+    (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 2)
+        CPL_IGNORE_RET_VAL(str->reset());
+#else
+        str->reset();
+#endif
+    }
+
 #if POPPLER_MAJOR_VERSION > 25 ||                                              \
-    (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION > 2)
+    (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 3)
     virtual bool unfilteredReset() override;
 #else
     virtual void unfilteredReset() override;