Merge remote-tracking branch 'upstream/master' into inputmasking

Author: abellgithub

.github/workflows/armhf/test.sh

@@ -4,7 +4,7 @@ set -eu
 
 source ${GDAL_SOURCE_DIR:=..}/scripts/setdevenv.sh
 
-autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSpawn
+autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSpawn:test_cpl.CPLGetCurrentThreadCount
 
 pytest autotest/alg -k "not test_warp_52 and not test_warp_rpc_source_has_geotransform"
 # Excluded tests starting at test_tiff_read_multi_threaded are due to lack of virtual memory

.github/workflows/cmake_builds.yml

@@ -93,7 +93,7 @@ jobs:
         wget https://apache.jfrog.io/artifactory/arrow/$(lsb_release --id --short | tr 'A-Z' 'a-z')/apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
         sudo apt-get install -y -V ./apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
         sudo apt-get update
-        sudo apt-get install -y -V libarrow-dev libparquet-dev libarrow-dataset-dev
+        sudo apt-get install -y -V libarrow-dev libparquet-dev libarrow-dataset-dev libarrow-compute-dev
         #
         PYTHON_CMD=python3 && $PYTHON_CMD -m pip install -r $GITHUB_WORKSPACE/autotest/requirements.txt
 

.github/workflows/coverage/test.sh

@@ -22,6 +22,8 @@ IP=host.docker.internal
 (cd autotest && OGR_PG_CONNECTION_STRING="host=$IP port=25432 dbname=autotest user=docker password=docker" $PYTEST --capture=no -ra ogr/ogr_pg.py)
 (cd autotest && PGHOST="$IP" PGPORT=25432 PGUSER=docker PGPASSWORD=docker $PYTEST --capture=no -ra gdrivers/postgisraster.py)
 
+(cd autotest && $PYTEST --capture=no -ra utilities/test_gdalalg_raster_tile.py::test_gdalalg_raster_tile_fork_auto)
+
 # Generate coverage report
 lcov --directory . --capture --output-file gdal.info 2>/dev/null
 cp gdal.info gdal_filtered.info

.github/workflows/s390x/test.sh

@@ -4,7 +4,7 @@ set -eu
 
 source ${GDAL_SOURCE_DIR:=..}/scripts/setdevenv.sh
 
-autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSM_signed:test_cpl.CPLSpawn:test_cpl.CPLUTF8ForceToASCII
+autotest/cpp/gdal_unit_test --gtest_filter=-test_cpl.CPLSM_signed:test_cpl.CPLSpawn:test_cpl.CPLUTF8ForceToASCII:test_cpl.CPLGetCurrentThreadCount
 
 pytest autotest/alg
 pytest autotest/gcore -k "not transformer and not virtualmem and not test_vrt_protocol_netcdf_component_name and not test_vsicrypt_3"

CMakeLists.txt

@@ -48,7 +48,7 @@ endif()
 include(Ccache)
 
 #
-if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(x86|AMD64)")
+if ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "(i586|i686|x86|AMD64)")
   check_compiler_machine_option(flag SSE)
   if (NOT ${flag} STREQUAL "")
     set(HAVE_SSE_AT_COMPILE_TIME 1)

MIGRATION_GUIDE.TXT

@@ -9,6 +9,10 @@ MIGRATION GUIDE FROM GDAL 3.11 to GDAL 3.12
     will be definitely removed in 3.13.
   * Furthermore, sub-command "set-type" of "gdal vector geom" is renamed as
     "set-geom-type" and also placed under "gdal vector".
+  * Progress bar is emitted to stdout by default unless --quiet/-q is specified.
+  * For gdal raster info, gdal vector info and gdal vsi list, --format=text is
+    now the default when those utilities are invoked from the command line.
+    When they are invoked from the API, the default is still JSON.
 
 - The raw file capabilities (VRTRawRasterBand) of the VRT raster driver have
   been limited by default for security reasons. Consult

alg/gdalapplyverticalshiftgrid.cpp

@@ -160,7 +160,7 @@ const OGRSpatialReference *GDALApplyVSGDataset::GetSpatialRef() const
 bool GDALApplyVSGDataset::IsInitOK()
 {
     GDALApplyVSGRasterBand *poBand =
-        reinterpret_cast<GDALApplyVSGRasterBand *>(GetRasterBand(1));
+        cpl::down_cast<GDALApplyVSGRasterBand *>(GetRasterBand(1));
     return poBand->m_pafSrcData != nullptr && poBand->m_pafGridData != nullptr;
 }
 
@@ -195,7 +195,7 @@ GDALApplyVSGRasterBand::~GDALApplyVSGRasterBand()
 
 double GDALApplyVSGRasterBand::GetNoDataValue(int *pbSuccess)
 {
-    GDALApplyVSGDataset *poGDS = reinterpret_cast<GDALApplyVSGDataset *>(poDS);
+    GDALApplyVSGDataset *poGDS = cpl::down_cast<GDALApplyVSGDataset *>(poDS);
     return poGDS->m_poSrcDataset->GetRasterBand(1)->GetNoDataValue(pbSuccess);
 }
 
@@ -206,7 +206,7 @@ double GDALApplyVSGRasterBand::GetNoDataValue(int *pbSuccess)
 CPLErr GDALApplyVSGRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
                                           void *pData)
 {
-    GDALApplyVSGDataset *poGDS = reinterpret_cast<GDALApplyVSGDataset *>(poDS);
+    GDALApplyVSGDataset *poGDS = cpl::down_cast<GDALApplyVSGDataset *>(poDS);
 
     const int nXOff = nBlockXOff * nBlockXSize;
     const int nReqXSize = (nXOff > nRasterXSize - nBlockXSize)

alg/gdalwarpkernel.cpp

@@ -8336,7 +8336,8 @@ static void GWKSumPreservingThread(void *pData)
             std::fill(adfBandDensity.begin(), adfBandDensity.end(), 0);
             std::fill(adfWeight.begin(), adfWeight.end(), 0);
             double dfDensity = 0;
-            double dfTotalWeight = 0;
+            // Just above zero to please Coveriy Scan
+            double dfTotalWeight = std::numeric_limits<double>::min();
 
             /* ====================================================================
              */

alg/gdalwarpoperation.cpp

@@ -3246,11 +3246,10 @@ CPLErr GDALWarpOperation::ComputeSourceWindow(
     /*      fallback to adding a bit to the window if any points failed     */
     /*      to transform.                                                   */
     /* -------------------------------------------------------------------- */
-    if (CSLFetchNameValue(psOptions->papszWarpOptions, "SOURCE_EXTRA") !=
-        nullptr)
+    if (const char *pszSoureExtra =
+            CSLFetchNameValue(psOptions->papszWarpOptions, "SOURCE_EXTRA"))
     {
-        const int nSrcExtra = atoi(
-            CSLFetchNameValue(psOptions->papszWarpOptions, "SOURCE_EXTRA"));
+        const int nSrcExtra = atoi(pszSoureExtra);
         nXRadius += nSrcExtra;
         nYRadius += nSrcExtra;
     }

alg/viewshed/viewshed_executor.cpp

@@ -185,7 +185,7 @@ void ViewshedExecutor::setOutput(double &dfResult, double &dfCellVal,
     {
         double adjustment = dfZ - dfCellVal;
         if (adjustment > 0)
-            dfResult += (dfZ - dfCellVal);
+            dfResult += adjustment;
     }
     else
         dfResult = (dfCellVal + oOpts.targetHeight < dfZ) ? oOpts.invisibleVal