[pull] master from OSGeo:master

.github/workflows/alpine_32bit/Dockerfile.ci

@@ -9,6 +9,7 @@ RUN apk add \
     brunsli-dev \
     ccache \
     cfitsio-dev \
+    clang \
     cmake \
     curl-dev \
     expat-dev \

.github/workflows/alpine_32bit/build.sh

@@ -4,6 +4,9 @@ set -e
 
 cmake ${GDAL_SOURCE_DIR:=..} \
   -DCMAKE_BUILD_TYPE=Debug \
+  -DCMAKE_C_COMPILER=clang \
+  -DCMAKE_CXX_COMPILER=clang++ \
+  -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \
   -DUSE_CCACHE=ON \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DIconv_INCLUDE_DIR=/usr/include/gnu-libiconv \

.github/workflows/cmake_builds.yml

@@ -323,7 +323,7 @@ jobs:
             base-devel git mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache
             mingw-w64-x86_64-pcre mingw-w64-x86_64-xerces-c mingw-w64-x86_64-zstd mingw-w64-x86_64-libarchive
             mingw-w64-x86_64-geos mingw-w64-x86_64-libspatialite mingw-w64-x86_64-proj
-            mingw-w64-x86_64-cgal mingw-w64-x86_64-libfreexl mingw-w64-x86_64-hdf5 mingw-w64-x86_64-netcdf mingw-w64-x86_64-poppler mingw-w64-x86_64-postgresql
+            mingw-w64-x86_64-cgal mingw-w64-x86_64-libfreexl mingw-w64-x86_64-hdf5 mingw-w64-x86_64-netcdf mingw-w64-x86_64-poppler  mingw-w64-x86_64-podofo mingw-w64-x86_64-postgresql
             mingw-w64-x86_64-libgeotiff mingw-w64-x86_64-libpng mingw-w64-x86_64-libtiff mingw-w64-x86_64-openjpeg2
             mingw-w64-x86_64-python-pip mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-pytest mingw-w64-x86_64-python-setuptools mingw-w64-x86_64-python-lxml mingw-w64-x86_64-swig mingw-w64-x86_64-python-psutil mingw-w64-x86_64-blosc
       - name: Setup cache

.github/workflows/linux_build.yml

@@ -71,7 +71,7 @@ jobs:
             build_script: build.sh
             os: ubuntu-22.04
 
-          - name: Alpine, gcc 32-bit
+          - name: Alpine, clang 32-bit
             id: alpine_32bit
             container: alpine_32bit
             build_script: build.sh

.travis.yml

@@ -26,24 +26,24 @@ matrix:
         - BUILD_NAME=s390x
         - DETAILS=""
 
-    - os: linux
-      arch: arm64-graviton2
-      virt: lxd
-      group: edge
-      compiler: gcc
-      language: cpp
-      sudo: false
-      dist: jammy
-      cache:
-        apt: true
-        directories:
-          - $HOME/.ccache
-      apt:
-        packages:
-          - ccache
-      env:
-        - BUILD_NAME=graviton2
-        - DETAILS=
+    #- os: linux
+    #  arch: arm64-graviton2
+    #  virt: lxd
+    #  group: edge
+    #  compiler: gcc
+    #  language: cpp
+    #  sudo: false
+    #  dist: jammy
+    #  cache:
+    #    apt: true
+    #    directories:
+    #      - $HOME/.ccache
+    #  apt:
+    #    packages:
+    #      - ccache
+    #  env:
+    #    - BUILD_NAME=graviton2
+    #    - DETAILS=
 
 before_install:
   - if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(.rst)$'; then travis_terminate 0; fi

MIGRATION_GUIDE.TXT

