diff options
Diffstat (limited to 'poppler-21.10.0.patch')
| -rw-r--r-- | poppler-21.10.0.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/poppler-21.10.0.patch b/poppler-21.10.0.patch new file mode 100644 index 000000000000..208bec000f26 --- /dev/null +++ b/poppler-21.10.0.patch @@ -0,0 +1,32 @@ +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 + +--- + gdal/frmts/pdf/pdfdataset.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp +index 9c4c28a6572..50a8154c756 100644 +--- a/gdal/frmts/pdf/pdfdataset.cpp ++++ b/gdal/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 */ |