[patch] 1/3 patches needed to adjust for poppler changes

poppler-cstr.patch (text/plain), 1.70 KB, created by Kyle Elbert on 2019-03-16 03:20:12 UTC

--- ./frmts/pdf/pdfdataset.cpp.orig	2019-03-15 21:49:28.297796187 -0500
+++ ./frmts/pdf/pdfdataset.cpp	2019-03-15 21:51:40.514795682 -0500
@@ -3459,7 +3459,7 @@
 #endif
             if( ocg != nullptr && ocg->getName() != nullptr )
             {
-                const char* pszLayerName = (const char*)ocg->getName()->getCString();
+                const char* pszLayerName = (const char*)ocg->getName()->c_str();
                 AddLayer(pszLayerName);
                 oLayerOCGMapPoppler[pszLayerName] = ocg;
             }
@@ -4787,7 +4787,7 @@
     GooString* poMetadata = poCatalogPoppler->readMetadata();
     if (poMetadata)
     {
-        const char* pszContent = poMetadata->getCString();
+        const char* pszContent = poMetadata->c_str();
         if (pszContent != nullptr &&
             STARTS_WITH(pszContent, "<?xpacket begin="))
         {
--- ./frmts/pdf/pdfobject.cpp.orig	2019-03-15 21:52:12.561795560 -0500
+++ ./frmts/pdf/pdfobject.cpp	2019-03-15 21:52:38.383795462 -0500
@@ -1061,7 +1061,7 @@
 #else
         GooString* gooString = m_po->getString();
 #endif
-        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
+        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
                                                       static_cast<int>(gooString->getLength())));
     }
     else
@@ -1422,7 +1422,7 @@
         char* pszContent = (char*) VSIMalloc(m_nLength + 1);
         if (pszContent)
         {
-            memcpy(pszContent, gstr->getCString(), m_nLength);
+            memcpy(pszContent, gstr->c_str(), m_nLength);
             pszContent[m_nLength] = '\0';
         }
         delete gstr;