gdal-poppler.patch

   1 --- gdal-2.4.0/frmts/pdf/pdfdataset.cpp.orig    2018-12-14 22:37:15.000000000 +0100
   2 +++ gdal-2.4.0/frmts/pdf/pdfdataset.cpp 2018-12-27 05:35:39.755925135 +0100
   3 @@ -3459,7 +3459,7 @@
   4  #endif
   5              if( ocg != nullptr && ocg->getName() != nullptr )
   6              {
   7 -                const char* pszLayerName = (const char*)ocg->getName()->getCString();
   8 +                const char* pszLayerName = (const char*)ocg->getName()->c_str();
   9                  AddLayer(pszLayerName);
  10                  oLayerOCGMapPoppler[pszLayerName] = ocg;
  11              }
  12 @@ -4787,7 +4787,7 @@
  13      GooString* poMetadata = poCatalogPoppler->readMetadata();
  14      if (poMetadata)
  15      {
  16 -        const char* pszContent = poMetadata->getCString();
  17 +        const char* pszContent = poMetadata->c_str();
  18          if (pszContent != nullptr &&
  19              STARTS_WITH(pszContent, "<?xpacket begin="))
  20          {
  21 --- gdal-2.4.0/frmts/pdf/pdfobject.cpp.orig     2018-12-14 22:37:15.000000000 +0100
  22 +++ gdal-2.4.0/frmts/pdf/pdfobject.cpp  2018-12-27 16:31:17.472142636 +0100
  23 @@ -1061,7 +1061,7 @@
  24  #else
  25          GooString* gooString = m_po->getString();
  26  #endif
  27 -        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->getCString()),
  28 +        return (osStr = GDALPDFGetUTF8StringFromBytes(reinterpret_cast<const GByte*>(gooString->c_str()),
  29                                                        static_cast<int>(gooString->getLength())));
  30      }
  31      else
  32 @@ -1422,7 +1422,7 @@
  33          char* pszContent = (char*) VSIMalloc(m_nLength + 1);
  34          if (pszContent)
  35          {
  36 -            memcpy(pszContent, gstr->getCString(), m_nLength);
  37 +            memcpy(pszContent, gstr->c_str(), m_nLength);
  38              pszContent[m_nLength] = '\0';
  39          }
  40          delete gstr;