@@ -1,3 +1,20 @@
+MIGRATION GUIDE FROM GDAL 3.9 to GDAL 3.10
+------------------------------------------
+
+- User code using VSIFEofL() to potentially to end read loops should also test
+  the return code of the new VSIFError() function. Some virtual file systems
+  that used to report errors through VSIFEofL() now do through VSIFError().
+
+- Out-of-tree implementations of VSIVirtualHandle():
+  2 new required virtual methods must be implemented: int Error(), and
+  void ClearErr() following POSIX semantics of ferror() and clearerr().
+  This is to distinguish Read() that returns less bytes than requested because
+  of an error (Error() != 0) or because of end-of-file (Eof() != 0)
+
+  The VSIFilesystemPluginCallbacksStruct structure is extended with 2
+  corresponding optional (but recommended to be implemented to reliably detect
+  reading errors) callbacks "error" and "clear_err".
+
 MIGRATION GUIDE FROM GDAL 3.8 to GDAL 3.9
 -----------------------------------------
 

alg/gdal_rpc.cpp

@@ -659,12 +659,12 @@ void *GDALCreateRPCTransformerV1(GDALRPCInfoV1 *psRPCInfo, int bReversed,
  * Create an RPC based transformer.
  *
  * The geometric sensor model describing the physical relationship between
- * image coordinates and ground coordinate is known as a Rigorous Projection
+ * image coordinates and ground coordinates is known as a Rigorous Projection
  * Model. A Rigorous Projection Model expresses the mapping of the image space
  * coordinates of rows and columns (r,c) onto the object space reference
  * surface geodetic coordinates (long, lat, height).
  *
- * RPC supports a generic description of the Rigorous Projection Models. The
+ * A RPC supports a generic description of the Rigorous Projection Models. The
  * approximation used by GDAL (RPC00) is a set of rational polynomials
  * expressing the normalized row and column values, (rn , cn), as a function of
  * normalized geodetic latitude, longitude, and height, (P, L, H), given a
@@ -675,7 +675,7 @@ void *GDALCreateRPCTransformerV1(GDALRPCInfoV1 *psRPCInfo, int bReversed,
  * normalized row and column values (rn, cn), and between the geodetic
  * latitude, longitude, and height and normalized geodetic latitude,
  * longitude, and height (P, L, H), is defined by a set of normalizing
- * translations (offsets) and scales that ensure all values are contained i
+ * translations (offsets) and scales that ensure all values are contained in
  * the range -1 to +1.
  *
  * This function creates a GDALTransformFunc compatible transformer

alg/gdalsimplewarp.cpp

@@ -211,6 +211,8 @@ static void GDALSimpleWarpRemapping(int nBandCount, GByte **papabySrcData,
  * Distinct values may be listed for each band separated by columns.
  * </ul>
  *
+ * For more advanced warping capabilities, consider using GDALWarp().
+ *
  * @param hSrcDS the source image dataset.
  * @param hDstDS the destination image dataset.
  * @param nBandCount the number of bands to be warped.  If zero, all bands
@@ -225,6 +227,7 @@ static void GDALSimpleWarpRemapping(int nBandCount, GByte **papabySrcData,
  * @param papszWarpOptions additional options controlling the warp.
  *
  * @return TRUE if the operation completes, or FALSE if an error occurs.
+ * @see GDALWarp()
  */
 
 int CPL_STDCALL GDALSimpleImageWarp(GDALDatasetH hSrcDS, GDALDatasetH hDstDS,

alg/gdalwarper.cpp

@@ -66,11 +66,12 @@
  * implement the reprojection, and will default a variety of other
  * warp options.
  *
+ * Nodata values set on destination dataset are taken into account.
+ *
  * No metadata, projection info, or color tables are transferred
- * to the output file.
+ * to the output file. Source overviews are not considered.
  *
- * Starting with GDAL 2.0, nodata values set on destination dataset are taken
- * into account.
+ * For more advanced warping capabilities, consider using GDALWarp().
  *
  * @param hSrcDS the source image file.
  * @param pszSrcWKT the source projection.  If NULL the source projection
@@ -91,6 +92,7 @@
  * @param psOptions warp options, normally NULL.
  *
  * @return CE_None on success or CE_Failure if something goes wrong.
+ * @see GDALWarp()
  */
 
 CPLErr CPL_STDCALL GDALReprojectImage(

apps/argparse/argparse.hpp

@@ -1011,7 +1011,8 @@ class Argument {
             std::bind(is_optional, std::placeholders::_1, m_prefix_chars));
         dist = static_cast<std::size_t>(std::distance(start, end));
         if (dist < num_args_min) {
-          throw std::runtime_error("Too few arguments");
+          throw std::runtime_error("Too few arguments for '" +
+                                   std::string(m_used_name) + "'.");
         }
       }
 

autotest/cpp/test_ogr.cpp

@@ -3961,4 +3961,90 @@ TEST_F(test_ogr, OGRFeature_SerializeToBinary)
     }
 }
 
+// Test OGRGeometry::IsRectangle()
+TEST_F(test_ogr, OGRGeometry_IsRectangle)
+{
+    // Not a polygon
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("POINT EMPTY", nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->IsRectangle());
+        delete poGeom;
+    }
+    // Polygon empty
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("POLYGON EMPTY", nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->IsRectangle());
+        delete poGeom;
+    }
+    // Polygon with inner ring
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt(
+            "POLYGON ((0 0,0 1,1 1,1 0,0 0),(0.2 0.2,0.2 0.8,0.8 0.8,0.8 "
+            "0.2,0.2 0.2))",
+            nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->IsRectangle());
+        delete poGeom;
+    }
+    // Polygon with 3 points
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("POLYGON ((0 0,0 1,1 1))", nullptr,
+                                          &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->IsRectangle());
+        delete poGeom;
+    }
+    // Polygon with 6 points
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt(
+            "POLYGON ((0 0,0.1 0,0.2 0,0.3 0,1 1,0 0))", nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->IsRectangle());
+        delete poGeom;
+    }
+    // Polygon with 5 points, but last one not matching first (invalid)
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt(
+            "POLYGON ((0 0,0 1,1 1,1 0,-999 -999))", nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->IsRectangle());
+        delete poGeom;
+    }
+    // Polygon with 5 points, but not rectangle
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("POLYGON ((0 0,0 1.1,1 1,1 0,0 0))",
+                                          nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_FALSE(poGeom->IsRectangle());
+        delete poGeom;
+    }
+    // Rectangle (type 1)
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("POLYGON ((0 0,0 1,1 1,1 0,0 0))",
+                                          nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_TRUE(poGeom->IsRectangle());
+        delete poGeom;
+    }
+    // Rectangle2(type 1)
+    {
+        OGRGeometry *poGeom = nullptr;
+        OGRGeometryFactory::createFromWkt("POLYGON ((0 0,1 0,1 1,0 1,0 0))",
+                                          nullptr, &poGeom);
+        ASSERT_NE(poGeom, nullptr);
+        EXPECT_TRUE(poGeom->IsRectangle());
+        delete poGeom;
+    }
+}
+
 }  // namespace

