Make sure datasets are closed.

Handle SD and non-SD invocations.

Author: abellgithub

apps/gdal_viewshed.cpp

@@ -259,48 +259,62 @@ void validateArgs(Options &localOpts, const GDALArgumentParser &argParser)
 }
 
 }  // unnamed namespace
-}  // namespace gdal
-
-/************************************************************************/
-/*                                main()                                */
-/************************************************************************/
 
-MAIN_START(argc, argv)
+struct ScopedDataset
 {
-    using namespace gdal;
+    ScopedDataset() : m_ds(nullptr)
+    {
+    }
 
-    EarlySetConfigOptions(argc, argv);
+    ScopedDataset(GDALDatasetH ds) : m_ds(ds)
+    {
+    }
 
-    GDALAllRegister();
+    ~ScopedDataset()
+    {
+        if (m_ds)
+            GDALClose(m_ds);
+    }
 
-    argc = GDALGeneralCmdLineProcessor(argc, &argv, 0);
-    CPLStringList aosArgv;
-    aosArgv.Assign(argv, /* bTakeOwnership= */ true);
-    if (argc < 1)
-        std::exit(-argc);
+    ScopedDataset &operator=(GDALDatasetH ds)
+    {
+        if (m_ds)
+            GDALClose(m_ds);
+        m_ds = ds;
+        return *this;
+    }
 
-    GDALArgumentParser argParser(aosArgv[0], /* bForBinary=*/true);
+    operator GDALDatasetH() const
+    {
+        return m_ds;
+    }
 
-    argParser.add_description(
-        _("Calculates a viewshed raster from an input raster DEM."));
+    operator bool() const
+    {
+        return m_ds != nullptr;
+    }
 
-    argParser.add_epilog(_("For more details, consult "
-                           "https://gdal.org/programs/gdal_viewshed.html"));
+    bool operator!() const
+    {
+        return m_ds == nullptr;
+    }
 
-    Options localOpts = parseArgs(argParser, aosArgv);
-    viewshed::Options &opts = localOpts.opts;
+    GDALDatasetH m_ds;
+};
 
-    validateArgs(localOpts, argParser);
+bool run(gdal::Options &localOpts, bool adjustCurveCoeff)
+{
+    viewshed::Options &opts = localOpts.opts;
 
     /* -------------------------------------------------------------------- */
     /*      Open source raster file.                                        */
     /* -------------------------------------------------------------------- */
-    GDALDatasetH hSrcDS =
+    ScopedDataset srcDs =
         GDALOpen(localOpts.osSrcFilename.c_str(), GA_ReadOnly);
-    if (hSrcDS == nullptr)
+    if (!srcDs)
         exit(2);
 
-    GDALRasterBandH hBand = GDALGetRasterBand(hSrcDS, localOpts.nBandIn);
+    GDALRasterBandH hBand = GDALGetRasterBand(srcDs, localOpts.nBandIn);
     if (hBand == nullptr)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
@@ -311,28 +325,31 @@ MAIN_START(argc, argv)
     /* -------------------------------------------------------------------- */
     /*      Open source SD raster file.                                     */
     /* -------------------------------------------------------------------- */
-    GDALDatasetH hSdDS = GDALOpen(localOpts.osSdFilename.c_str(), GA_ReadOnly);
-    if (hSdDS == nullptr)
-        exit(2);
+    ScopedDataset sdDs;
+    GDALRasterBandH hSdBand = nullptr;
 
-    GDALRasterBandH hSdBand = GDALGetRasterBand(hSdDS, 1);
-    if (hSdBand == nullptr)
+    if (localOpts.osSdFilename.size())
     {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "SD band (1) does not exist on SD dataset.");
-        exit(2);
+        sdDs = GDALOpen(localOpts.osSdFilename.c_str(), GA_ReadOnly);
+        if (!sdDs)
+            exit(2);
+
+        hSdBand = GDALGetRasterBand(sdDs, 1);
+        if (hSdBand == nullptr)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "SD band (1) does not exist on SD dataset.");
+            exit(2);
+        }
     }
 
-    if (!argParser.is_used("-cc"))
-        opts.curveCoeff =
-            gdal::viewshed::adjustCurveCoeff(opts.curveCoeff, hSrcDS);
+    if (adjustCurveCoeff)
+        opts.curveCoeff = viewshed::adjustCurveCoeff(opts.curveCoeff, srcDs);
 
     /* -------------------------------------------------------------------- */
     /*      Invoke.                                                         */
     /* -------------------------------------------------------------------- */
 
-    GDALDatasetH hDstDS;
-
     bool bSuccess;
     if (opts.outputMode == viewshed::OutputMode::Cumulative)
     {
@@ -344,14 +361,54 @@ MAIN_START(argc, argv)
     else
     {
         viewshed::Viewshed oViewshed(opts);
-        bSuccess = oViewshed.run(hBand, hSdBand,
-                                 localOpts.bQuiet ? GDALDummyProgress
-                                                  : GDALTermProgress);
-        hDstDS = GDALDataset::FromHandle(oViewshed.output().release());
-        GDALClose(hSrcDS);
-        if (GDALClose(hDstDS) != CE_None)
-            bSuccess = false;
+
+        if (hSdBand)
+            bSuccess = oViewshed.run(hBand, hSdBand,
+                                     localOpts.bQuiet ? GDALDummyProgress
+                                                      : GDALTermProgress);
+        else
+            bSuccess = oViewshed.run(
+                hBand, localOpts.bQuiet ? GDALDummyProgress : GDALTermProgress);
+        ScopedDataset dstDs =
+            GDALDataset::FromHandle(oViewshed.output().release());
+        bSuccess = dstDs;
     }
+    return bSuccess;
+}
+
+}  // namespace gdal
+
+/************************************************************************/
+/*                                main()                                */
+/************************************************************************/
+
+MAIN_START(argc, argv)
+{
+    using namespace gdal;
+
+    EarlySetConfigOptions(argc, argv);
+
+    GDALAllRegister();
+
+    argc = GDALGeneralCmdLineProcessor(argc, &argv, 0);
+    CPLStringList aosArgv;
+    aosArgv.Assign(argv, /* bTakeOwnership= */ true);
+    if (argc < 1)
+        std::exit(-argc);
+
+    GDALArgumentParser argParser(aosArgv[0], /* bForBinary=*/true);
+
+    argParser.add_description(
+        _("Calculates a viewshed raster from an input raster DEM."));
+
+    argParser.add_epilog(_("For more details, consult "
+                           "https://gdal.org/programs/gdal_viewshed.html"));
+
+    Options localOpts = parseArgs(argParser, aosArgv);
+
+    validateArgs(localOpts, argParser);
+
+    bool bSuccess = run(localOpts, !argParser.is_used("-cc"));
 
     GDALDestroyDriverManager();
     OGRCleanupAll();