PDF: remove use of OGRDataSourceH

OSGeo · Sep 19, 2024 · 79d3f20 · 79d3f20
1 parent 25e5386
commit 79d3f20
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/frmts/pdf/pdfcreatecopy.cpp b/frmts/pdf/pdfcreatecopy.cpp
@@ -2178,13 +2178,15 @@ bool GDALPDFWriter::WriteOGRDataSource(const char *pszOGRDataSource,
                                        const char *pszOGRLinkField,
                                        int bWriteOGRAttributes)
 {
-    OGRDataSourceH hDS = OGROpen(pszOGRDataSource, 0, nullptr);
+    GDALDatasetH hDS =
+        GDALOpenEx(pszOGRDataSource, GDAL_OF_VECTOR | GDAL_OF_VERBOSE_ERROR,
+                   nullptr, nullptr, nullptr);
     if (hDS == nullptr)
         return false;
 
     int iObj = 0;
 
-    int nLayers = OGR_DS_GetLayerCount(hDS);
+    int nLayers = GDALDatasetGetLayerCount(hDS);
 
     char **papszLayerNames =
         CSLTokenizeString2(pszOGRDisplayLayerNames, ",", 0);
@@ -2193,15 +2195,15 @@ bool GDALPDFWriter::WriteOGRDataSource(const char *pszOGRDataSource,
     {
         CPLString osLayerName;
         if (CSLCount(papszLayerNames) < nLayers)
-            osLayerName = OGR_L_GetName(OGR_DS_GetLayer(hDS, iLayer));
+            osLayerName = OGR_L_GetName(GDALDatasetGetLayer(hDS, iLayer));
         else
             osLayerName = papszLayerNames[iLayer];
 
         WriteOGRLayer(hDS, iLayer, pszOGRDisplayField, pszOGRLinkField,
                       osLayerName, bWriteOGRAttributes, iObj);
     }
 
-    OGRReleaseDataSource(hDS);
+    GDALClose(hDS);
 
     CSLDestroy(papszLayerNames);
 
@@ -2286,7 +2288,7 @@ int GDALPDFWriter::WriteOGRLayer(OGRDataSourceH hDS, int iLayer,
 
     GDALPDFLayerDesc osVectorDesc =
         StartOGRLayer(osLayerName, bWriteOGRAttributes);
-    OGRLayerH hLyr = OGR_DS_GetLayer(hDS, iLayer);
+    OGRLayerH hLyr = GDALDatasetGetLayer(hDS, iLayer);
 
     const auto poLayerDefn = OGRLayer::FromHandle(hLyr)->GetLayerDefn();
     for (int i = 0; i < poLayerDefn->GetFieldCount(); i++)

diff --git a/frmts/pdf/pdfcreatecopy.h b/frmts/pdf/pdfcreatecopy.h
@@ -377,7 +377,7 @@ class GDALPDFWriter final : public GDALPDFBaseWriter
                                    int bWriteOGRAttributes);
     void EndOGRLayer(GDALPDFLayerDesc &osVectorDesc);
 
-    int WriteOGRLayer(OGRDataSourceH hDS, int iLayer,
+    int WriteOGRLayer(GDALDatasetH hDS, int iLayer,
                       const char *pszOGRDisplayField,
                       const char *pszOGRLinkField,
                       const std::string &osLayerName, int bWriteOGRAttributes,

diff --git a/frmts/pdf/pdfwritabledataset.cpp b/frmts/pdf/pdfwritabledataset.cpp
@@ -379,9 +379,9 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
         else
             osLayerName = papszLayerNames[i];
 
-        oWriter.WriteOGRLayer((OGRDataSourceH)this, i, pszOGRDisplayField,
-                              pszOGRLinkField, osLayerName, bWriteOGRAttributes,
-                              iObj);
+        oWriter.WriteOGRLayer(GDALDataset::ToHandle(this), i,
+                              pszOGRDisplayField, pszOGRLinkField, osLayerName,
+                              bWriteOGRAttributes, iObj);
     }
 
     CSLDestroy(papszLayerNames);