autotest/gcore/basic_test.py

@@ -331,6 +331,22 @@ def test_basic_test_11():
         with pytest.raises(Exception):
             gdal.OpenEx("non existing")
 
+    try:
+        with gdal.ExceptionMgr(useExceptions=True):
+            try:
+                gdal.OpenEx("non existing")
+            except Exception:
+                pass
+    except Exception:
+        pytest.fails("Exception thrown whereas it should not have")
+
+    with gdal.ExceptionMgr(useExceptions=True):
+        try:
+            gdal.OpenEx("non existing")
+        except Exception:
+            pass
+        gdal.Open("data/byte.tif")
+
 
 ###############################################################################
 # Test GDAL layer API

autotest/gcore/mask.py

@@ -996,7 +996,10 @@ def test_mask_27():
 
 
 @pytest.mark.parametrize("dt", [gdal.GDT_Byte, gdal.GDT_Int64, gdal.GDT_UInt64])
-def test_mask_setting_nodata(dt):
+@pytest.mark.parametrize(
+    "GDAL_SIMUL_MEM_ALLOC_FAILURE_NODATA_MASK_BAND", [None, "YES", "ALWAYS"]
+)
+def test_mask_setting_nodata(dt, GDAL_SIMUL_MEM_ALLOC_FAILURE_NODATA_MASK_BAND):
     def set_nodata_value(ds, val):
         if dt == gdal.GDT_Byte:
             ds.GetRasterBand(1).SetNoDataValue(val)
