gdalwarp: progress bar tunings

- make sure that progress for each source file goes to 100% - display first progress bar after message about copying nodata values
OSGeo · Nov 22, 2023 · d813ba0 · d813ba0
1 parent 4185ffd
commit d813ba0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/apps/gdalwarp_bin.cpp b/apps/gdalwarp_bin.cpp
@@ -149,6 +149,8 @@ static int CPL_STDCALL WarpTermProgress(double dfProgress,
     }
     else if (pszMessage != osLastMsg)
     {
+        if (!osLastMsg.empty())
+            GDALTermProgress(1.0, nullptr, nullptr);
         printf("%s : ", pszMessage);
         osLastMsg = pszMessage;
         iSrc++;

diff --git a/apps/gdalwarp_lib.cpp b/apps/gdalwarp_lib.cpp
@@ -2582,7 +2582,6 @@ static GDALDatasetH GDALWarpDirect(const char *pszDest, GDALDatasetH hDstDS,
          */
         hSrcDS = pahSrcDS[iSrc];
         oProgress.iSrc = iSrc;
-        oProgress.Do(0);
 
         /* --------------------------------------------------------------------
          */
@@ -3028,6 +3027,8 @@ static GDALDatasetH GDALWarpDirect(const char *pszDest, GDALDatasetH hDstDS,
         SetupNoData(pszDest, iSrc, hSrcDS, hWrkSrcDS, hDstDS, psWO, psOptions,
                     bEnableDstAlpha, bInitDestSetByUser);
 
+        oProgress.Do(0);
+
         /* --------------------------------------------------------------------
          */
         /*      For the first source image of a newly created dataset, decide */