Hello community,
here is the log from the commit of package gdal for openSUSE:Factory checked in at 2019-02-01 11:48:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gdal (Old)
and /work/SRC/openSUSE:Factory/.gdal.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdal"
Fri Feb 1 11:48:10 2019 rev:36 rq:670316 version:2.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gdal/gdal.changes 2018-12-27 00:30:08.875625890 +0100
+++ /work/SRC/openSUSE:Factory/.gdal.new.28833/gdal.changes 2019-02-01 11:48:31.940362284 +0100
@@ -1,0 +2,8 @@
+Wed Jan 30 19:51:14 UTC 2019 - Wolfgang Bauer
From d295d0ebc3b41092ad072790c704c772098da210 Mon Sep 17 00:00:00 2001 From: Even Rouault
Date: Thu, 17 Jan 2019 22:52:36 +0100 Subject: [PATCH] PDF: add support for 0.72.0 and 0.73.0 (fixes #1207, fixes #1208)
---
gdal/frmts/pdf/pdfdataset.cpp | 8 ++++++++
gdal/frmts/pdf/pdfobject.cpp | 5 +++++
gdal/frmts/pdf/pdfsdk_headers.h | 4 ++++
3 files changed, 17 insertions(+)
diff --git a/gdal/frmts/pdf/pdfdataset.cpp b/gdal/frmts/pdf/pdfdataset.cpp
index 27c9b552431..2eff2189fad 100644
--- a/gdal/frmts/pdf/pdfdataset.cpp
+++ b/gdal/frmts/pdf/pdfdataset.cpp
@@ -3416,7 +3416,11 @@ void PDFDataset::FindLayersPoppler()
#endif
if( ocg != nullptr && ocg->getName() != nullptr )
{
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+ const char* pszLayerName = (const char*)ocg->getName()->c_str();
+#else
const char* pszLayerName = (const char*)ocg->getName()->getCString();
+#endif
AddLayer(pszLayerName);
oLayerOCGMapPoppler[pszLayerName] = ocg;
}
@@ -4740,7 +4744,11 @@ GDALDataset *PDFDataset::Open( GDALOpenInfo * poOpenInfo )
GooString* poMetadata = poCatalogPoppler->readMetadata();
if (poMetadata)
{
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+ const char* pszContent = poMetadata->c_str();
+#else
const char* pszContent = poMetadata->getCString();
+#endif
if (pszContent != nullptr &&
STARTS_WITH(pszContent, "getString();
#endif
+#if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
+ return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast