Merge pull request OSGeo#13049 from rouault/PDFWritableVectorDataset_FlushCache

PDF: properly override FlushCache() instead of no longer existing SyncToDisk()

Author: rouault

frmts/pdf/gdal_pdf.h

@@ -536,7 +536,8 @@ class PDFWritableVectorDataset final : public GDALDataset
                                    const OGRGeomFieldDefn *poGeomFieldDefn,
                                    CSLConstList papszOptions) override;
 
-    OGRErr SyncToDisk();
+    CPLErr Close() override;
+    CPLErr FlushCache(bool bAtClosing) override;
 
     int GetLayerCount() const override;
     const OGRLayer *GetLayer(int) const override;

frmts/pdf/pdfwritabledataset.cpp

@@ -32,7 +32,7 @@ PDFWritableVectorDataset::PDFWritableVectorDataset()
 
 PDFWritableVectorDataset::~PDFWritableVectorDataset()
 {
-    PDFWritableVectorDataset::SyncToDisk();
+    PDFWritableVectorDataset::Close();
 
     CSLDestroy(papszOptions);
     for (int i = 0; i < nLayers; i++)
@@ -151,13 +151,22 @@ int PDFWritableVectorDataset::GetLayerCount() const
 }
 
 /************************************************************************/
-/*                            SyncToDisk()                              */
+/*                              Close()                                 */
 /************************************************************************/
 
-OGRErr PDFWritableVectorDataset::SyncToDisk()
+CPLErr PDFWritableVectorDataset::Close()
+{
+    return PDFWritableVectorDataset::FlushCache(true);
+}
+
+/************************************************************************/
+/*                            FlushCache()                              */
+/************************************************************************/
+
+CPLErr PDFWritableVectorDataset::FlushCache(bool /* bAtClosing*/)
 {
     if (nLayers == 0 || !bModified)
-        return OGRERR_NONE;
+        return CE_None;
 
     bModified = FALSE;
 
@@ -177,7 +186,7 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Cannot compute spatial extent of features");
-        return OGRERR_FAILURE;
+        return CE_Failure;
     }
 
     double dfRatio = (sGlobalExtent.MaxY - sGlobalExtent.MinY) /
@@ -192,7 +201,7 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
         if (dfHeight < 1 || dfHeight > INT_MAX || std::isnan(dfHeight))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Invalid image dimensions");
-            return OGRERR_FAILURE;
+            return CE_Failure;
         }
         nHeight = static_cast<int>(dfHeight);
     }
@@ -203,7 +212,7 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
         if (dfWidth < 1 || dfWidth > INT_MAX || std::isnan(dfWidth))
         {
             CPLError(CE_Failure, CPLE_AppDefined, "Invalid image dimensions");
-            return OGRERR_FAILURE;
+            return CE_Failure;
         }
         nWidth = static_cast<int>(dfWidth);
     }
@@ -222,7 +231,7 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Cannot compute spatial extent of features");
-        return OGRERR_FAILURE;
+        return CE_Failure;
     }
 
     PDFCompressMethod eStreamCompressMethod = COMPRESS_DEFLATE;
@@ -325,7 +334,7 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
     {
         CPLError(CE_Failure, CPLE_OpenFailed, "Unable to create PDF file %s.\n",
                  GetDescription());
-        return OGRERR_FAILURE;
+        return CE_Failure;
     }
 
     GDALPDFWriter oWriter(fp);
@@ -382,5 +391,5 @@ OGRErr PDFWritableVectorDataset::SyncToDisk()
 
     delete poSrcDS;
 
-    return OGRERR_NONE;
+    return CE_None;
 }