@@ -1005,15 +1008,41 @@ def set_nodata_value(ds, val):
         else:
             ds.GetRasterBand(1).SetNoDataValueAsUInt64(val)
 
-    ds = gdal.GetDriverByName("MEM").Create("", 1, 1, 1, dt)
-    assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 255)
-    assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 255)
-    set_nodata_value(ds, 0)
-    assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 0)
-    assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 0)
-    set_nodata_value(ds, 1)
-    assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 255)
-    set_nodata_value(ds, 0)
-    assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 0)
-    ds.GetRasterBand(1).DeleteNoDataValue()
-    assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 255)
+    def test():
+        ds = gdal.GetDriverByName("MEM").Create("__debug__", 1, 1, 1, dt)
+        assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 255)
+        assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 255)
+        set_nodata_value(ds, 0)
+        got = ds.GetRasterBand(1).GetMaskBand().ReadRaster()
+        if (
+            GDAL_SIMUL_MEM_ALLOC_FAILURE_NODATA_MASK_BAND == "ALWAYS"
+            and dt != gdal.GDT_Byte
+        ):
+            assert got is None
+            assert gdal.GetLastErrorType() == gdal.CE_Failure
+        else:
+            if (
+                GDAL_SIMUL_MEM_ALLOC_FAILURE_NODATA_MASK_BAND == "YES"
+                and dt != gdal.GDT_Byte
+            ):
+                assert gdal.GetLastErrorType() == gdal.CE_Warning
+            assert got == struct.pack("B", 0)
+            assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 0)
+            set_nodata_value(ds, 1)
+            assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack(
+                "B", 255
+            )
+            set_nodata_value(ds, 0)
+            assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 0)
+
+        ds.GetRasterBand(1).DeleteNoDataValue()
+        assert ds.GetRasterBand(1).GetMaskBand().ReadRaster() == struct.pack("B", 255)
+
+    if GDAL_SIMUL_MEM_ALLOC_FAILURE_NODATA_MASK_BAND:
+        with gdal.quiet_errors(), gdal.config_option(
+            "GDAL_SIMUL_MEM_ALLOC_FAILURE_NODATA_MASK_BAND",
+            GDAL_SIMUL_MEM_ALLOC_FAILURE_NODATA_MASK_BAND,
+        ):
+            test()
+    else:
+        test()

autotest/gcore/vsiadls.py

@@ -56,7 +56,19 @@ def open_for_read(uri):
 @pytest.fixture(autouse=True, scope="module")
 def startup_and_cleanup():
 
-    with gdaltest.config_option("CPL_AZURE_VM_API_ROOT_URL", "disabled"):
+    with gdaltest.config_options(
+        {
+            "AZURE_STORAGE_CONNECTION_STRING": None,
+            "AZURE_STORAGE_ACCOUNT": None,
+            "AZURE_STORAGE_ACCESS_KEY": None,
+            "AZURE_STORAGE_SAS_TOKEN": None,
+            "AZURE_NO_SIGN_REQUEST": None,
+            "AZURE_CONFIG_DIR": "",
+            "AZURE_STORAGE_ACCESS_TOKEN": "",
+            "AZURE_FEDERATED_TOKEN_FILE": "",
+            "CPL_AZURE_VM_API_ROOT_URL": "disabled",
+        }
+    ):
         assert gdal.GetSignedURL("/vsiadls/foo/bar") is None
 
     gdaltest.webserver_process = None