Bruno Friedmann
56fa3d514b
- Fix build with poppler 2.10: * gdal-poppler-2.10-a.patch * gdal-poppler-2.10-b.patch OBS-URL: https://build.opensuse.org/request/show/926472 OBS-URL: https://build.opensuse.org/package/show/Application:Geo/gdal?expand=0&rev=142
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 9c09870e374ca21d558101af3f4c09a6164fdfc3 Mon Sep 17 00:00:00 2001
|
|
From: Even Rouault <even.rouault@spatialys.com>
|
|
Date: Sun, 26 Sep 2021 22:49:52 +0200
|
|
Subject: [PATCH] Fix build against Poppler master
|
|
|
|
---
|
|
frmts/pdf/pdfdataset.cpp | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
|
|
index 9c4c28a6572..50a8154c756 100644
|
|
--- a/frmts/pdf/pdfdataset.cpp
|
|
+++ b/frmts/pdf/pdfdataset.cpp
|
|
@@ -5012,7 +5012,7 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
|
|
#ifdef HAVE_POPPLER
|
|
if (bUseLib.test(PDFLIB_POPPLER))
|
|
{
|
|
- GooString* poMetadata = poCatalogPoppler->readMetadata();
|
|
+ auto poMetadata = poCatalogPoppler->readMetadata();
|
|
if (poMetadata)
|
|
{
|
|
#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
|
|
@@ -5026,7 +5026,9 @@ PDFDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
|
|
const char * const apszMDList[2] = { pszContent, nullptr };
|
|
poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
|
|
}
|
|
+#if (POPPLER_MAJOR_VERSION < 21 || (POPPLER_MAJOR_VERSION == 21 && POPPLER_MINOR_VERSION <= 9))
|
|
delete poMetadata;
|
|
+#endif
|
|
}
|
|
|
|
/* Read Info object */
|