Merge pull request #10951 from rouault/safe_open_error

Safe (Sentinel1): report failure to opening a band dataset as a warning
OSGeo · Oct 8, 2024 · c83a64b · c83a64b
2 parents 7912e57 + d35cf96
commit c83a64b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/frmts/safe/safedataset.cpp b/frmts/safe/safedataset.cpp
@@ -1299,8 +1299,11 @@ GDALDataset *SAFEDataset::Open(GDALOpenInfo *poOpenInfo)
             /*      Try and open the file. */
             /* --------------------------------------------------------------------
              */
+            CPLTurnFailureIntoWarning(true);
             auto poBandFile = std::unique_ptr<GDALDataset>(
-                GDALDataset::Open(osFullFilename.c_str()));
+                GDALDataset::Open(osFullFilename.c_str(),
+                                  GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR));
+            CPLTurnFailureIntoWarning(false);
             if (poBandFile == nullptr)
             {
                 // NOP

diff --git a/port/cpl_error.h b/port/cpl_error.h
@@ -151,7 +151,7 @@ void CPL_DLL CPL_STDCALL CPLDefaultErrorHandler(CPLErr, CPLErrorNum,
                                                 const char *);
 void CPL_DLL CPL_STDCALL CPLQuietErrorHandler(CPLErr, CPLErrorNum,
                                               const char *);
-void CPLTurnFailureIntoWarning(int bOn);
+void CPL_DLL CPLTurnFailureIntoWarning(int bOn);
 
 CPLErrorHandler CPL_DLL CPLGetErrorHandler(void **ppUserData);