[pull] master from OSGeo:master

NEWS.md

@@ -360,7 +360,7 @@ XODR driver:
 * Fix typo in handling of Translate widthPct, heightPct
 * add relatedFieldNameMatch parameter to gdal.VectorTranslate()
 
-# GDAL/OGR 3.10.2 Release Notes
+# GDAL/OGR 3.10.2 "Gulf of Mexico" Release Notes
 
 GDAL 3.10.2 is a bugfix release.
 

alg/gdaltransformer.cpp

@@ -524,11 +524,11 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
     /* -------------------------------------------------------------------- */
     /*      Transform them to the output coordinate system.                 */
     /* -------------------------------------------------------------------- */
-    CPLTurnFailureIntoWarning(true);
-    pfnTransformer(pTransformArg, FALSE, nSamplePoints, padfX, padfY, padfZ,
-                   pabSuccess);
-    CPLTurnFailureIntoWarning(false);
-
+    {
+        CPLTurnFailureIntoWarningBackuper oErrorsToWarnings{};
+        pfnTransformer(pTransformArg, FALSE, nSamplePoints, padfX, padfY, padfZ,
+                       pabSuccess);
+    }
     constexpr int SIGN_FINAL_UNINIT = -2;
     constexpr int SIGN_FINAL_INVALID = 0;
     int iSignDiscontinuity = SIGN_FINAL_UNINIT;
@@ -588,15 +588,14 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
                     double ayTemp[2] = {padfY[i], padfY[i]};
                     double azTemp[2] = {padfZ[i], padfZ[i]};
                     int abSuccess[2] = {FALSE, FALSE};
-                    CPLTurnFailureIntoWarning(true);
+                    CPLTurnFailureIntoWarningBackuper oErrorsToWarnings{};
                     if (pfnTransformer(pTransformArg, TRUE, 2, axTemp, ayTemp,
                                        azTemp, abSuccess) &&
                         fabs(axTemp[0] - axTemp[1]) < 1e-8 &&
                         fabs(ayTemp[0] - ayTemp[1]) < 1e-8)
                     {
                         padfX[i] = iSignDiscontinuity * 180.0;
                     }
-                    CPLTurnFailureIntoWarning(false);
                 }
             }
         }
@@ -615,10 +614,11 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
         memcpy(padfXRevert, padfX, nSamplePoints * sizeof(double));
         memcpy(padfYRevert, padfY, nSamplePoints * sizeof(double));
         memcpy(padfZRevert, padfZ, nSamplePoints * sizeof(double));
-        CPLTurnFailureIntoWarning(true);
-        pfnTransformer(pTransformArg, TRUE, nSamplePoints, padfXRevert,
-                       padfYRevert, padfZRevert, pabSuccess);
-        CPLTurnFailureIntoWarning(false);
+        {
+            CPLTurnFailureIntoWarningBackuper oErrorsToWarnings{};
+            pfnTransformer(pTransformArg, TRUE, nSamplePoints, padfXRevert,
+                           padfYRevert, padfZRevert, pabSuccess);
+        }
 
         for (int i = 0; nFailedCount == 0 && i < nSamplePoints; i++)
         {
@@ -693,10 +693,11 @@ CPLErr CPL_STDCALL GDALSuggestedWarpOutput2(GDALDatasetH hSrcDS,
 
         CPLAssert(nSamplePoints == nSampleMax);
 
-        CPLTurnFailureIntoWarning(true);
-        pfnTransformer(pTransformArg, FALSE, nSamplePoints, padfX, padfY, padfZ,
-                       pabSuccess);
-        CPLTurnFailureIntoWarning(false);
+        {
+            CPLTurnFailureIntoWarningBackuper oErrorsToWarnings{};
+            pfnTransformer(pTransformArg, FALSE, nSamplePoints, padfX, padfY,
+                           padfZ, pabSuccess);
+        }
     }
 
     /* -------------------------------------------------------------------- */

apps/CMakeLists.txt

@@ -12,6 +12,7 @@ add_library(
   gdalalg_pipeline.cpp
   gdalalg_raster.cpp
   gdalalg_raster_info.cpp
+  gdalalg_raster_calc.cpp
   gdalalg_raster_clip.cpp
   gdalalg_raster_convert.cpp
   gdalalg_raster_edit.cpp

apps/gdalalg_raster.cpp

@@ -13,6 +13,7 @@
 #include "gdalalgorithm.h"
 
 #include "gdalalg_raster_info.h"
+#include "gdalalg_raster_calc.h"
 #include "gdalalg_raster_clip.h"
 #include "gdalalg_raster_convert.h"
 #include "gdalalg_raster_edit.h"
@@ -41,6 +42,7 @@ class GDALRasterAlgorithm final : public GDALAlgorithm
     GDALRasterAlgorithm() : GDALAlgorithm(NAME, DESCRIPTION, HELP_URL)
     {
         RegisterSubAlgorithm<GDALRasterInfoAlgorithm>();
+        RegisterSubAlgorithm<GDALRasterCalcAlgorithm>();
         RegisterSubAlgorithm<GDALRasterConvertAlgorithm>();
         RegisterSubAlgorithm<GDALRasterClipAlgorithmStandalone>();
         RegisterSubAlgorithm<GDALRasterEditAlgorithmStandalone>();