From 00551b2caacdc6f4987889394379cd42a353cce2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 15 Jul 2024 15:26:28 +0200
Subject: [PATCH 01/94] OGR SQL: do not make backslash a special character
 inside single-quoted strings, to improve compliance wih SQL92

The backslash followed by single-quote sequence was dealt as a way of
escaping the single-quote character, but this also prevented to use
backslash at the end of a single-quoted literal. So no longer make
backslash a special character inside single-quoted strings

Fixes #10416
---
 autotest/ogr/ogr_sql_test.py |  4 ++--
 ogr/swq.cpp                  | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index a3041c326e81..e9c187219bed 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -1206,11 +1206,11 @@ def test_ogr_sql_42(data_ds):
 
 def test_ogr_sql_43(data_ds):
 
-    sql = "SELECT '\"' as a, '\\'' as b, '''' as c FROM poly"
+    sql = "SELECT '\"' as a, '\\' as b, '''' as c FROM poly"
     with data_ds.ExecuteSQL(sql) as sql_lyr:
         feat = sql_lyr.GetNextFeature()
         assert feat["a"] == '"'
-        assert feat["b"] == "'"
+        assert feat["b"] == "\\"
         assert feat["c"] == "'"
 
 
diff --git a/ogr/swq.cpp b/ogr/swq.cpp
index 38d983d42489..01c78b3ce0f1 100644
--- a/ogr/swq.cpp
+++ b/ogr/swq.cpp
@@ -118,11 +118,14 @@ int swqlex(YYSTYPE *ppNode, swq_parse_context *context)
 
         while (*pszInput != '\0')
         {
-            if (chQuote == '"' && *pszInput == '\\' && pszInput[1] == '"')
-                pszInput++;
-            else if (chQuote == '\'' && *pszInput == '\\' &&
-                     pszInput[1] == '\'')
+            // Not totally sure we need to preserve this way of escaping for
+            // strings between double-quotes
+            if (chQuote == '"' && *pszInput == '\\')
+            {
                 pszInput++;
+                if (*pszInput == '\0')
+                    break;
+            }
             else if (chQuote == '\'' && *pszInput == '\'' &&
                      pszInput[1] == '\'')
                 pszInput++;

From ab0993402464d9d5af373d3e814c3c506ba49388 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 18 Jul 2024 18:59:55 +0200
Subject: [PATCH 02/94] NITF 12-bit JPEG writer: fix potential crash if raster
 width > block width

Fixes #10441
---
 autotest/gdrivers/nitf.py    | 26 ++++++++++++++++++++++++++
 frmts/nitf/nitfwritejpeg.cpp | 32 ++++++++++++++++++++++++--------
 2 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index a24070cbdc97..5c98b3e73fcd 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -1744,6 +1744,32 @@ def test_nitf_42(not_jpeg_9b):
     ds = None
 
 
+###############################################################################
+# Check creating a 12-bit JPEG compressed NITF
+
+
+def test_nitf_write_jpeg12(not_jpeg_9b, tmp_path):
+    # Check if JPEG driver supports 12bit JPEG reading/writing
+    jpg_drv = gdal.GetDriverByName("JPEG")
+    md = jpg_drv.GetMetadata()
+    if md[gdal.DMD_CREATIONDATATYPES].find("UInt16") == -1:
+        pytest.skip("12bit jpeg not available")
+
+    ds = gdal.GetDriverByName("MEM").Create("", 10000, 1, 3, gdal.GDT_UInt16)
+    ds.GetRasterBand(1).Fill(4096)
+    ds.GetRasterBand(2).Fill(0)
+    ds.GetRasterBand(3).Fill(4096)
+    out_filename = str(tmp_path / "out.ntf")
+    with gdal.quiet_errors():
+        gdal.GetDriverByName("NITF").CreateCopy(out_filename, ds, options=["IC=C3"])
+
+    ds = gdal.Open(out_filename)
+    assert ds.GetRasterBand(1).DataType == gdal.GDT_UInt16
+    assert [
+        ds.GetRasterBand(i + 1).GetStatistics(0, 1)[2] for i in range(3)
+    ] == pytest.approx([4095, 0, 4095], abs=1)
+
+
 ###############################################################################
 # Test CreateCopy() in IC=C8 with various JPEG2000 drivers
 
diff --git a/frmts/nitf/nitfwritejpeg.cpp b/frmts/nitf/nitfwritejpeg.cpp
index ab4053a4edb0..1b418ad32f1b 100644
--- a/frmts/nitf/nitfwritejpeg.cpp
+++ b/frmts/nitf/nitfwritejpeg.cpp
@@ -218,7 +218,7 @@ int NITFWriteJPEGBlock(GDALDataset *poSrcDS, VSILFILE *fp, int nBlockXOff,
     const int nXSize = poSrcDS->GetRasterXSize();
     const int nYSize = poSrcDS->GetRasterYSize();
 
-    const double nTotalPixels = static_cast<double>(nXSize * nYSize);
+    const double nTotalPixels = static_cast<double>(nXSize) * nYSize;
 
     int nBlockXSizeToRead = nBlockXSize;
     if (nBlockXSize * nBlockXOff + nBlockXSize > nXSize)
@@ -248,22 +248,38 @@ int NITFWriteJPEGBlock(GDALDataset *poSrcDS, VSILFILE *fp, int nBlockXOff,
                 static_cast<GSpacing>(nBands) * nWorkDTSize * nBlockXSize,
                 nWorkDTSize, nullptr);
 
-#if !defined(JPEG_LIB_MK1_OR_12BIT)
             /* Repeat the last pixel till the end of the line */
             /* to minimize discontinuity */
             if (nBlockXSizeToRead < nBlockXSize)
             {
                 for (int iBand = 0; iBand < nBands; iBand++)
                 {
-                    GByte bVal =
-                        pabyScanline[nBands * (nBlockXSizeToRead - 1) + iBand];
-                    for (int iX = nBlockXSizeToRead; iX < nBlockXSize; iX++)
+#if defined(JPEG_LIB_MK1_OR_12BIT)
+                    if (eWorkDT == GDT_UInt16)
                     {
-                        pabyScanline[nBands * iX + iBand] = bVal;
+                        GUInt16 *panScanline =
+                            reinterpret_cast<GUInt16 *>(pabyScanline);
+                        const GUInt16 nVal =
+                            panScanline[nBands * (nBlockXSizeToRead - 1) +
+                                        iBand];
+                        for (int iX = nBlockXSizeToRead; iX < nBlockXSize; iX++)
+                        {
+                            panScanline[nBands * iX + iBand] = nVal;
+                        }
+                    }
+                    else
+#endif
+                    {
+                        GByte bVal =
+                            pabyScanline[nBands * (nBlockXSizeToRead - 1) +
+                                         iBand];
+                        for (int iX = nBlockXSizeToRead; iX < nBlockXSize; iX++)
+                        {
+                            pabyScanline[nBands * iX + iBand] = bVal;
+                        }
                     }
                 }
             }
-#endif
         }
 
 #if defined(JPEG_LIB_MK1_OR_12BIT)
@@ -272,7 +288,7 @@ int NITFWriteJPEGBlock(GDALDataset *poSrcDS, VSILFILE *fp, int nBlockXOff,
         {
             GUInt16 *panScanline = reinterpret_cast<GUInt16 *>(pabyScanline);
 
-            for (int iPixel = 0; iPixel < nXSize * nBands; iPixel++)
+            for (int iPixel = 0; iPixel < nBlockXSize * nBands; iPixel++)
             {
                 if (panScanline[iPixel] > 4095)
                 {

From 9f162425322942801891e84602ed15622f2e5dd3 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 18 Jul 2024 21:20:17 +0200
Subject: [PATCH 03/94] Doc: API: mention header file to include

Fixes #10431
---
 doc/source/api/gdalattribute_cpp.rst        | 5 +++++
 doc/source/api/gdaldataset_cpp.rst          | 8 ++++++++
 doc/source/api/gdaldimension_cpp.rst        | 8 ++++++++
 doc/source/api/gdaldriver_cpp.rst           | 5 +++++
 doc/source/api/gdalextendeddatatype_cpp.rst | 5 +++++
 doc/source/api/gdalgroup_cpp.rst            | 8 ++++++++
 doc/source/api/gdalmdarray_cpp.rst          | 8 ++++++++
 doc/source/api/gdalrasterband_cpp.rst       | 8 ++++++++
 doc/source/api/gdalwarp_cpp.rst             | 8 ++++++++
 doc/source/api/gnm_cpp.rst                  | 8 ++++++++
 doc/source/api/ogrfeature_cpp.rst           | 5 +++++
 doc/source/api/ogrfeaturestyle_cpp.rst      | 8 ++++++++
 doc/source/api/ogrgeometry_cpp.rst          | 5 ++++-
 doc/source/api/ogrlayer_cpp.rst             | 8 ++++++++
 doc/source/api/ogrspatialref.rst            | 8 ++++++++
 15 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/doc/source/api/gdalattribute_cpp.rst b/doc/source/api/gdalattribute_cpp.rst
index cfd95ebd601f..bcf8d58f0f31 100644
--- a/doc/source/api/gdalattribute_cpp.rst
+++ b/doc/source/api/gdalattribute_cpp.rst
@@ -9,6 +9,11 @@
 GDALAttribute C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
 GDALAttribute class
 -------------------
 
diff --git a/doc/source/api/gdaldataset_cpp.rst b/doc/source/api/gdaldataset_cpp.rst
index 5f9938a0d0d8..a47ecfe3f74a 100644
--- a/doc/source/api/gdaldataset_cpp.rst
+++ b/doc/source/api/gdaldataset_cpp.rst
@@ -9,6 +9,14 @@
 GDALDataset C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALDataset class
+-----------------
+
 .. doxygenclass:: GDALDataset
    :project: api
    :members:
diff --git a/doc/source/api/gdaldimension_cpp.rst b/doc/source/api/gdaldimension_cpp.rst
index 2a32768d9ea6..e6dbb1d89980 100644
--- a/doc/source/api/gdaldimension_cpp.rst
+++ b/doc/source/api/gdaldimension_cpp.rst
@@ -9,6 +9,14 @@
 GDALDimension C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALDimension class
+-------------------
+
 .. doxygenclass:: GDALDimension
    :project: api
    :members:
diff --git a/doc/source/api/gdaldriver_cpp.rst b/doc/source/api/gdaldriver_cpp.rst
index d9dfcf145e57..2081ec3a03bf 100644
--- a/doc/source/api/gdaldriver_cpp.rst
+++ b/doc/source/api/gdaldriver_cpp.rst
@@ -9,6 +9,11 @@
 GDALDriver C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
 GDALDriver class
 ----------------
 
diff --git a/doc/source/api/gdalextendeddatatype_cpp.rst b/doc/source/api/gdalextendeddatatype_cpp.rst
index 40123ddfedcb..b1755cce378f 100644
--- a/doc/source/api/gdalextendeddatatype_cpp.rst
+++ b/doc/source/api/gdalextendeddatatype_cpp.rst
@@ -9,6 +9,11 @@
 GDALExtendedDataType C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
 GDALExtendedDataType class
 --------------------------
 
diff --git a/doc/source/api/gdalgroup_cpp.rst b/doc/source/api/gdalgroup_cpp.rst
index 0436b92046e5..cfd1b2324404 100644
--- a/doc/source/api/gdalgroup_cpp.rst
+++ b/doc/source/api/gdalgroup_cpp.rst
@@ -9,6 +9,14 @@
 GDALGroup C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALGroup class
+---------------
+
 .. doxygenclass:: GDALGroup
    :project: api
    :members:
diff --git a/doc/source/api/gdalmdarray_cpp.rst b/doc/source/api/gdalmdarray_cpp.rst
index b77169a98d0a..2d811ba6d79f 100644
--- a/doc/source/api/gdalmdarray_cpp.rst
+++ b/doc/source/api/gdalmdarray_cpp.rst
@@ -9,6 +9,14 @@
 GDALMDArray C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALMDArray class
+-----------------
+
 .. doxygenclass:: GDALMDArray
    :project: api
    :members:
diff --git a/doc/source/api/gdalrasterband_cpp.rst b/doc/source/api/gdalrasterband_cpp.rst
index b5c1146fbb90..9dd6204aa516 100644
--- a/doc/source/api/gdalrasterband_cpp.rst
+++ b/doc/source/api/gdalrasterband_cpp.rst
@@ -9,6 +9,14 @@
 GDALRasterBand C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdal_priv.h`
+
+GDALRasterBand class
+--------------------
+
 .. doxygenclass:: GDALRasterBand
    :project: api
    :members:
diff --git a/doc/source/api/gdalwarp_cpp.rst b/doc/source/api/gdalwarp_cpp.rst
index 47b57394a7d3..8d19a8d044ee 100644
--- a/doc/source/api/gdalwarp_cpp.rst
+++ b/doc/source/api/gdalwarp_cpp.rst
@@ -9,5 +9,13 @@
 Warper C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gdalwarper.h`
+
+Warper C++ API
+--------------
+
 .. doxygenfile:: gdalwarper.h
    :project: api
diff --git a/doc/source/api/gnm_cpp.rst b/doc/source/api/gnm_cpp.rst
index ac05bffca4fb..ac11caf60ad3 100644
--- a/doc/source/api/gnm_cpp.rst
+++ b/doc/source/api/gnm_cpp.rst
@@ -9,5 +9,13 @@
 Geographic Network C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`gnm.h`
+
+Geographic Network C++ API
+--------------------------
+
 .. doxygenfile:: gnm.h
    :project: api
diff --git a/doc/source/api/ogrfeature_cpp.rst b/doc/source/api/ogrfeature_cpp.rst
index 9d1833db43a4..22fd1e8a0506 100644
--- a/doc/source/api/ogrfeature_cpp.rst
+++ b/doc/source/api/ogrfeature_cpp.rst
@@ -9,6 +9,11 @@
 OGRFeature C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`ogr_feature.h`
+
 OGRFeature class
 ----------------
 
diff --git a/doc/source/api/ogrfeaturestyle_cpp.rst b/doc/source/api/ogrfeaturestyle_cpp.rst
index 825adc0da519..2e330ac7da62 100644
--- a/doc/source/api/ogrfeaturestyle_cpp.rst
+++ b/doc/source/api/ogrfeaturestyle_cpp.rst
@@ -9,5 +9,13 @@
 OGRFeature Style C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`ogr_featurestyle.h`
+
+OGRFeature Style C++ API
+------------------------
+
 .. doxygenfile:: ogr_featurestyle.h
    :project: api
diff --git a/doc/source/api/ogrgeometry_cpp.rst b/doc/source/api/ogrgeometry_cpp.rst
index 340880b7e6ce..c09c35bd7bbe 100644
--- a/doc/source/api/ogrgeometry_cpp.rst
+++ b/doc/source/api/ogrgeometry_cpp.rst
@@ -9,7 +9,10 @@
 OGRGeometry C++ API
 ================================================================================
 
-Include file: ogr_geometry.h
+Include file
+------------
+
+:file:`ogr_geometry.h`
 
 OGRGeometryFactory class
 ------------------------
diff --git a/doc/source/api/ogrlayer_cpp.rst b/doc/source/api/ogrlayer_cpp.rst
index c3d3422b8d6d..951d1b8b4440 100644
--- a/doc/source/api/ogrlayer_cpp.rst
+++ b/doc/source/api/ogrlayer_cpp.rst
@@ -9,6 +9,14 @@
 OGRLayer C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`ogrsf_frmts.h`
+
+OGRLayer class
+--------------
+
 .. doxygenclass:: OGRLayer
    :project: api
    :members:
diff --git a/doc/source/api/ogrspatialref.rst b/doc/source/api/ogrspatialref.rst
index 31cb013e8b30..56b9c7ecf287 100644
--- a/doc/source/api/ogrspatialref.rst
+++ b/doc/source/api/ogrspatialref.rst
@@ -9,5 +9,13 @@
 Spatial Reference System C++ API
 ================================================================================
 
+Include file
+------------
+
+:file:`ogr_spatialref.h`
+
+Spatial Reference System C++ API
+--------------------------------
+
 .. doxygenfile:: ogr_spatialref.h
    :project: api

From 3a99d23631088d623ed9c3d24eca70135c1a0200 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 18 Jul 2024 23:52:30 +0200
Subject: [PATCH 04/94] netCDF multidim: add OpenMDArray() options to set up
 nc_set_var_chunk_cache()

---
 autotest/gdrivers/netcdf_multidim.py | 24 ++++++++++
 doc/source/drivers/raster/netcdf.rst | 22 +++++++++
 frmts/netcdf/netcdfdataset.h         |  6 +--
 frmts/netcdf/netcdfdrivercore.cpp    | 11 +++++
 frmts/netcdf/netcdfmultidim.cpp      | 70 +++++++++++++++++++++++++++-
 5 files changed, 128 insertions(+), 5 deletions(-)

diff --git a/autotest/gdrivers/netcdf_multidim.py b/autotest/gdrivers/netcdf_multidim.py
index bc9ea089c208..c9492f866f06 100755
--- a/autotest/gdrivers/netcdf_multidim.py
+++ b/autotest/gdrivers/netcdf_multidim.py
@@ -4084,3 +4084,27 @@ def test2():
 
     test()
     test2()
+
+
+###############################################################################
+
+
+def test_netcdf_multidim_chunk_cache_options():
+
+    ds = gdal.OpenEx("data/netcdf/nc4_vars.nc", gdal.OF_MULTIDIM_RASTER)
+    rg = ds.GetRootGroup()
+
+    var = rg.OpenMDArray(
+        "Band1",
+        [
+            "RAW_DATA_CHUNK_CACHE_SIZE=2000000",
+            "CHUNK_SLOTS=1000",
+            "PREEMPTION=0.9",
+            "INCLUDE_CHUNK_CACHE_PARAMETERS_IN_STRUCTURAL_INFO=YES",
+        ],
+    )
+    assert var.GetStructuralInfo() == {
+        "RAW_DATA_CHUNK_CACHE_SIZE": "2000000",
+        "CHUNK_SLOTS": "1000",
+        "PREEMPTION": "0.900000",
+    }
diff --git a/doc/source/drivers/raster/netcdf.rst b/doc/source/drivers/raster/netcdf.rst
index df960742a559..9769eebf66bc 100644
--- a/doc/source/drivers/raster/netcdf.rst
+++ b/doc/source/drivers/raster/netcdf.rst
@@ -700,6 +700,28 @@ The :cpp:func:`GDALGroup::OpenMDArray` method supports the following options:
   fill value will be used as nodata when there is no _FillValue or missing_value
   attribute (except on variables of type Byte, UByte, Char)
 
+- RAW_DATA_CHUNK_CACHE_SIZE=<integer>. (GDAL >= 3.10, advanced libnetcdf parameter)
+  The total size of the libnetcdf raw data chunk cache, in bytes. Default value
+  (at least for some versions of libnetcdf) is 1 MB. Only for netCDF4/HDF5 files.
+
+- CHUNK_SLOTS=<integer>. (GDAL >= 3.10, advanced libnetcdf parameter)
+  The total size of the libnetcdf raw data chunk cache, in bytes.
+  Default value (at least for some versions of libnetcdf) is 521.
+  Only for netCDF4/HDF5 files.
+
+- PREEMPTION=<float> between 0 and 1. (GDAL >= 3.10, advanced libnetcdf parameter)
+  Indicates how much chunks from libnetcdf chunk cache that have been fully read
+  are favored for preemption.
+  A value of zero means fully read chunks are treated no differently than other
+  chunks (the preemption is strictly least-recently used) while a value of one
+  means fully read chunks are always preempted before other chunks.
+  Default value (at least for some versions of libnetcdf) is 0.75.
+  Only for netCDF4/HDF5 files.
+
+For RAW_DATA_CHUNK_CACHE_SIZE, CHUNK_SLOTS and PREEMPTION, consult
+`nc_set_var_chunk_cache <https://docs.unidata.ucar.edu/netcdf-c/current/group__variables.html#ga2788cbfc6880ec70c304292af2bc7546>`__ and
+`documentation about netCDF chunk cacke <https://docs.unidata.ucar.edu/nug/current/netcdf_perf_chunking.html>`__
+
 The :cpp:func:`GDALGroup::CreateMDArray` method supports the following options:
 
 - NC_TYPE=NC_CHAR/NC_BYTE/NC_INT64/NC_UINT64: to overload the netCDF data type
diff --git a/frmts/netcdf/netcdfdataset.h b/frmts/netcdf/netcdfdataset.h
index 8f14bf4b882c..674cdd58d639 100644
--- a/frmts/netcdf/netcdfdataset.h
+++ b/frmts/netcdf/netcdfdataset.h
@@ -144,9 +144,9 @@ static const int NCDF_DEFLATE_LEVEL = 1; /* best time/size ratio */
         if (NCDF_ERR_status_ != NC_NOERR)                                      \
         {                                                                      \
             CPLError(CE_Failure, CPLE_AppDefined,                              \
-                     "netcdf error #%d : %s .\nat (%s,%s,%d)\n", status,       \
-                     nc_strerror(NCDF_ERR_status_), __FILE__, __FUNCTION__,    \
-                     __LINE__);                                                \
+                     "netcdf error #%d : %s .\nat (%s,%s,%d)\n",               \
+                     NCDF_ERR_status_, nc_strerror(NCDF_ERR_status_),          \
+                     __FILE__, __FUNCTION__, __LINE__);                        \
         }                                                                      \
     } while (0)
 
diff --git a/frmts/netcdf/netcdfdrivercore.cpp b/frmts/netcdf/netcdfdrivercore.cpp
index 84c273922364..507ae89b78d0 100644
--- a/frmts/netcdf/netcdfdrivercore.cpp
+++ b/frmts/netcdf/netcdfdrivercore.cpp
@@ -555,6 +555,17 @@ void netCDFDriverSetCommonMetadata(GDALDriver *poDriver)
         "   <Option name='USE_DEFAULT_FILL_AS_NODATA' type='boolean' "
         "description='Whether the default fill value should be used as nodata "
         "when there is no _FillValue or missing_value attribute' default='NO'/>"
+        "   <Option name='RAW_DATA_CHUNK_CACHE_SIZE' type='integer' "
+        "description='The total size of the libnetcdf raw data chunk cache, "
+        "in bytes. Only for netCDF4/HDF5 files'/>"
+        "   <Option name='CHUNK_SLOTS' type='integer' "
+        "description='The number of chunk slots in the libnetcdf raw data "
+        "chunk cache. "
+        "Only for netCDF4/HDF5 files'/>"
+        "   <Option name='PREEMPTION' type='float' min='0' max='1' "
+        "description='Indicates how much chunks from libnetcdf chunk cache "
+        "that have been fully read are favored for preemption. "
+        "Only for netCDF4/HDF5 files'/>"
         "</MultiDimArrayOpenOptionList>");
 
     poDriver->SetMetadataItem(GDAL_DMD_MULTIDIM_ATTRIBUTE_CREATIONOPTIONLIST,
diff --git a/frmts/netcdf/netcdfmultidim.cpp b/frmts/netcdf/netcdfmultidim.cpp
index d05d1d1bc948..304928c5236c 100644
--- a/frmts/netcdf/netcdfmultidim.cpp
+++ b/frmts/netcdf/netcdfmultidim.cpp
@@ -26,6 +26,7 @@
  ****************************************************************************/
 
 #include <algorithm>
+#include <cinttypes>
 #include <limits>
 #include <map>
 
@@ -1530,10 +1531,11 @@ netCDFGroup::OpenMDArray(const std::string &osName,
     int nVarId = 0;
     if (nc_inq_varid(m_gid, osName.c_str(), &nVarId) != NC_NOERR)
         return nullptr;
+
     auto poVar = netCDFVariable::Create(
         m_poShared, std::dynamic_pointer_cast<netCDFGroup>(m_pSelf.lock()),
-        m_gid, nVarId, std::vector<std::shared_ptr<GDALDimension>>(), nullptr,
-        false);
+        m_gid, nVarId, std::vector<std::shared_ptr<GDALDimension>>(),
+        papszOptions, false);
     if (poVar)
     {
         poVar->SetUseDefaultFillAsNoData(CPLTestBool(CSLFetchNameValueDef(
@@ -2081,6 +2083,49 @@ netCDFVariable::netCDFVariable(
                      poShared->GetPAM()),
       m_poShared(poShared), m_gid(gid), m_varid(varid), m_dims(dims)
 {
+    {
+        // Cf https://docs.unidata.ucar.edu/netcdf-c/current/group__variables.html#gae6b59e92d1140b5fec56481b0f41b610
+        size_t nRawDataChunkCacheSize = 0;
+        size_t nChunkSlots = 0;
+        float fPreemption = 0.0f;
+        int ret =
+            nc_get_var_chunk_cache(m_gid, m_varid, &nRawDataChunkCacheSize,
+                                   &nChunkSlots, &fPreemption);
+        if (ret == NC_NOERR)
+        {
+            if (const char *pszVar = CSLFetchNameValue(
+                    papszOptions, "RAW_DATA_CHUNK_CACHE_SIZE"))
+            {
+                nRawDataChunkCacheSize =
+                    static_cast<size_t>(std::min<unsigned long long>(
+                        std::strtoull(pszVar, nullptr, 10),
+                        std::numeric_limits<size_t>::max()));
+            }
+            if (const char *pszVar =
+                    CSLFetchNameValue(papszOptions, "CHUNK_SLOTS"))
+            {
+                nChunkSlots = static_cast<size_t>(std::min<unsigned long long>(
+                    std::strtoull(pszVar, nullptr, 10),
+                    std::numeric_limits<size_t>::max()));
+            }
+            if (const char *pszVar =
+                    CSLFetchNameValue(papszOptions, "PREEMPTION"))
+            {
+                fPreemption = std::max(
+                    0.0f, std::min(1.0f, static_cast<float>(CPLAtof(pszVar))));
+            }
+            NCDF_ERR(nc_set_var_chunk_cache(m_gid, m_varid,
+                                            nRawDataChunkCacheSize, nChunkSlots,
+                                            fPreemption));
+        }
+        else if (ret != NC_ENOTNC4)
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "netcdf error #%d : %s .\nat (%s,%s,%d)\n", ret,
+                     nc_strerror(ret), __FILE__, __FUNCTION__, __LINE__);
+        }
+    }
+
     NCDF_ERR(nc_inq_varndims(m_gid, m_varid, &m_nDims));
     NCDF_ERR(nc_inq_vartype(m_gid, m_varid, &m_nVarType));
     if (m_nDims == 2 && m_nVarType == NC_CHAR)
@@ -2119,6 +2164,27 @@ netCDFVariable::netCDFVariable(
     }
     m_bWriteGDALTags = CPLTestBool(
         CSLFetchNameValueDef(papszOptions, "WRITE_GDAL_TAGS", "YES"));
+
+    // Non-documented option. Only used for test purposes.
+    if (CPLTestBool(CSLFetchNameValueDef(
+            papszOptions, "INCLUDE_CHUNK_CACHE_PARAMETERS_IN_STRUCTURAL_INFO",
+            "NO")))
+    {
+        size_t nRawDataChunkCacheSize = 0;
+        size_t nChunkSlots = 0;
+        float fPreemption = 0.0f;
+        NCDF_ERR(nc_get_var_chunk_cache(m_gid, m_varid, &nRawDataChunkCacheSize,
+                                        &nChunkSlots, &fPreemption));
+        m_aosStructuralInfo.SetNameValue(
+            "RAW_DATA_CHUNK_CACHE_SIZE",
+            CPLSPrintf("%" PRIu64,
+                       static_cast<uint64_t>(nRawDataChunkCacheSize)));
+        m_aosStructuralInfo.SetNameValue(
+            "CHUNK_SLOTS",
+            CPLSPrintf("%" PRIu64, static_cast<uint64_t>(nChunkSlots)));
+        m_aosStructuralInfo.SetNameValue("PREEMPTION",
+                                         CPLSPrintf("%f", fPreemption));
+    }
 }
 
 /************************************************************************/

From 8ad85329e466042a935cc12730495bba24ab637d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Jul 2024 12:59:47 +0200
Subject: [PATCH 05/94] GMLAS: avoid crash on a OSSFuzz generated xsd

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=70511
---
 .../ogr/data/gmlas/test_ossfuzz_70511.xsd     | 15 ++++++
 autotest/ogr/ogr_gmlas.py                     | 13 +++++
 ogr/ogrsf_frmts/gmlas/ogr_gmlas.h             |  2 +-
 .../gmlas/ogrgmlasschemaanalyzer.cpp          | 50 +++++++++++++------
 4 files changed, 65 insertions(+), 15 deletions(-)
 create mode 100644 autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd

diff --git a/autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd b/autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd
new file mode 100644
index 000000000000..045587271fa4
--- /dev/null
+++ b/autotest/ogr/data/gmlas/test_ossfuzz_70511.xsd
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+    <!-- matches string recognized in GMLASBaseEntityResolver::resolveEntity() -->
+    <xs:import namespace="http://foo" schemaLocation="foo/gml/3.2.1/gml.xsd"/>
+    <!-- matches string recognized in GMLASErrorHandler::handle() -->
+    <xs:import namespace="http://bar" schemaLocation="foo.http://www.opengis.net/gml/3.2:AbstractCRS' not found"/>
+    <xs:element name="foo">
+      <xs:complexType>
+        <xs:sequence>
+           <xs:element name="x"/>
+         </xs:sequence>
+        <xs:attribute name="y" type="invalid"/>
+      </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/autotest/ogr/ogr_gmlas.py b/autotest/ogr/ogr_gmlas.py
index 353a849d83e6..d3a82e6467c9 100755
--- a/autotest/ogr/ogr_gmlas.py
+++ b/autotest/ogr/ogr_gmlas.py
@@ -3472,3 +3472,16 @@ def test_ogr_gmlas_force_opening(tmp_vsimem):
 
     ds = gdal.OpenEx("data/gmlas/gmlas_test1.xml", allowed_drivers=["GMLAS"])
     assert ds.GetDriver().GetDescription() == "GMLAS"
+
+
+###############################################################################
+# Test we don't crash on a OSSFuzz generated xsd
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_gmlas_ossfuzz_70511():
+
+    with gdal.quiet_errors(), pytest.raises(
+        Exception, match="Cannot get type definition for attribute y"
+    ):
+        gdal.OpenEx("GMLAS:", open_options=["XSD=data/gmlas/test_ossfuzz_70511.xsd"])
diff --git a/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h b/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
index 0ac98a66741f..bbd8ff20a040 100644
--- a/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
+++ b/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
@@ -1161,7 +1161,7 @@ class GMLASSchemaAnalyzer
                        const XSModelGroup *poModelGroup2);
     XSModelGroupDefinition *
     GetGroupDefinition(const XSModelGroup *poModelGroup);
-    void SetFieldFromAttribute(GMLASField &oField, XSAttributeUse *poAttr,
+    bool SetFieldFromAttribute(GMLASField &oField, XSAttributeUse *poAttr,
                                const CPLString &osXPathPrefix,
                                const CPLString &osNamePrefix = CPLString());
     void GetConcreteImplementationTypes(
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp
index ad5f3b6d4864..01f80e812693 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp
@@ -1572,24 +1572,31 @@ static bool IsAnyType(XSComplexTypeDefinition *poType)
 /*                       SetFieldFromAttribute()                        */
 /************************************************************************/
 
-void GMLASSchemaAnalyzer::SetFieldFromAttribute(GMLASField &oField,
+bool GMLASSchemaAnalyzer::SetFieldFromAttribute(GMLASField &oField,
                                                 XSAttributeUse *poAttr,
                                                 const CPLString &osXPathPrefix,
                                                 const CPLString &osNamePrefix)
 {
-    XSAttributeDeclaration *poAttrDecl = poAttr->getAttrDeclaration();
-    XSSimpleTypeDefinition *poAttrType = poAttrDecl->getTypeDefinition();
-
-    SetFieldTypeAndWidthFromDefinition(poAttrType, oField);
-
-    CPLString osNS(transcode(poAttrDecl->getNamespace()));
-    CPLString osName(transcode(poAttrDecl->getName()));
+    const XSAttributeDeclaration *poAttrDecl = poAttr->getAttrDeclaration();
+    const CPLString osNS(transcode(poAttrDecl->getNamespace()));
+    const CPLString osName(transcode(poAttrDecl->getName()));
 
     if (osNamePrefix.empty())
         oField.SetName(osName);
     else
         oField.SetName(osNamePrefix + "_" + osName);
 
+    XSSimpleTypeDefinition *poAttrType = poAttrDecl->getTypeDefinition();
+    if (!poAttrType)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Cannot get type definition for attribute %s",
+                 oField.GetName().c_str());
+        return false;
+    }
+
+    SetFieldTypeAndWidthFromDefinition(poAttrType, oField);
+
     oField.SetXPath(osXPathPrefix + "/@" + MakeXPath(osNS, osName));
     if (poAttr->getRequired())
     {
@@ -1626,6 +1633,8 @@ void GMLASSchemaAnalyzer::SetFieldFromAttribute(GMLASField &oField,
     }
 
     oField.SetDocumentation(GetAnnotationDoc(poAttrDecl->getAnnotation()));
+
+    return true;
 }
 
 /************************************************************************/
@@ -2276,8 +2285,11 @@ bool GMLASSchemaAnalyzer::FindElementsWithMustBeToLevel(
                                 XSAttributeUse *poAttr =
                                     poAttrList->elementAt(j);
                                 GMLASField oField;
-                                SetFieldFromAttribute(oField, poAttr,
-                                                      osFullXPath);
+                                if (!SetFieldFromAttribute(oField, poAttr,
+                                                           osFullXPath))
+                                {
+                                    return false;
+                                }
                                 if (!IsIgnoredXPath(oField.GetXPath()) &&
                                     oField.GetFixedValue().empty())
                                 {
@@ -2343,7 +2355,11 @@ bool GMLASSchemaAnalyzer::FindElementsWithMustBeToLevel(
                         {
                             XSAttributeUse *poAttr = poAttrList->elementAt(j);
                             GMLASField oField;
-                            SetFieldFromAttribute(oField, poAttr, osFullXPath);
+                            if (!SetFieldFromAttribute(oField, poAttr,
+                                                       osFullXPath))
+                            {
+                                return false;
+                            }
                             if (!IsIgnoredXPath(oField.GetXPath()) &&
                                 oField.GetFixedValue().empty())
                             {
@@ -2606,7 +2622,10 @@ bool GMLASSchemaAnalyzer::ExploreModelGroup(
         {
             GMLASField oField;
             XSAttributeUse *poAttr = poMainAttrList->elementAt(j);
-            SetFieldFromAttribute(oField, poAttr, oClass.GetXPath());
+            if (!SetFieldFromAttribute(oField, poAttr, oClass.GetXPath()))
+            {
+                return false;
+            }
 
             if (IsIgnoredXPath(oField.GetXPath()))
             {
@@ -2989,8 +3008,11 @@ bool GMLASSchemaAnalyzer::ExploreModelGroup(
                     CPLString osNamePrefix(bMoveNestedClassToTop
                                                ? osPrefixedEltName
                                                : CPLString());
-                    SetFieldFromAttribute(oField, poAttr, osElementXPath,
-                                          osNamePrefix);
+                    if (!SetFieldFromAttribute(oField, poAttr, osElementXPath,
+                                               osNamePrefix))
+                    {
+                        return false;
+                    }
                     if (nMinOccurs == 0 || bIsChoice)
                     {
                         oField.SetMinOccurs(0);

From 13c23f4cb729273f61d6915db4e3b2176088c464 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Jul 2024 15:10:52 +0200
Subject: [PATCH 06/94] NITF: Create()/CreateCopy(): make sure that provided
 ABPP creation option is zero left-padded

---
 frmts/nitf/nitffile.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frmts/nitf/nitffile.c b/frmts/nitf/nitffile.c
index fceed2cda289..4ecd78a74810 100644
--- a/frmts/nitf/nitffile.c
+++ b/frmts/nitf/nitffile.c
@@ -1056,7 +1056,12 @@ int NITFCreateEx(const char *pszFilename, int nPixels, int nLines, int nBands,
         PLACE(nCur + 349, PVTYPE, pszPVType);
         PLACE(nCur + 352, IREP, pszIREP);
         OVR(8, nCur + 360, ICAT, "VIS");
-        OVR(2, nCur + 368, ABPP, CPLSPrintf("%02d", nBitsPerSample));
+        {
+            const char *pszParamValue = CSLFetchNameValue(papszOptions, "ABPP");
+            PLACE(nCur + 368, ABPP,
+                  CPLSPrintf("%02d", pszParamValue ? atoi(pszParamValue)
+                                                   : nBitsPerSample));
+        }
         OVR(1, nCur + 370, PJUST, "R");
         OVR(1, nCur + 371, ICORDS, " ");
 

From 79c0ecb025a4e4c41b83670ac4699c7ad8a1f78f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Jul 2024 15:03:05 +0200
Subject: [PATCH 07/94] NITF: add an alias of existing ABPP creation option as
 NBITS; propagate NBITS/ABPP creation option to JPEG2000 drivers

Fixes #10442
---
 autotest/gdrivers/nitf.py                   |  38 ++-
 doc/source/drivers/raster/nitf.rst          | 311 +++++++++++++++++++-
 doc/source/drivers/raster/nitf_advanced.rst |   6 +
 frmts/nitf/nitfdataset.cpp                  |  60 +++-
 4 files changed, 389 insertions(+), 26 deletions(-)

diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index a24070cbdc97..fe109efd216a 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -966,16 +966,17 @@ def test_nitf_28_jp2openjpeg_bis():
 # Test CreateCopy() with IC=C8 compression and NPJE profiles with the JP2OpenJPEG driver
 
 
-def test_nitf_jp2openjpeg_npje_numerically_lossless():
+def test_nitf_jp2openjpeg_npje_numerically_lossless(tmp_vsimem):
     jp2openjpeg_drv = gdal.GetDriverByName("JP2OpenJPEG")
     if jp2openjpeg_drv is None:
         pytest.skip()
 
     src_ds = gdal.Open("../gcore/data/uint16.tif")
     # May throw a warning with openjpeg < 2.5
+    out1_filename = str(tmp_vsimem / "tmp.ntf")
     with gdal.quiet_errors():
         gdal.GetDriverByName("NITF").CreateCopy(
-            "/vsimem/tmp.ntf",
+            out1_filename,
             src_ds,
             strict=False,
             options=[
@@ -986,19 +987,17 @@ def test_nitf_jp2openjpeg_npje_numerically_lossless():
             ],
         )
 
-    ds = gdal.Open("/vsimem/tmp.ntf")
+    ds = gdal.Open(out1_filename)
+    assert ds.GetMetadataItem("NITF_ABPP") == "12"
+    assert ds.GetRasterBand(1).GetMetadataItem("NBITS", "IMAGE_STRUCTURE") == "12"
     assert ds.GetRasterBand(1).Checksum() == 4672
     assert (
         ds.GetMetadataItem("J2KLRA", "TRE")
         == "0050000102000000.03125000100.06250000200.12500000300.25000000400.50000000500.60000000600.70000000700.80000000800.90000000901.00000001001.10000001101.20000001201.30000001301.50000001401.70000001502.00000001602.30000001703.50000001803.90000001912.000000"
     )
     assert ds.GetMetadataItem("COMRAT", "DEBUG") in (
-        "N141",
-        "N142",
-        "N143",
-        "N147",
-        "N169",
-        "N174",
+        "N145",  # OpenJPEG 2.3.1 and 2.4
+        "N172",  # OpenJPEG 2.5
     )
     assert (
         ds.GetMetadataItem("COMPRESSION_REVERSIBILITY", "IMAGE_STRUCTURE") == "LOSSLESS"
@@ -1018,7 +1017,7 @@ def test_nitf_jp2openjpeg_npje_numerically_lossless():
         in structure
     )
     assert (
-        '<Field name="Ssiz0" type="uint8" description="Unsigned 16 bits">15</Field>'
+        '<Field name="Ssiz0" type="uint8" description="Unsigned 12 bits">11</Field>'
         in structure
     )
     assert '<Field name="XTsiz" type="uint32">1024</Field>' in structure
@@ -1051,7 +1050,24 @@ def test_nitf_jp2openjpeg_npje_numerically_lossless():
         assert '<Marker name="TLM"' in structure
         assert '<Marker name="PLT"' in structure
 
-    gdal.Unlink("/vsimem/tmp.ntf")
+    # Check that NBITS is propagated as ABPP
+    out2_filename = str(tmp_vsimem / "tmp.ntf")
+    with gdal.quiet_errors():
+        gdal.GetDriverByName("NITF").CreateCopy(
+            out2_filename,
+            gdal.Open(out1_filename),
+            strict=False,
+            options=[
+                "IC=C8",
+                "JPEG2000_DRIVER=JP2OpenJPEG",
+                "PROFILE=NPJE_NUMERICALLY_LOSSLESS",
+            ],
+        )
+
+    ds = gdal.Open(out2_filename)
+    assert ds.GetMetadataItem("NITF_ABPP") == "12"
+    assert ds.GetRasterBand(1).GetMetadataItem("NBITS", "IMAGE_STRUCTURE") == "12"
+    assert ds.GetRasterBand(1).Checksum() == 4672
 
 
 ###############################################################################
diff --git a/doc/source/drivers/raster/nitf.rst b/doc/source/drivers/raster/nitf.rst
index 7e049dd32ce9..5e2ad83d0629 100644
--- a/doc/source/drivers/raster/nitf.rst
+++ b/doc/source/drivers/raster/nitf.rst
@@ -130,13 +130,39 @@ The following creation options are available:
       -  C8 means JPEG2000 compression (one block) and is available for
          CreateCopy() and/or Create() methods. See below paragraph for specificities.
 
+-  .. co:: QUALITY
+      :choices: 10-100
+      :default: 75
+
+      JPEG quality 10-100
+
+-  .. co:: PROGRESSIVE
+      :choices: YES, NO
+      :default: NO
+
+      JPEG progressive mode
+
+-  .. co:: RESTART_INTERVAL
+      :choices: -1, 0, >0
+      :default: -1
+
+      Restart interval (in MCUs) for JPEG compressoin.
+      -1 for auto, 0 for none, > 0 for user specified.
+
 -  .. co:: NUMI
       :default: 1
 
       Number of images.
-      See :ref:`Advanced GDAL NITF Driver Information <raster.nitf_advanced>` for
+      See :ref:`raster.nitf_advanced_write_multiple_image_segments` for
       the procedure to follow to write several images in a NITF file.
 
+-  .. co:: WRITE_ONLY_FIRST_IMAGE
+      :choices: YES, NO
+      :default: NO
+
+      (Only taken into account if NUMI > 1, and on a new NITF file).
+      If YES, only write first image. Subsequent ones must be written with APPEND_SUBDATASET=YES
+
 -  .. co:: WRITE_ALL_IMAGES
       :choices: YES, NO
       :default: NO
@@ -212,6 +238,10 @@ The following creation options are available:
 
       Set the block height.
 
+-  .. co:: BLOCKSIZE
+
+      Set the block with and height. Overridden by BLOCKXSIZE and BLOCKYSIZE
+
 -  .. co:: BLOCKA_*
 
       If a complete set of BLOCKA options is provided with
@@ -260,6 +290,14 @@ The following creation options are available:
       Number of DES segments. Only to be used on
       first image segment
 
+-  .. co:: TEXT
+
+      TEXT options as text-option-name=text-option-content. Cf :ref:`raster.nitf_advanced_text`.
+
+-  .. co:: CGM
+
+      CGM options in cgm-option-name=cgm-option-content.  Cf :ref:`raster.nitf_advanced_cgm`.
+
 -  .. co:: SDE_TRE
       :choices: YES, NO
 
@@ -299,6 +337,273 @@ The following creation options are available:
       may needed to set this option to NO if changing the georeferencing of
       the input file.
 
+
+The following creation options to se fields in the NITF file header are available:
+
+-  .. co:: OSTAID
+      :choices: string of up to 10 characters
+
+      Originating Station ID
+
+-  .. co:: FDT
+      :choices: string of up to 14 characters
+
+      File Date and Time
+
+-  .. co:: FTITLE
+      :choices: string of up to 80 characters
+
+      File Title
+
+-  .. co:: FSCLAS
+      :choices: string of 1 character
+
+      File Security Classification
+
+-  .. co:: FSCLSY
+      :choices: string of up to 2 characters
+
+      File Classification Security System
+
+-  .. co:: FSCODE
+      :choices: string of up to 11 characters
+
+      File Codewords
+
+-  .. co:: FSCTLH
+      :choices: string of up to 2 characters
+
+      File Control and Handling
+
+-  .. co:: FSREL
+      :choices: string of up to 20 characters
+
+      File Releasing Instructions
+
+-  .. co:: FSDCTP
+      :choices: string of up to 2 characters
+
+      File Declassification Type
+
+-  .. co:: FSDCDT
+      :choices: string of 8 characters
+
+      File Declassification Date
+
+-  .. co:: FSDCXM
+      :choices: string of up to 4 characters
+
+      File Declassification Exemption
+
+-  .. co:: FSDG
+      :choices: string of 1 character
+
+      File Downgrade
+
+-  .. co:: FSDGDT
+      :choices: string of 8 characters
+
+      File Downgrade Date
+
+-  .. co:: FSCLTX
+      :choices: string of up to 43 characters
+
+      File Classification Text
+
+-  .. co:: FSCATP
+      :choices: string of 1 character
+
+      File Classification Authority Type
+
+-  .. co:: FSCAUT
+      :choices: string of up to 40 characters
+
+      File Classification Authority
+
+-  .. co:: FSCRSN
+      :choices: string of 1 character
+
+      File Classification Reason
+
+-  .. co:: FSSRDT
+      :choices: string of 8 characters
+
+      File Security Source Date
+
+-  .. co:: FSCTLN
+      :choices: string of up to 15 characters
+
+      File Security Control Number
+
+-  .. co:: FSCOP
+      :choices: string of up to 5 characters
+
+      File Copy Number
+
+-  .. co:: FSCPYS
+      :choices: string of up to 5 characters
+
+      File Number of Copies
+
+-  .. co:: ONAME
+      :choices: string of up to 24 characters
+
+      Originator Name
+
+-  .. co:: OPHONE
+      :choices: string of up to 18 characters
+
+      Originator Phone Number
+
+The following creation options to se fields in the NITF image header are available:
+
+-  .. co:: IID1
+      :choices: string of up to 10 characters
+
+      Image Identifier 1
+
+-  .. co:: IDATIM
+      :choices: string of 14 characters
+
+      Image Date and Time
+
+-  .. co:: TGTID
+      :choices: string of up to 17 characters
+
+      Target Identifier
+
+-  .. co:: IID2
+      :choices: string of up to 80 characters
+
+      Image Identifier 2
+
+-  .. co:: ISCLAS
+      :choices: string of 1 character
+
+      Image Security Classification
+
+-  .. co:: ISCLSY
+      :choices: string of up to 2 characters
+
+      Image Classification Security System
+
+-  .. co:: ISCODE
+      :choices: string of up to 11 characters
+
+      Image Codewords
+
+-  .. co:: ISCTLH
+      :choices: string of up to 2 characters
+
+      Image Control and Handling
+
+-  .. co:: ISREL
+      :choices: string of up to 20 characters
+
+      Image Releasing Instructions
+
+-  .. co:: ISDCTP
+      :choices: string of up to 2 characters
+
+      Image Declassification Type
+
+-  .. co:: ISDCDT
+      :choices: string of 8 characters
+
+      Image Declassification Date
+
+-  .. co:: ISDCXM
+      :choices: string of up to 4 characters
+
+      Image Declassification Exemption
+
+-  .. co:: ISDG
+      :choices: string of 1 character
+
+      Image Downgrade
+
+-  .. co:: ISDGDT
+      :choices: string of 8 characters
+
+      Image Downgrade Date
+
+-  .. co:: ISCLTX
+      :choices: string of up to 43 characters
+
+      Image Classification Text
+
+-  .. co:: ISCATP
+      :choices: string of 1 character
+
+      Image Classification Authority Type
+
+-  .. co:: ISCAUT
+      :choices: string of up to 40 characters
+
+      Image Classification Authority
+
+-  .. co:: ISCRSN
+      :choices: string of 1 character
+
+      Image Classification Reason
+
+-  .. co:: ISSRDT
+      :choices: string of 8 characters
+
+      Image Security Source Date
+
+-  .. co:: ISCTLN
+      :choices: string of up to 15 characters
+
+      Image Security Control Number
+
+-  .. co:: ISORCE
+      :choices: string of up to 42 characters
+
+      Image Source
+
+-  .. co:: ICAT
+      :choices: string of up to 8 characters
+
+      Image Category
+
+-  .. co:: ABPP
+      :choices: integer
+
+      Actual Bits-Per-Pixel Per Band.
+      Starting with GDAL 3.10, also available as the ``NBITS`` creation option.
+
+-  .. co:: PJUST
+      :choices: string of 1 character
+
+      Pixel Justification
+
+-  .. co:: ICOM
+      :choices: string of up to 720 characters
+
+      Image Comments (organized as up to 9 lines of 80 characters)
+
+-  .. co:: IDLVL
+      :choices: integer of up to 3 characters
+
+      Image Display Level
+
+-  .. co:: IALVL
+      :choices: integer of up to 3 characters
+
+      Image Attachment Level
+
+-  .. co:: ILOCROW
+      :choices: integer of up to 5 characters
+
+      Image Location Row
+
+-  .. co:: ILOCCOL
+      :choices: integer of up to 5 characters
+
+      Image Location Column
+
+
 JPEG2000 compression (write support)
 ------------------------------------
 
@@ -329,7 +634,9 @@ the JPEG2000 capable driver to use.
   :co:`drivers/raster/jp2openjpeg QUALITY`,
   :co:`drivers/raster/jp2openjpeg BLOCKXSIZE`
   and
-  :co:`drivers/raster/jp2openjpeg BLOCKYSIZE` JP2OpenJPEG-specific creation options can be
+  :co:`drivers/raster/jp2openjpeg BLOCKYSIZE`,
+  :co:`drivers/raster/jp2ecw TARGET` (target size reduction as a
+  percentage of the original) JP2OpenJPEG-specific creation options can be
   used. By default BLOCKXSIZE=BLOCKYSIZE=1024 will be used.
 
   Starting with GDAL 3.4.0 and OpenJPEG 2.5, the
diff --git a/doc/source/drivers/raster/nitf_advanced.rst b/doc/source/drivers/raster/nitf_advanced.rst
index 219f615eb723..1420b704f865 100644
--- a/doc/source/drivers/raster/nitf_advanced.rst
+++ b/doc/source/drivers/raster/nitf_advanced.rst
@@ -10,6 +10,8 @@ a number of advanced, and somewhat esoteric options not suitable for the
 information is collected here, and is primarily aimed at developers and
 advanced users.
 
+.. _raster.nitf_advanced_cgm:
+
 CGM Segments
 ------------
 
@@ -81,6 +83,8 @@ access to "NITF_IM:0:multi_image_jpeg_2.0.ntf". To open the others use
 the corresponding subdataset names. The Subdataset mechanism is generic
 GDAL concept discussed in the :ref:`raster_data_model` document.
 
+.. _raster.nitf_advanced_text:
+
 Text Segments
 -------------
 
@@ -303,6 +307,8 @@ metadata in base64 encoded format. Something like:
 Note that the ascii encoded numeric values prefixing the base64 encoded
 header is the length (decoded) in bytes, followed by one space.
 
+.. _raster.nitf_advanced_write_multiple_image_segments:
+
 Writing multiple Image Segments
 -------------------------------
 
diff --git a/frmts/nitf/nitfdataset.cpp b/frmts/nitf/nitfdataset.cpp
index 48fd13f314d2..34ee8afd6dda 100644
--- a/frmts/nitf/nitfdataset.cpp
+++ b/frmts/nitf/nitfdataset.cpp
@@ -3982,7 +3982,7 @@ static char **NITFJP2ECWOptions(char **papszOptions)
 /*      NITF creation options.                                          */
 /************************************************************************/
 
-static char **NITFJP2KAKOptions(char **papszOptions)
+static char **NITFJP2KAKOptions(char **papszOptions, int nABPP)
 
 {
     char **papszJP2Options = CSLAddString(nullptr, "CODEC=J2K");
@@ -3999,6 +3999,9 @@ static char **NITFJP2KAKOptions(char **papszOptions)
         }
     }
 
+    papszJP2Options =
+        CSLSetNameValue(papszJP2Options, "NBITS", CPLSPrintf("%d", nABPP));
+
     return papszJP2Options;
 }
 
@@ -4010,7 +4013,7 @@ static char **NITFJP2KAKOptions(char **papszOptions)
 /************************************************************************/
 
 static char **NITFJP2OPENJPEGOptions(GDALDriver *poJ2KDriver,
-                                     CSLConstList papszOptions)
+                                     CSLConstList papszOptions, int nABPP)
 
 {
     char **papszJP2Options = CSLAddString(nullptr, "CODEC=J2K");
@@ -4117,6 +4120,9 @@ static char **NITFJP2OPENJPEGOptions(GDALDriver *poJ2KDriver,
         papszJP2Options = CSLAddString(papszJP2Options, "PROFILE=UNRESTRICTED");
     }
 
+    papszJP2Options =
+        CSLSetNameValue(papszJP2Options, "NBITS", CPLSPrintf("%d", nABPP));
+
     return papszJP2Options;
 }
 
@@ -4290,6 +4296,11 @@ GDALDataset *NITFDataset::NITFDatasetCreate(const char *pszFilename, int nXSize,
             CSLSetNameValue(papszFullOptions, "BLOCKYSIZE", pszBlockSize);
     }
 
+    if (const char *pszNBITS = CSLFetchNameValue(papszFullOptions, "NBITS"))
+    {
+        papszFullOptions = CSLSetNameValue(papszFullOptions, "ABPP", pszNBITS);
+    }
+
     /* -------------------------------------------------------------------- */
     /*      Create the file.                                                */
     /* -------------------------------------------------------------------- */
@@ -5018,6 +5029,19 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
         return nullptr;
     }
 
+    int nABPP = GDALGetDataTypeSize(eType);
+    if (const char *pszABPP = CSLFetchNameValue(papszFullOptions, "ABPP"))
+    {
+        nABPP = atoi(pszABPP);
+    }
+    else if (const char *pszNBITS = CSLFetchNameValueDef(
+                 papszFullOptions, "NBITS",
+                 poBand1->GetMetadataItem("NBITS", "IMAGE_STRUCTURE")))
+    {
+        papszFullOptions = CSLSetNameValue(papszFullOptions, "ABPP", pszNBITS);
+        nABPP = atoi(pszNBITS);
+    }
+
     if (poJ2KDriver != nullptr &&
         EQUAL(poJ2KDriver->GetDescription(), "JP2ECW"))
     {
@@ -5102,10 +5126,6 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
                 0.03125, 0.0625, 0.125, 0.25, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0,
                 1.1,     1.2,    1.3,   1.5,  1.7, 2.0, 2.3, 3.5, 3.9};
 
-            const int nABPP = atoi(CSLFetchNameValueDef(
-                papszFullOptions, "ABPP",
-                CPLSPrintf("%d", GDALGetDataTypeSize(eType))));
-
             if (EQUAL(pszProfile, "NPJE") ||
                 EQUAL(pszProfile, "NPJE_NUMERICALLY_LOSSLESS"))
             {
@@ -5188,7 +5208,7 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
         }
         else if (EQUAL(poJ2KDriver->GetDescription(), "JP2KAK"))
         {
-            char **papszJP2Options = NITFJP2KAKOptions(papszFullOptions);
+            char **papszJP2Options = NITFJP2KAKOptions(papszFullOptions, nABPP);
             poJ2KDataset = poJ2KDriver->CreateCopy(osDSName, poSrcDS, FALSE,
                                                    papszJP2Options, pfnProgress,
                                                    pProgressData);
@@ -5197,7 +5217,7 @@ GDALDataset *NITFDataset::NITFCreateCopy(const char *pszFilename,
         else if (EQUAL(poJ2KDriver->GetDescription(), "JP2OPENJPEG"))
         {
             char **papszJP2Options =
-                NITFJP2OPENJPEGOptions(poJ2KDriver, papszFullOptions);
+                NITFJP2OPENJPEGOptions(poJ2KDriver, papszFullOptions, nABPP);
             poJ2KDataset = poJ2KDriver->CreateCopy(osDSName, poSrcDS, FALSE,
                                                    papszJP2Options, pfnProgress,
                                                    pProgressData);
@@ -7114,11 +7134,25 @@ void NITFDriver::InitCreationOptionList()
     for (unsigned int i = 0;
          i < sizeof(asFieldDescription) / sizeof(asFieldDescription[0]); i++)
     {
-        osCreationOptions += CPLString().Printf(
-            "   <Option name='%s' type='string' description='%s' "
-            "maxsize='%d'/>",
-            asFieldDescription[i].pszName, asFieldDescription[i].pszDescription,
-            asFieldDescription[i].nMaxLen);
+        if (EQUAL(asFieldDescription[i].pszName, "ABPP"))
+        {
+            osCreationOptions +=
+                CPLString().Printf("   <Option name='%s' alias='NBITS' "
+                                   "type='string' description='%s' "
+                                   "maxsize='%d'/>",
+                                   asFieldDescription[i].pszName,
+                                   asFieldDescription[i].pszDescription,
+                                   asFieldDescription[i].nMaxLen);
+        }
+        else
+        {
+            osCreationOptions += CPLString().Printf(
+                "   <Option name='%s' type='string' description='%s' "
+                "maxsize='%d'/>",
+                asFieldDescription[i].pszName,
+                asFieldDescription[i].pszDescription,
+                asFieldDescription[i].nMaxLen);
+        }
     }
 
     osCreationOptions +=

From 3779eadd6fcd41966f6f160043174fb22703a092 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Jul 2024 15:11:37 +0200
Subject: [PATCH 08/94] NITF: remove ABPP field as NBITS IMAGE_STRUCTURE
 metadata item, instead of NBPP

---
 autotest/gdrivers/nitf.py     | 16 ++++++++++++++++
 frmts/nitf/nitfrasterband.cpp | 10 +++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/autotest/gdrivers/nitf.py b/autotest/gdrivers/nitf.py
index fe109efd216a..d88c939bcb5a 100755
--- a/autotest/gdrivers/nitf.py
+++ b/autotest/gdrivers/nitf.py
@@ -5739,6 +5739,22 @@ def test_nitf_metadata_validation_des():
     gdal.Unlink(filename)
 
 
+###############################################################################
+# Test CreateCopy() with IC=C8 compression and NPJE profiles with the JP2OpenJPEG driver
+
+
+def test_nitf_report_ABPP_as_NBITS(tmp_vsimem):
+
+    out_filename = str(tmp_vsimem / "tmp.ntf")
+    gdal.GetDriverByName("NITF").Create(
+        out_filename, 1, 1, 1, gdal.GDT_UInt16, options=["NBITS=9"]
+    )
+
+    ds = gdal.Open(out_filename)
+    assert ds.GetMetadataItem("NITF_ABPP") == "09"
+    assert ds.GetRasterBand(1).GetMetadataItem("NBITS", "IMAGE_STRUCTURE") == "9"
+
+
 ###############################################################################
 # Test NITF21_CGM_ANNO_Uncompressed_unmasked.ntf for bug #1313 and #1714
 
diff --git a/frmts/nitf/nitfrasterband.cpp b/frmts/nitf/nitfrasterband.cpp
index 9391871d2210..22d4facf2831 100644
--- a/frmts/nitf/nitfrasterband.cpp
+++ b/frmts/nitf/nitfrasterband.cpp
@@ -459,12 +459,12 @@ NITFRasterBand::NITFRasterBand(NITFDataset *poDSIn, int nBandIn)
     /* -------------------------------------------------------------------- */
     poColorTable = NITFMakeColorTable(psImage, psBandInfo);
 
-    if (psImage->nBitsPerSample == 1 || psImage->nBitsPerSample == 3 ||
-        psImage->nBitsPerSample == 5 || psImage->nBitsPerSample == 6 ||
-        psImage->nBitsPerSample == 7 || psImage->nBitsPerSample == 12)
-        SetMetadataItem("NBITS",
-                        CPLString().Printf("%d", psImage->nBitsPerSample),
+    if (psImage->nABPP != 8 && psImage->nABPP != 16 && psImage->nABPP != 32 &&
+        psImage->nABPP != 64)
+    {
+        SetMetadataItem("NBITS", CPLString().Printf("%d", psImage->nABPP),
                         "IMAGE_STRUCTURE");
+    }
 
     if (psImage->nBitsPerSample == 3 || psImage->nBitsPerSample == 5 ||
         psImage->nBitsPerSample == 6 || psImage->nBitsPerSample == 7)

From a3b4054f7ea0d78044f0c1095c848f14a05c3f27 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Jul 2024 19:38:46 +0200
Subject: [PATCH 09/94] Add const-safe GDALDataset::GetOpenOptions() method

---
 alg/gdalwarper.cpp  |  4 ++--
 gcore/gdal_misc.cpp |  4 ++--
 gcore/gdal_priv.h   | 12 +++++++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/alg/gdalwarper.cpp b/alg/gdalwarper.cpp
index a695d1d6ac2a..129e8d54a855 100644
--- a/alg/gdalwarper.cpp
+++ b/alg/gdalwarper.cpp
@@ -1741,8 +1741,8 @@ CPLXMLNode *CPL_STDCALL GDALSerializeWarpOptions(const GDALWarpOptions *psWO)
         CPLCreateXMLElementAndValue(psTree, "SourceDataset",
                                     GDALGetDescription(psWO->hSrcDS));
 
-        char **papszOpenOptions =
-            (static_cast<GDALDataset *>(psWO->hSrcDS))->GetOpenOptions();
+        CSLConstList papszOpenOptions =
+            GDALDataset::FromHandle(psWO->hSrcDS)->GetOpenOptions();
         GDALSerializeOpenOptionsToXML(psTree, papszOpenOptions);
     }
 
diff --git a/gcore/gdal_misc.cpp b/gcore/gdal_misc.cpp
index 0147c7c354bd..00d1496ae724 100644
--- a/gcore/gdal_misc.cpp
+++ b/gcore/gdal_misc.cpp
@@ -4374,7 +4374,7 @@ void GDALDeserializeGCPListFromXML(const CPLXMLNode *psGCPList,
 /************************************************************************/
 
 void GDALSerializeOpenOptionsToXML(CPLXMLNode *psParentNode,
-                                   char **papszOpenOptions)
+                                   CSLConstList papszOpenOptions)
 {
     if (papszOpenOptions != nullptr)
     {
@@ -4382,7 +4382,7 @@ void GDALSerializeOpenOptionsToXML(CPLXMLNode *psParentNode,
             CPLCreateXMLNode(psParentNode, CXT_Element, "OpenOptions");
         CPLXMLNode *psLastChild = nullptr;
 
-        for (char **papszIter = papszOpenOptions; *papszIter != nullptr;
+        for (CSLConstList papszIter = papszOpenOptions; *papszIter != nullptr;
              papszIter++)
         {
             const char *pszRawValue;
diff --git a/gcore/gdal_priv.h b/gcore/gdal_priv.h
index f321deeb1822..9b7ab2f795ae 100644
--- a/gcore/gdal_priv.h
+++ b/gcore/gdal_priv.h
@@ -839,6 +839,16 @@ class CPL_DLL GDALDataset : public GDALMajorObject
         return papszOpenOptions;
     }
 
+#ifndef DOXYGEN_SKIP
+    /** Return open options.
+     * @return open options.
+     */
+    CSLConstList GetOpenOptions() const
+    {
+        return papszOpenOptions;
+    }
+#endif
+
     static GDALDataset **GetOpenDatasets(int *pnDatasetCount);
 
 #ifndef DOXYGEN_SKIP
@@ -4410,7 +4420,7 @@ void GDALDeserializeGCPListFromXML(const CPLXMLNode *psGCPList,
                                    OGRSpatialReference **ppoGCP_SRS);
 
 void GDALSerializeOpenOptionsToXML(CPLXMLNode *psParentNode,
-                                   char **papszOpenOptions);
+                                   CSLConstList papszOpenOptions);
 char **GDALDeserializeOpenOptionsFromXML(const CPLXMLNode *psParentNode);
 
 int GDALCanFileAcceptSidecarFile(const char *pszFilename);

From 8d912aee96ca79868982718ec318274bc5e871db Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Jul 2024 19:39:22 +0200
Subject: [PATCH 10/94] GTI: multi-threaded IRasterIO() for non-overlapping
 tiles

---
 autotest/gdrivers/gti.py           |  158 ++++
 doc/source/drivers/raster/gti.rst  |   30 +
 frmts/vrt/gdaltileindexdataset.cpp | 1131 +++++++++++++++++++---------
 3 files changed, 977 insertions(+), 342 deletions(-)

diff --git a/autotest/gdrivers/gti.py b/autotest/gdrivers/gti.py
index 13066179ef91..271cf7fe3f5f 100755
--- a/autotest/gdrivers/gti.py
+++ b/autotest/gdrivers/gti.py
@@ -2607,3 +2607,161 @@ def test_gti_xml_vrtti_embedded(tmp_vsimem):
     assert band.GetCategoryNames() == ["cat"]
     assert band.GetDefaultRAT() is not None
     del vrt_ds
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+@pytest.mark.parametrize("use_threads", [True, False])
+@pytest.mark.parametrize("num_tiles", [2, 128])
+def test_gti_read_multi_threaded(tmp_vsimem, use_threads, num_tiles):
+
+    width = 2048
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=width, format="MEM"
+    )
+    assert width % num_tiles == 0
+    tile_width = width // num_tiles
+    tiles_ds = []
+    for i in range(num_tiles):
+        tile_filename = str(tmp_vsimem / ("%d.tif" % i))
+        gdal.Translate(
+            tile_filename, src_ds, srcWin=[i * tile_width, 0, tile_width, 1024]
+        )
+        tiles_ds.append(gdal.Open(tile_filename))
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(index_filename, tiles_ds)
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+
+    pcts = []
+
+    def cbk(pct, msg, user_data):
+        if pcts:
+            assert pct >= pcts[-1]
+        pcts.append(pct)
+        return 1
+
+    with gdal.config_options({} if use_threads else {"GTI_NUM_THREADS": "0"}):
+        assert vrt_ds.ReadRaster(1, 2, 1030, 1020, callback=cbk) == src_ds.ReadRaster(
+            1, 2, 1030, 1020
+        )
+    assert pcts[-1] == 1.0
+
+    assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == (
+        "1" if gdal.GetNumCPUs() >= 2 and use_threads else "0"
+    )
+
+    # Again
+    pcts = []
+    with gdal.config_options({} if use_threads else {"GTI_NUM_THREADS": "0"}):
+        assert vrt_ds.ReadRaster(1, 2, 1030, 1020, callback=cbk) == src_ds.ReadRaster(
+            1, 2, 1030, 1020
+        )
+    assert pcts[-1] == 1.0
+
+    assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == (
+        "1" if gdal.GetNumCPUs() >= 2 and use_threads else "0"
+    )
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+def test_gti_read_multi_threaded_disabled_since_overlapping_sources(tmp_vsimem):
+
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=2048, format="MEM"
+    )
+    OVERLAP = 1
+    left_filename = str(tmp_vsimem / "left.tif")
+    gdal.Translate(left_filename, src_ds, srcWin=[0, 0, 1024 + OVERLAP, 1024])
+    right_filename = str(tmp_vsimem / "right.tif")
+    gdal.Translate(right_filename, src_ds, srcWin=[1024, 0, 1024, 1024])
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(
+        index_filename, [gdal.Open(left_filename), gdal.Open(right_filename)]
+    )
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+
+    assert vrt_ds.ReadRaster(1, 2, 1030, 1020) == src_ds.ReadRaster(1, 2, 1030, 1020)
+
+    assert (
+        vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == "0"
+    )
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+def test_gti_read_multi_threaded_disabled_because_invalid_filename(tmp_vsimem):
+
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=2048, format="MEM"
+    )
+    left_filename = str(tmp_vsimem / "left.tif")
+    gdal.Translate(left_filename, src_ds, srcWin=[0, 0, 1024, 1024])
+    right_filename = str(tmp_vsimem / "right.tif")
+    gdal.Translate(right_filename, src_ds, srcWin=[1024, 0, 1024, 1024])
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(
+        index_filename, [gdal.Open(left_filename), gdal.Open(right_filename)]
+    )
+    lyr = index_ds.GetLayer(0)
+    f = lyr.GetFeature(2)
+    f["location"] = "/i/do/not/exist"
+    lyr.SetFeature(f)
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+
+    with pytest.raises(Exception, match="/i/do/not/exist"):
+        vrt_ds.ReadRaster()
+
+    assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == (
+        "1" if gdal.GetNumCPUs() >= 2 else "0"
+    )
+
+
+###############################################################################
+# Test multi-threaded reading
+
+
+def test_gti_read_multi_threaded_disabled_because_truncated_source(tmp_vsimem):
+
+    src_ds = gdal.Translate(
+        "", "../gdrivers/data/small_world.tif", width=2048, format="MEM"
+    )
+    left_filename = str(tmp_vsimem / "left.tif")
+    gdal.Translate(left_filename, src_ds, srcWin=[0, 0, 1024, 1024])
+    right_filename = str(tmp_vsimem / "right.tif")
+    gdal.Translate(right_filename, src_ds, srcWin=[1024, 0, 1024, 1024])
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(
+        index_filename, [gdal.Open(left_filename), gdal.Open(right_filename)]
+    )
+    del index_ds
+
+    f = gdal.VSIFOpenL(right_filename, "rb+")
+    assert f
+    gdal.VSIFTruncateL(f, gdal.VSIStatL(right_filename).size - 10)
+    gdal.VSIFCloseL(f)
+
+    vrt_ds = gdal.Open(index_filename)
+
+    with pytest.raises(Exception, match="right.tif"):
+        vrt_ds.ReadRaster()
+
+    assert vrt_ds.GetMetadataItem("MULTI_THREADED_RASTERIO_LAST_USED", "__DEBUG__") == (
+        "1" if gdal.GetNumCPUs() >= 2 else "0"
+    )
diff --git a/doc/source/drivers/raster/gti.rst b/doc/source/drivers/raster/gti.rst
index a41a41b9c02b..d8dd8163df48 100644
--- a/doc/source/drivers/raster/gti.rst
+++ b/doc/source/drivers/raster/gti.rst
@@ -431,3 +431,33 @@ also defined as layer metadata items or in the .gti XML file
       :choices: <float>
 
       Maximum Y value for the virtual mosaic extent
+
+Multi-threading optimizations
+-----------------------------
+
+Starting with GDAL 3.10, the :oo:`NUM_THREADS` open option can
+be set to control specifically the multi-threading of GTI datasets.
+It defaults to ``ALL_CPUS``, and when set, overrides :config:`GDAL_NUM_THREADS`
+or :config:`GTI_NUM_THREADS`. It applies to band-level and dataset-level
+RasterIO(), if more than 1 million pixels are requested and if the mosaic is
+made of only non-overlapping tiles.
+
+-  .. oo:: NUM_THREADS
+      :choices: integer, ALL_CPUS
+      :default: ALL_CPUS
+
+      Determines the number of threads used when an operation reads from
+      multiple sources.
+
+This can also be specified globally with the :config:`GTI_NUM_THREADS`
+configuration option.
+
+-  .. config:: GTI_NUM_THREADS
+      :choices: integer, ALL_CPUS
+      :default: ALL_CPUS
+
+      Determines the number of threads used when an operation reads from
+      multiple sources.
+
+Note that the number of threads actually used is also limited by the
+:config:`GDAL_MAX_DATASET_POOL_SIZE` configuration option.
diff --git a/frmts/vrt/gdaltileindexdataset.cpp b/frmts/vrt/gdaltileindexdataset.cpp
index 122e7f782b98..6342fe55c0e2 100644
--- a/frmts/vrt/gdaltileindexdataset.cpp
+++ b/frmts/vrt/gdaltileindexdataset.cpp
@@ -30,19 +30,24 @@
 
 #include <array>
 #include <algorithm>
+#include <atomic>
 #include <limits>
+#include <mutex>
 #include <set>
 #include <tuple>
 #include <utility>
 #include <vector>
 
 #include "cpl_port.h"
+#include "cpl_error_internal.h"
 #include "cpl_mem_cache.h"
 #include "cpl_minixml.h"
+#include "cpl_quad_tree.h"
 #include "vrtdataset.h"
 #include "vrt_priv.h"
 #include "ogrsf_frmts.h"
 #include "gdal_proxy.h"
+#include "gdal_thread_pool.h"
 #include "gdal_utils.h"
 
 #if defined(__SSE2__) || defined(_M_X64)
@@ -276,6 +281,16 @@ class GDALTileIndexDataset final : public GDALPamDataset
     //! Cache of buffers used by VRTComplexSource to avoid memory reallocation.
     VRTSource::WorkingState m_oWorkingState{};
 
+    //! Used by IRasterIO() when using multi-threading
+    struct QueueWorkingStates
+    {
+        std::mutex oMutex{};
+        std::vector<std::unique_ptr<VRTSource::WorkingState>> oStates{};
+    };
+
+    //! Used by IRasterIO() when using multi-threading
+    QueueWorkingStates m_oQueueWorkingStates{};
+
     //! Structure describing one of the source raster in the tile index.
     struct SourceDesc
     {
@@ -292,7 +307,7 @@ class GDALTileIndexDataset final : public GDALPamDataset
         std::unique_ptr<OGRFeature> poFeature{};
 
         //! Work buffer containing the value of the mask band for the current pixel query.
-        std::vector<GByte> abyMask{};
+        mutable std::vector<GByte> abyMask{};
 
         //! Whether the source covers the whole area of interest of the current pixel query.
         bool bCoversWholeAOI = false;
@@ -313,13 +328,20 @@ class GDALTileIndexDataset final : public GDALPamDataset
     //! Array of sources participating to the current pixel query.
     std::vector<SourceDesc> m_aoSourceDesc{};
 
+    //! Maximum number of threads. Updated by CollectSources().
+    int m_nNumThreads = -1;
+
+    //! Whereas the multi-threading rendering code path must be used. Updated by CollectSources().
+    bool m_bLastMustUseMultiThreading = false;
+
     //! From a source dataset name, return its SourceDesc description structure.
-    bool GetSourceDesc(const std::string &osTileName, SourceDesc &oSourceDesc);
+    bool GetSourceDesc(const std::string &osTileName, SourceDesc &oSourceDesc,
+                       std::mutex *pMutex);
 
     //! Collect sources corresponding to the georeferenced window of interest,
     //! and store them in m_aoSourceDesc[].
     bool CollectSources(double dfXOff, double dfYOff, double dfXSize,
-                        double dfYSize);
+                        double dfYSize, bool bMultiThreadAllowed);
 
     //! Sort sources according to m_nSortFieldIndex.
     void SortSourceDesc();
@@ -334,9 +356,56 @@ class GDALTileIndexDataset final : public GDALPamDataset
                     const int *panBandMap, GSpacing nPixelSpace,
                     GSpacing nLineSpace, GSpacing nBandSpace) const;
 
+    //! Render one source. Used by IRasterIO()
+    CPLErr RenderSource(const SourceDesc &oSourceDesc, bool bNeedInitBuffer,
+                        int nBandNrMax, int nXOff, int nYOff, int nXSize,
+                        int nYSize, double dfXOff, double dfYOff,
+                        double dfXSize, double dfYSize, int nBufXSize,
+                        int nBufYSize, void *pData, GDALDataType eBufType,
+                        int nBandCount, BANDMAP_TYPE panBandMap,
+                        GSpacing nPixelSpace, GSpacing nLineSpace,
+                        GSpacing nBandSpace, GDALRasterIOExtraArg *psExtraArg,
+                        VRTSource::WorkingState &oWorkingState) const;
+
     //! Whether m_poVectorDS supports SetMetadata()/SetMetadataItem()
     bool TileIndexSupportsEditingLayerMetadata() const;
 
+    //! Return number of threads that can be used
+    int GetNumThreads() const;
+
+    /** Structure used to declare a threaded job to satisfy IRasterIO()
+     * on a given source.
+     */
+    struct RasterIOJob
+    {
+        std::atomic<int> *pnCompletedJobs = nullptr;
+        std::atomic<bool> *pbSuccess = nullptr;
+        GDALTileIndexDataset *poDS = nullptr;
+        GDALTileIndexDataset::QueueWorkingStates *poQueueWorkingStates =
+            nullptr;
+        int nBandNrMax = 0;
+        std::string *posErrorMsg = nullptr;
+
+        int nXOff = 0;
+        int nYOff = 0;
+        int nXSize = 0;
+        int nYSize = 0;
+        void *pData = nullptr;
+        int nBufXSize = 0;
+        int nBufYSize = 0;
+        int nBandCount = 0;
+        BANDMAP_TYPE panBandMap = nullptr;
+        GDALDataType eBufType = GDT_Unknown;
+        GSpacing nPixelSpace = 0;
+        GSpacing nLineSpace = 0;
+        GSpacing nBandSpace = 0;
+        GDALRasterIOExtraArg *psExtraArg = nullptr;
+
+        std::string osTileName{};
+
+        static void Func(void *pData);
+    };
+
     CPL_DISALLOW_COPY_ASSIGN(GDALTileIndexDataset)
 };
 
@@ -1858,6 +1927,10 @@ const char *GDALTileIndexDataset::GetMetadataItem(const char *pszName,
         {
             return CPLSPrintf("%d", static_cast<int>(m_aoSourceDesc.size()));
         }
+        else if (EQUAL(pszName, "MULTI_THREADED_RASTERIO_LAST_USED"))
+        {
+            return m_bLastMustUseMultiThreading ? "1" : "0";
+        }
     }
     return GDALPamDataset::GetMetadataItem(pszName, pszDomain);
 }
@@ -2396,7 +2469,8 @@ const char *GDALTileIndexBand::GetMetadataItem(const char *pszName,
             iLine >= GetYSize())
             return nullptr;
 
-        if (!m_poDS->CollectSources(iPixel, iLine, 1, 1))
+        if (!m_poDS->CollectSources(iPixel, iLine, 1, 1,
+                                    /* bMultiThreadAllowed = */ false))
             return nullptr;
 
         // Format into XML.
@@ -2702,10 +2776,18 @@ GDALTileIndexDataset::GetSourcesMoreRecentThan(int64_t mTime)
 /************************************************************************/
 
 bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
-                                         SourceDesc &oSourceDesc)
+                                         SourceDesc &oSourceDesc,
+                                         std::mutex *pMutex)
 {
     std::shared_ptr<GDALDataset> poTileDS;
-    if (!m_oMapSharedSources.tryGet(osTileName, poTileDS))
+
+    if (pMutex)
+        pMutex->lock();
+    const bool bTileKnown = m_oMapSharedSources.tryGet(osTileName, poTileDS);
+    if (pMutex)
+        pMutex->unlock();
+
+    if (!bTileKnown)
     {
         poTileDS = std::shared_ptr<GDALDataset>(
             GDALProxyPoolDataset::Create(
@@ -2838,7 +2920,11 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
             poTileDS.reset(poWarpDS.release());
         }
 
+        if (pMutex)
+            pMutex->lock();
         m_oMapSharedSources.insert(osTileName, poTileDS);
+        if (pMutex)
+            pMutex->unlock();
     }
 
     double adfGeoTransformTile[6];
@@ -2917,12 +3003,34 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
     return true;
 }
 
+/************************************************************************/
+/*                           GetNumThreads()                            */
+/************************************************************************/
+
+int GDALTileIndexDataset::GetNumThreads() const
+{
+    const char *pszNumThreads =
+        CSLFetchNameValueDef(GetOpenOptions(), "NUM_THREADS", nullptr);
+    if (!pszNumThreads)
+        pszNumThreads = CPLGetConfigOption("GTI_NUM_THREADS", nullptr);
+    if (!pszNumThreads)
+        pszNumThreads = CPLGetConfigOption("GDAL_NUM_THREADS", "ALL_CPUS");
+    if (EQUAL(pszNumThreads, "0") || EQUAL(pszNumThreads, "1"))
+        return atoi(pszNumThreads);
+    const int nMaxPoolSize = GDALGetMaxDatasetPoolSize();
+    const int nLimit = std::min(CPLGetNumCPUs(), nMaxPoolSize);
+    if (EQUAL(pszNumThreads, "ALL_CPUS"))
+        return nLimit;
+    return std::min(atoi(pszNumThreads), nLimit);
+}
+
 /************************************************************************/
 /*                        CollectSources()                              */
 /************************************************************************/
 
 bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
-                                          double dfXSize, double dfYSize)
+                                          double dfXSize, double dfYSize,
+                                          bool bMultiThreadAllowed)
 {
     const double dfMinX =
         m_adfGeoTransform[GT_TOPLEFT_X] + dfXOff * m_adfGeoTransform[GT_WE_RES];
@@ -2941,6 +3049,7 @@ bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
     m_dfLastMinYFilter = dfMinY;
     m_dfLastMaxXFilter = dfMaxX;
     m_dfLastMaxYFilter = dfMaxY;
+    m_bLastMustUseMultiThreading = false;
 
     m_poLayer->SetSpatialFilterRect(dfMinX, dfMinY, dfMaxX, dfMaxY);
     m_poLayer->ResetReading();
@@ -2971,6 +3080,99 @@ bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
         }
     }
 
+    constexpr int MINIMUM_PIXEL_COUNT_FOR_THREADED_IO = 1000 * 1000;
+    if (bMultiThreadAllowed && m_aoSourceDesc.size() > 1 &&
+        dfXSize * dfYSize > MINIMUM_PIXEL_COUNT_FOR_THREADED_IO)
+    {
+        if (m_nNumThreads < 0)
+            m_nNumThreads = GetNumThreads();
+        bMultiThreadAllowed = m_nNumThreads > 1;
+    }
+    else
+    {
+        bMultiThreadAllowed = false;
+    }
+
+    if (bMultiThreadAllowed)
+    {
+        CPLRectObj sGlobalBounds;
+        sGlobalBounds.minx = dfXOff;
+        sGlobalBounds.miny = dfYOff;
+        sGlobalBounds.maxx = dfXOff + dfXSize;
+        sGlobalBounds.maxy = dfYOff + dfYSize;
+        CPLQuadTree *hQuadTree = CPLQuadTreeCreate(&sGlobalBounds, nullptr);
+
+        bool bCompatibleOfMultiThread = true;
+        std::set<std::string> oSetTileNames;
+        for (const auto &oSourceDesc : m_aoSourceDesc)
+        {
+            const char *pszTileName =
+                oSourceDesc.poFeature->GetFieldAsString(m_nLocationFieldIndex);
+            if (oSetTileNames.find(pszTileName) != oSetTileNames.end())
+            {
+                bCompatibleOfMultiThread = false;
+                break;
+            }
+            oSetTileNames.insert(pszTileName);
+
+            const auto poGeom = oSourceDesc.poFeature->GetGeometryRef();
+            if (!poGeom || poGeom->IsEmpty())
+                continue;
+
+            OGREnvelope sEnvelope;
+            poGeom->getEnvelope(&sEnvelope);
+
+            CPLRectObj sSourceBounds;
+            sSourceBounds.minx =
+                (sEnvelope.MinX - m_adfGeoTransform[GT_TOPLEFT_X]) /
+                m_adfGeoTransform[GT_WE_RES];
+            sSourceBounds.maxx =
+                (sEnvelope.MaxX - m_adfGeoTransform[GT_TOPLEFT_X]) /
+                m_adfGeoTransform[GT_WE_RES];
+            // Yes use of MaxY to compute miny is intended given that MaxY is
+            // in georeferenced space whereas miny is in pixel space.
+            sSourceBounds.miny =
+                (sEnvelope.MaxY - m_adfGeoTransform[GT_TOPLEFT_Y]) /
+                m_adfGeoTransform[GT_NS_RES];
+            // Same here for maxy vs Miny
+            sSourceBounds.maxy =
+                (sEnvelope.MinY - m_adfGeoTransform[GT_TOPLEFT_Y]) /
+                m_adfGeoTransform[GT_NS_RES];
+
+            // Clamp to global bounds and some epsilon to avoid adjacent tiles
+            // to be considered as overlapping
+            constexpr double EPSILON = 0.1;
+            sSourceBounds.minx =
+                std::max(sGlobalBounds.minx, sSourceBounds.minx) + EPSILON;
+            sSourceBounds.maxx =
+                std::min(sGlobalBounds.maxx, sSourceBounds.maxx) - EPSILON;
+            sSourceBounds.miny =
+                std::max(sGlobalBounds.miny, sSourceBounds.miny) + EPSILON;
+            sSourceBounds.maxy =
+                std::min(sGlobalBounds.maxy, sSourceBounds.maxy) - EPSILON;
+
+            // Check that the new source doesn't overlap an existing one.
+            if (CPLQuadTreeHasMatch(hQuadTree, &sSourceBounds))
+            {
+                bCompatibleOfMultiThread = false;
+                break;
+            }
+
+            CPLQuadTreeInsertWithBounds(
+                hQuadTree,
+                const_cast<void *>(static_cast<const void *>(&oSourceDesc)),
+                &sSourceBounds);
+        }
+
+        CPLQuadTreeDestroy(hQuadTree);
+
+        if (bCompatibleOfMultiThread)
+        {
+            m_bLastMustUseMultiThreading = true;
+            return true;
+        }
+    }
+
     if (m_aoSourceDesc.size() > 1)
     {
         SortSourceDesc();
@@ -2989,7 +3191,7 @@ bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
             GetAbsoluteFileName(pszTileName, GetDescription()));
 
         SourceDesc oSourceDesc;
-        if (!GetSourceDesc(osTileName, oSourceDesc))
+        if (!GetSourceDesc(osTileName, oSourceDesc, nullptr))
             continue;
 
         const auto &poSource = oSourceDesc.poSource;
@@ -3332,6 +3534,378 @@ void GDALTileIndexDataset::InitBuffer(void *pData, int nBufXSize, int nBufYSize,
     }
 }
 
+/************************************************************************/
+/*                            RenderSource()                            */
+/************************************************************************/
+
+CPLErr GDALTileIndexDataset::RenderSource(
+    const SourceDesc &oSourceDesc, bool bNeedInitBuffer, int nBandNrMax,
+    int nXOff, int nYOff, int nXSize, int nYSize, double dfXOff, double dfYOff,
+    double dfXSize, double dfYSize, int nBufXSize, int nBufYSize, void *pData,
+    GDALDataType eBufType, int nBandCount, BANDMAP_TYPE panBandMap,
+    GSpacing nPixelSpace, GSpacing nLineSpace, GSpacing nBandSpace,
+    GDALRasterIOExtraArg *psExtraArg,
+    VRTSource::WorkingState &oWorkingState) const
+{
+    auto &poTileDS = oSourceDesc.poDS;
+    auto &poSource = oSourceDesc.poSource;
+    auto poComplexSource = dynamic_cast<VRTComplexSource *>(poSource.get());
+    CPLErr eErr = CE_None;
+
+    if (poTileDS->GetRasterCount() + 1 == nBandNrMax &&
+        papoBands[nBandNrMax - 1]->GetColorInterpretation() == GCI_AlphaBand &&
+        papoBands[nBandNrMax - 1]->GetRasterDataType() == GDT_Byte)
+    {
+        // Special case when there's typically a mix of RGB and RGBA source
+        // datasets and we read a RGB one.
+        for (int iBand = 0; iBand < nBandCount && eErr == CE_None; ++iBand)
+        {
+            const int nBandNr = panBandMap[iBand];
+            if (nBandNr == nBandNrMax)
+            {
+                // The window we will actually request from the source raster band.
+                double dfReqXOff = 0.0;
+                double dfReqYOff = 0.0;
+                double dfReqXSize = 0.0;
+                double dfReqYSize = 0.0;
+                int nReqXOff = 0;
+                int nReqYOff = 0;
+                int nReqXSize = 0;
+                int nReqYSize = 0;
+
+                // The window we will actual set _within_ the pData buffer.
+                int nOutXOff = 0;
+                int nOutYOff = 0;
+                int nOutXSize = 0;
+                int nOutYSize = 0;
+
+                bool bError = false;
+
+                auto poTileBand = poTileDS->GetRasterBand(1);
+                poSource->SetRasterBand(poTileBand, false);
+                if (poSource->GetSrcDstWindow(
+                        dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize, nBufYSize,
+                        &dfReqXOff, &dfReqYOff, &dfReqXSize, &dfReqYSize,
+                        &nReqXOff, &nReqYOff, &nReqXSize, &nReqYSize, &nOutXOff,
+                        &nOutYOff, &nOutXSize, &nOutYSize, bError))
+                {
+                    GByte *pabyOut =
+                        static_cast<GByte *>(pData) +
+                        static_cast<GPtrDiff_t>(iBand * nBandSpace +
+                                                nOutXOff * nPixelSpace +
+                                                nOutYOff * nLineSpace);
+
+                    constexpr GByte n255 = 255;
+                    for (int iY = 0; iY < nOutYSize; iY++)
+                    {
+                        GDALCopyWords(
+                            &n255, GDT_Byte, 0,
+                            pabyOut + static_cast<GPtrDiff_t>(iY * nLineSpace),
+                            eBufType, static_cast<int>(nPixelSpace), nOutXSize);
+                    }
+                }
+            }
+            else
+            {
+                auto poTileBand = poTileDS->GetRasterBand(nBandNr);
+                if (poComplexSource)
+                {
+                    int bHasNoData = false;
+                    const double dfNoDataValue =
+                        poTileBand->GetNoDataValue(&bHasNoData);
+                    poComplexSource->SetNoDataValue(
+                        bHasNoData ? dfNoDataValue : VRT_NODATA_UNSET);
+                }
+                poSource->SetRasterBand(poTileBand, false);
+
+                GDALRasterIOExtraArg sExtraArg;
+                INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+                if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+                {
+                    // cppcheck-suppress redundantAssignment
+                    sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+                }
+                else
+                {
+                    // cppcheck-suppress redundantAssignment
+                    sExtraArg.eResampleAlg = m_eResampling;
+                }
+
+                GByte *pabyBandData =
+                    static_cast<GByte *>(pData) + iBand * nBandSpace;
+                eErr = poSource->RasterIO(
+                    poTileBand->GetRasterDataType(), nXOff, nYOff, nXSize,
+                    nYSize, pabyBandData, nBufXSize, nBufYSize, eBufType,
+                    nPixelSpace, nLineSpace, &sExtraArg, oWorkingState);
+            }
+        }
+        return eErr;
+    }
+    else if (poTileDS->GetRasterCount() < nBandNrMax)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "%s has not enough bands.",
+                 oSourceDesc.osName.c_str());
+        return CE_Failure;
+    }
+
+    if ((oSourceDesc.poMaskBand && bNeedInitBuffer) || nBandNrMax == 0)
+    {
+        // The window we will actually request from the source raster band.
+        double dfReqXOff = 0.0;
+        double dfReqYOff = 0.0;
+        double dfReqXSize = 0.0;
+        double dfReqYSize = 0.0;
+        int nReqXOff = 0;
+        int nReqYOff = 0;
+        int nReqXSize = 0;
+        int nReqYSize = 0;
+
+        // The window we will actual set _within_ the pData buffer.
+        int nOutXOff = 0;
+        int nOutYOff = 0;
+        int nOutXSize = 0;
+        int nOutYSize = 0;
+
+        bool bError = false;
+
+        auto poFirstTileBand = poTileDS->GetRasterBand(1);
+        poSource->SetRasterBand(poFirstTileBand, false);
+        if (poSource->GetSrcDstWindow(
+                dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize, nBufYSize,
+                &dfReqXOff, &dfReqYOff, &dfReqXSize, &dfReqYSize, &nReqXOff,
+                &nReqYOff, &nReqXSize, &nReqYSize, &nOutXOff, &nOutYOff,
+                &nOutXSize, &nOutYSize, bError))
+        {
+            int iMaskBandIdx = -1;
+            if (eBufType == GDT_Byte && nBandNrMax == 0)
+            {
+                // when called from m_poMaskBand
+                iMaskBandIdx = 0;
+            }
+            else if (oSourceDesc.poMaskBand)
+            {
+                // If we request a Byte buffer and the mask band is actually
+                // one of the queried bands of this request, we can save
+                // requesting it separately.
+                const int nMaskBandNr = oSourceDesc.poMaskBand->GetBand();
+                if (eBufType == GDT_Byte && nMaskBandNr >= 1 &&
+                    nMaskBandNr <= poTileDS->GetRasterCount() &&
+                    poTileDS->GetRasterBand(nMaskBandNr) ==
+                        oSourceDesc.poMaskBand)
+                {
+                    for (int iBand = 0; iBand < nBandCount; ++iBand)
+                    {
+                        if (panBandMap[iBand] == nMaskBandNr)
+                        {
+                            iMaskBandIdx = iBand;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            GDALRasterIOExtraArg sExtraArg;
+            INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+            if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+            }
+            else
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = m_eResampling;
+            }
+            sExtraArg.bFloatingPointWindowValidity = TRUE;
+            sExtraArg.dfXOff = dfReqXOff;
+            sExtraArg.dfYOff = dfReqYOff;
+            sExtraArg.dfXSize = dfReqXSize;
+            sExtraArg.dfYSize = dfReqYSize;
+
+            if (iMaskBandIdx < 0 && oSourceDesc.abyMask.empty() &&
+                oSourceDesc.poMaskBand)
+            {
+                // Fetch the mask band
+                try
+                {
+                    oSourceDesc.abyMask.resize(static_cast<size_t>(nOutXSize) *
+                                               nOutYSize);
+                }
+                catch (const std::bad_alloc &)
+                {
+                    CPLError(CE_Failure, CPLE_OutOfMemory,
+                             "Cannot allocate working buffer for mask");
+                    return CE_Failure;
+                }
+
+                if (oSourceDesc.poMaskBand->RasterIO(
+                        GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
+                        oSourceDesc.abyMask.data(), nOutXSize, nOutYSize,
+                        GDT_Byte, 0, 0, &sExtraArg) != CE_None)
+                {
+                    oSourceDesc.abyMask.clear();
+                    return CE_Failure;
+                }
+            }
+
+            // Allocate a temporary contiguous buffer to receive pixel data
+            const int nBufTypeSize = GDALGetDataTypeSizeBytes(eBufType);
+            const size_t nWorkBufferBandSize =
+                static_cast<size_t>(nOutXSize) * nOutYSize * nBufTypeSize;
+            std::vector<GByte> abyWorkBuffer;
+            try
+            {
+                abyWorkBuffer.resize(nBandCount * nWorkBufferBandSize);
+            }
+            catch (const std::bad_alloc &)
+            {
+                CPLError(CE_Failure, CPLE_OutOfMemory,
+                         "Cannot allocate working buffer");
+                return CE_Failure;
+            }
+
+            const GByte *const pabyMask =
+                iMaskBandIdx >= 0
+                    ? abyWorkBuffer.data() + iMaskBandIdx * nWorkBufferBandSize
+                    : oSourceDesc.abyMask.data();
+
+            if (nBandNrMax == 0)
+            {
+                // Special case when called from m_poMaskBand
+                if (poTileDS->GetRasterBand(1)->GetMaskBand()->RasterIO(
+                        GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
+                        abyWorkBuffer.data(), nOutXSize, nOutYSize, eBufType, 0,
+                        0, &sExtraArg) != CE_None)
+                {
+                    return CE_Failure;
+                }
+            }
+            else if (poTileDS->RasterIO(GF_Read, nReqXOff, nReqYOff, nReqXSize,
+                                        nReqYSize, abyWorkBuffer.data(),
+                                        nOutXSize, nOutYSize, eBufType,
+                                        nBandCount, panBandMap, 0, 0, 0,
+                                        &sExtraArg) != CE_None)
+            {
+                return CE_Failure;
+            }
+
+            // Compose the temporary contiguous buffer into the target
+            // buffer, taking into account the mask
+            GByte *pabyOut = static_cast<GByte *>(pData) +
+                             static_cast<GPtrDiff_t>(nOutXOff * nPixelSpace +
+                                                     nOutYOff * nLineSpace);
+
+            for (int iBand = 0; iBand < nBandCount && eErr == CE_None; ++iBand)
+            {
+                GByte *pabyDestBand =
+                    pabyOut + static_cast<GPtrDiff_t>(iBand * nBandSpace);
+                const GByte *pabySrc =
+                    abyWorkBuffer.data() + iBand * nWorkBufferBandSize;
+
+                CompositeSrcWithMaskIntoDest(
+                    nOutXSize, nOutYSize, eBufType, nBufTypeSize, nPixelSpace,
+                    nLineSpace, pabySrc, pabyMask, pabyDestBand);
+            }
+        }
+    }
+    else if (m_bSameDataType && !bNeedInitBuffer && oSourceDesc.bHasNoData)
+    {
+        // We create a non-VRTComplexSource SimpleSource copy of poSource
+        // to be able to call DatasetRasterIO()
+        VRTSimpleSource oSimpleSource(poSource.get(), 1.0, 1.0);
+
+        GDALRasterIOExtraArg sExtraArg;
+        INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+        if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+        }
+        else
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = m_eResampling;
+        }
+
+        auto poTileBand = poTileDS->GetRasterBand(panBandMap[0]);
+        oSimpleSource.SetRasterBand(poTileBand, false);
+        eErr = oSimpleSource.DatasetRasterIO(
+            papoBands[0]->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
+            pData, nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
+            nPixelSpace, nLineSpace, nBandSpace, &sExtraArg);
+    }
+    else if (m_bSameDataType && !poComplexSource)
+    {
+        auto poTileBand = poTileDS->GetRasterBand(panBandMap[0]);
+        poSource->SetRasterBand(poTileBand, false);
+
+        GDALRasterIOExtraArg sExtraArg;
+        INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+        if (poTileBand->GetColorTable())
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = GRIORA_NearestNeighbour;
+        }
+        else if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+        }
+        else
+        {
+            // cppcheck-suppress redundantAssignment
+            sExtraArg.eResampleAlg = m_eResampling;
+        }
+
+        eErr = poSource->DatasetRasterIO(
+            papoBands[0]->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
+            pData, nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
+            nPixelSpace, nLineSpace, nBandSpace, &sExtraArg);
+    }
+    else
+    {
+        for (int i = 0; i < nBandCount && eErr == CE_None; ++i)
+        {
+            const int nBandNr = panBandMap[i];
+            GByte *pabyBandData = static_cast<GByte *>(pData) + i * nBandSpace;
+            auto poTileBand = poTileDS->GetRasterBand(nBandNr);
+            if (poComplexSource)
+            {
+                int bHasNoData = false;
+                const double dfNoDataValue =
+                    poTileBand->GetNoDataValue(&bHasNoData);
+                poComplexSource->SetNoDataValue(bHasNoData ? dfNoDataValue
+                                                           : VRT_NODATA_UNSET);
+            }
+            poSource->SetRasterBand(poTileBand, false);
+
+            GDALRasterIOExtraArg sExtraArg;
+            INIT_RASTERIO_EXTRA_ARG(sExtraArg);
+            if (poTileBand->GetColorTable())
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = GRIORA_NearestNeighbour;
+            }
+            else if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
+            }
+            else
+            {
+                // cppcheck-suppress redundantAssignment
+                sExtraArg.eResampleAlg = m_eResampling;
+            }
+
+            eErr = poSource->RasterIO(
+                papoBands[nBandNr - 1]->GetRasterDataType(), nXOff, nYOff,
+                nXSize, nYSize, pabyBandData, nBufXSize, nBufYSize, eBufType,
+                nPixelSpace, nLineSpace, &sExtraArg, oWorkingState);
+        }
+    }
+    return eErr;
+}
+
 /************************************************************************/
 /*                             IRasterIO()                              */
 /************************************************************************/
@@ -3368,7 +3942,8 @@ CPLErr GDALTileIndexDataset::IRasterIO(
         dfYSize = psExtraArg->dfYSize;
     }
 
-    if (!CollectSources(dfXOff, dfYOff, dfXSize, dfYSize))
+    if (!CollectSources(dfXOff, dfYOff, dfXSize, dfYSize,
+                        /* bMultiThreadAllowed = */ true))
     {
         return CE_Failure;
     }
@@ -3382,364 +3957,232 @@ CPLErr GDALTileIndexDataset::IRasterIO(
         nBandNrMax = std::max(nBandNrMax, nBandNr);
     }
 
-    const bool bNeedInitBuffer = NeedInitBuffer(nBandCount, panBandMap);
+    const bool bNeedInitBuffer =
+        m_bLastMustUseMultiThreading || NeedInitBuffer(nBandCount, panBandMap);
 
-    const auto RenderSource = [this, bNeedInitBuffer, nBandNrMax, nXOff, nYOff,
-                               nXSize, nYSize, dfXOff, dfYOff, dfXSize, dfYSize,
-                               nBufXSize, nBufYSize, pData, eBufType,
-                               nBandCount, panBandMap, nPixelSpace, nLineSpace,
-                               nBandSpace, psExtraArg](SourceDesc &oSourceDesc)
+    if (!bNeedInitBuffer)
+    {
+        return RenderSource(
+            m_aoSourceDesc.back(), bNeedInitBuffer, nBandNrMax, nXOff, nYOff,
+            nXSize, nYSize, dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize,
+            nBufYSize, pData, eBufType, nBandCount, panBandMap, nPixelSpace,
+            nLineSpace, nBandSpace, psExtraArg, m_oWorkingState);
+    }
+    else
     {
-        auto &poTileDS = oSourceDesc.poDS;
-        auto &poSource = oSourceDesc.poSource;
-        auto poComplexSource = dynamic_cast<VRTComplexSource *>(poSource.get());
-        CPLErr eErr = CE_None;
+        InitBuffer(pData, nBufXSize, nBufYSize, eBufType, nBandCount,
+                   panBandMap, nPixelSpace, nLineSpace, nBandSpace);
 
-        if (poTileDS->GetRasterCount() + 1 == nBandNrMax &&
-            GetRasterBand(nBandNrMax)->GetColorInterpretation() ==
-                GCI_AlphaBand &&
-            GetRasterBand(nBandNrMax)->GetRasterDataType() == GDT_Byte)
+        if (m_bLastMustUseMultiThreading)
         {
-            // Special case when there's typically a mix of RGB and RGBA source
-            // datasets and we read a RGB one.
-            for (int iBand = 0; iBand < nBandCount && eErr == CE_None; ++iBand)
+            std::atomic<bool> bSuccess = true;
+            const int nContributingSources =
+                static_cast<int>(m_aoSourceDesc.size());
+            CPLWorkerThreadPool *psThreadPool = GDALGetGlobalThreadPool(
+                std::min(nContributingSources, m_nNumThreads));
+            const int nThreads =
+                std::min(nContributingSources, psThreadPool->GetThreadCount());
+            CPLDebugOnly("GTI",
+                         "IRasterIO(): use optimized "
+                         "multi-threaded code path. "
+                         "Using %d threads",
+                         nThreads);
+
             {
-                const int nBandNr = panBandMap[iBand];
-                if (nBandNr == nBandNrMax)
+                std::lock_guard oLock(m_oQueueWorkingStates.oMutex);
+                if (m_oQueueWorkingStates.oStates.size() <
+                    static_cast<size_t>(nThreads))
                 {
-                    // The window we will actually request from the source raster band.
-                    double dfReqXOff = 0.0;
-                    double dfReqYOff = 0.0;
-                    double dfReqXSize = 0.0;
-                    double dfReqYSize = 0.0;
-                    int nReqXOff = 0;
-                    int nReqYOff = 0;
-                    int nReqXSize = 0;
-                    int nReqYSize = 0;
-
-                    // The window we will actual set _within_ the pData buffer.
-                    int nOutXOff = 0;
-                    int nOutYOff = 0;
-                    int nOutXSize = 0;
-                    int nOutYSize = 0;
-
-                    bool bError = false;
-
-                    auto poTileBand = poTileDS->GetRasterBand(1);
-                    poSource->SetRasterBand(poTileBand, false);
-                    if (poSource->GetSrcDstWindow(
-                            dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize,
-                            nBufYSize, &dfReqXOff, &dfReqYOff, &dfReqXSize,
-                            &dfReqYSize, &nReqXOff, &nReqYOff, &nReqXSize,
-                            &nReqYSize, &nOutXOff, &nOutYOff, &nOutXSize,
-                            &nOutYSize, bError))
-                    {
-                        GByte *pabyOut =
-                            static_cast<GByte *>(pData) +
-                            static_cast<GPtrDiff_t>(iBand * nBandSpace +
-                                                    nOutXOff * nPixelSpace +
-                                                    nOutYOff * nLineSpace);
-
-                        constexpr GByte n255 = 255;
-                        for (int iY = 0; iY < nOutYSize; iY++)
-                        {
-                            GDALCopyWords(&n255, GDT_Byte, 0,
-                                          pabyOut + static_cast<GPtrDiff_t>(
-                                                        iY * nLineSpace),
-                                          eBufType,
-                                          static_cast<int>(nPixelSpace),
-                                          nOutXSize);
-                        }
-                    }
+                    m_oQueueWorkingStates.oStates.resize(nThreads);
                 }
-                else
+                for (int i = 0; i < nThreads; ++i)
                 {
-                    auto poTileBand = poTileDS->GetRasterBand(nBandNr);
-                    if (poComplexSource)
-                    {
-                        int bHasNoData = false;
-                        const double dfNoDataValue =
-                            poTileBand->GetNoDataValue(&bHasNoData);
-                        poComplexSource->SetNoDataValue(
-                            bHasNoData ? dfNoDataValue : VRT_NODATA_UNSET);
-                    }
-                    poSource->SetRasterBand(poTileBand, false);
-
-                    GDALRasterIOExtraArg sExtraArg;
-                    INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-                    if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                        sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-                    else
-                        sExtraArg.eResampleAlg = m_eResampling;
-
-                    GByte *pabyBandData =
-                        static_cast<GByte *>(pData) + iBand * nBandSpace;
-                    eErr = poSource->RasterIO(
-                        poTileBand->GetRasterDataType(), nXOff, nYOff, nXSize,
-                        nYSize, pabyBandData, nBufXSize, nBufYSize, eBufType,
-                        nPixelSpace, nLineSpace, &sExtraArg, m_oWorkingState);
+                    if (!m_oQueueWorkingStates.oStates[i])
+                        m_oQueueWorkingStates.oStates[i] =
+                            std::make_unique<VRTSource::WorkingState>();
                 }
             }
-            return eErr;
-        }
-        else if (poTileDS->GetRasterCount() < nBandNrMax)
-        {
-            CPLError(CE_Failure, CPLE_AppDefined, "%s has not enough bands.",
-                     oSourceDesc.osName.c_str());
-            return CE_Failure;
-        }
 
-        if ((oSourceDesc.poMaskBand && bNeedInitBuffer) || nBandNrMax == 0)
-        {
-            // The window we will actually request from the source raster band.
-            double dfReqXOff = 0.0;
-            double dfReqYOff = 0.0;
-            double dfReqXSize = 0.0;
-            double dfReqYSize = 0.0;
-            int nReqXOff = 0;
-            int nReqYOff = 0;
-            int nReqXSize = 0;
-            int nReqYSize = 0;
-
-            // The window we will actual set _within_ the pData buffer.
-            int nOutXOff = 0;
-            int nOutYOff = 0;
-            int nOutXSize = 0;
-            int nOutYSize = 0;
-
-            bool bError = false;
-
-            auto poFirstTileBand = poTileDS->GetRasterBand(1);
-            poSource->SetRasterBand(poFirstTileBand, false);
-            if (poSource->GetSrcDstWindow(
-                    dfXOff, dfYOff, dfXSize, dfYSize, nBufXSize, nBufYSize,
-                    &dfReqXOff, &dfReqYOff, &dfReqXSize, &dfReqYSize, &nReqXOff,
-                    &nReqYOff, &nReqXSize, &nReqYSize, &nOutXOff, &nOutYOff,
-                    &nOutXSize, &nOutYSize, bError))
+            auto oQueue = psThreadPool->CreateJobQueue();
+            std::atomic<int> nCompletedJobs = 0;
+            std::string osErrorMsg;
+            for (auto &oSourceDesc : m_aoSourceDesc)
             {
-                int iMaskBandIdx = -1;
-                if (eBufType == GDT_Byte && nBandNrMax == 0)
-                {
-                    // when called from m_poMaskBand
-                    iMaskBandIdx = 0;
-                }
-                else if (oSourceDesc.poMaskBand)
+                auto psJob = new RasterIOJob();
+                psJob->poDS = this;
+                psJob->pbSuccess = &bSuccess;
+                psJob->pnCompletedJobs = &nCompletedJobs;
+                psJob->poQueueWorkingStates = &m_oQueueWorkingStates;
+                psJob->nBandNrMax = nBandNrMax;
+                psJob->posErrorMsg = &osErrorMsg;
+                psJob->nXOff = nXOff;
+                psJob->nYOff = nYOff;
+                psJob->nXSize = nXSize;
+                psJob->nYSize = nYSize;
+                psJob->pData = pData;
+                psJob->nBufXSize = nBufXSize;
+                psJob->nBufYSize = nBufYSize;
+                psJob->eBufType = eBufType;
+                psJob->nBandCount = nBandCount;
+                psJob->panBandMap = panBandMap;
+                psJob->nPixelSpace = nPixelSpace;
+                psJob->nLineSpace = nLineSpace;
+                psJob->nBandSpace = nBandSpace;
+                psJob->psExtraArg = psExtraArg;
+
+                psJob->osTileName = oSourceDesc.poFeature->GetFieldAsString(
+                    m_nLocationFieldIndex);
+
+                if (!oQueue->SubmitJob(RasterIOJob::Func, psJob))
                 {
-                    // If we request a Byte buffer and the mask band is actually
-                    // one of the queried bands of this request, we can save
-                    // requesting it separately.
-                    const int nMaskBandNr = oSourceDesc.poMaskBand->GetBand();
-                    if (eBufType == GDT_Byte && nMaskBandNr >= 1 &&
-                        nMaskBandNr <= poTileDS->GetRasterCount() &&
-                        poTileDS->GetRasterBand(nMaskBandNr) ==
-                            oSourceDesc.poMaskBand)
-                    {
-                        for (int iBand = 0; iBand < nBandCount; ++iBand)
-                        {
-                            if (panBandMap[iBand] == nMaskBandNr)
-                            {
-                                iMaskBandIdx = iBand;
-                                break;
-                            }
-                        }
-                    }
+                    delete psJob;
+                    bSuccess = false;
+                    break;
                 }
+            }
 
-                GDALRasterIOExtraArg sExtraArg;
-                INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-                if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                    sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-                else
-                    sExtraArg.eResampleAlg = m_eResampling;
-                sExtraArg.bFloatingPointWindowValidity = TRUE;
-                sExtraArg.dfXOff = dfReqXOff;
-                sExtraArg.dfYOff = dfReqYOff;
-                sExtraArg.dfXSize = dfReqXSize;
-                sExtraArg.dfYSize = dfReqYSize;
-
-                if (iMaskBandIdx < 0 && oSourceDesc.abyMask.empty() &&
-                    oSourceDesc.poMaskBand)
+            while (oQueue->WaitEvent())
+            {
+                // Quite rough progress callback. We could do better by counting
+                // the number of contributing pixels.
+                if (psExtraArg->pfnProgress)
                 {
-                    // Fetch the mask band
-                    try
-                    {
-                        oSourceDesc.abyMask.resize(
-                            static_cast<size_t>(nOutXSize) * nOutYSize);
-                    }
-                    catch (const std::bad_alloc &)
-                    {
-                        CPLError(CE_Failure, CPLE_OutOfMemory,
-                                 "Cannot allocate working buffer for mask");
-                        return CE_Failure;
-                    }
-
-                    if (oSourceDesc.poMaskBand->RasterIO(
-                            GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
-                            oSourceDesc.abyMask.data(), nOutXSize, nOutYSize,
-                            GDT_Byte, 0, 0, &sExtraArg) != CE_None)
-                    {
-                        oSourceDesc.abyMask.clear();
-                        return CE_Failure;
-                    }
+                    psExtraArg->pfnProgress(double(nCompletedJobs.load()) /
+                                                nContributingSources,
+                                            "", psExtraArg->pProgressData);
                 }
+            }
 
-                // Allocate a temporary contiguous buffer to receive pixel data
-                const int nBufTypeSize = GDALGetDataTypeSizeBytes(eBufType);
-                const size_t nWorkBufferBandSize =
-                    static_cast<size_t>(nOutXSize) * nOutYSize * nBufTypeSize;
-                std::vector<GByte> abyWorkBuffer;
-                try
-                {
-                    abyWorkBuffer.resize(nBandCount * nWorkBufferBandSize);
-                }
-                catch (const std::bad_alloc &)
-                {
-                    CPLError(CE_Failure, CPLE_OutOfMemory,
-                             "Cannot allocate working buffer");
-                    return CE_Failure;
-                }
+            if (!osErrorMsg.empty())
+            {
+                CPLError(CE_Failure, CPLE_AppDefined, "%s", osErrorMsg.c_str());
+            }
 
-                const GByte *const pabyMask =
-                    iMaskBandIdx >= 0 ? abyWorkBuffer.data() +
-                                            iMaskBandIdx * nWorkBufferBandSize
-                                      : oSourceDesc.abyMask.data();
+            if (bSuccess && psExtraArg->pfnProgress)
+            {
+                psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
+            }
 
-                if (nBandNrMax == 0)
-                {
-                    // Special case when called from m_poMaskBand
-                    if (poTileDS->GetRasterBand(1)->GetMaskBand()->RasterIO(
-                            GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
-                            abyWorkBuffer.data(), nOutXSize, nOutYSize,
-                            eBufType, 0, 0, &sExtraArg) != CE_None)
-                    {
-                        return CE_Failure;
-                    }
-                }
-                else if (poTileDS->RasterIO(
-                             GF_Read, nReqXOff, nReqYOff, nReqXSize, nReqYSize,
-                             abyWorkBuffer.data(), nOutXSize, nOutYSize,
-                             eBufType, nBandCount, panBandMap, 0, 0, 0,
-                             &sExtraArg) != CE_None)
-                {
+            return bSuccess ? CE_None : CE_Failure;
+        }
+        else
+        {
+            // Now render from bottom of the stack to top.
+            for (auto &oSourceDesc : m_aoSourceDesc)
+            {
+                if (oSourceDesc.poDS &&
+                    RenderSource(oSourceDesc, bNeedInitBuffer, nBandNrMax,
+                                 nXOff, nYOff, nXSize, nYSize, dfXOff, dfYOff,
+                                 dfXSize, dfYSize, nBufXSize, nBufYSize, pData,
+                                 eBufType, nBandCount, panBandMap, nPixelSpace,
+                                 nLineSpace, nBandSpace, psExtraArg,
+                                 m_oWorkingState) != CE_None)
                     return CE_Failure;
-                }
-
-                // Compose the temporary contiguous buffer into the target
-                // buffer, taking into account the mask
-                GByte *pabyOut =
-                    static_cast<GByte *>(pData) +
-                    static_cast<GPtrDiff_t>(nOutXOff * nPixelSpace +
-                                            nOutYOff * nLineSpace);
+            }
 
-                for (int iBand = 0; iBand < nBandCount && eErr == CE_None;
-                     ++iBand)
-                {
-                    GByte *pabyDestBand =
-                        pabyOut + static_cast<GPtrDiff_t>(iBand * nBandSpace);
-                    const GByte *pabySrc =
-                        abyWorkBuffer.data() + iBand * nWorkBufferBandSize;
-
-                    CompositeSrcWithMaskIntoDest(nOutXSize, nOutYSize, eBufType,
-                                                 nBufTypeSize, nPixelSpace,
-                                                 nLineSpace, pabySrc, pabyMask,
-                                                 pabyDestBand);
-                }
+            if (psExtraArg->pfnProgress)
+            {
+                psExtraArg->pfnProgress(1.0, "", psExtraArg->pProgressData);
             }
+
+            return CE_None;
         }
-        else if (m_bSameDataType && !bNeedInitBuffer && oSourceDesc.bHasNoData)
-        {
-            // We create a non-VRTComplexSource SimpleSource copy of poSource
-            // to be able to call DatasetRasterIO()
-            VRTSimpleSource oSimpleSource(poSource.get(), 1.0, 1.0);
+    }
+}
 
-            GDALRasterIOExtraArg sExtraArg;
-            INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-            if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-            else
-                sExtraArg.eResampleAlg = m_eResampling;
+/************************************************************************/
+/*                 GDALTileIndexDataset::RasterIOJob::Func()            */
+/************************************************************************/
 
-            auto poTileBand = poTileDS->GetRasterBand(panBandMap[0]);
-            oSimpleSource.SetRasterBand(poTileBand, false);
-            eErr = oSimpleSource.DatasetRasterIO(
-                papoBands[0]->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
-                pData, nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
-                nPixelSpace, nLineSpace, nBandSpace, &sExtraArg);
-        }
-        else if (m_bSameDataType && !poComplexSource)
-        {
-            auto poTileBand = poTileDS->GetRasterBand(panBandMap[0]);
-            poSource->SetRasterBand(poTileBand, false);
+void GDALTileIndexDataset::RasterIOJob::Func(void *pData)
+{
+    auto psJob =
+        std::unique_ptr<RasterIOJob>(static_cast<RasterIOJob *>(pData));
+    if (*psJob->pbSuccess)
+    {
+        const std::string osTileName(GetAbsoluteFileName(
+            psJob->osTileName.c_str(), psJob->poDS->GetDescription()));
 
-            GDALRasterIOExtraArg sExtraArg;
-            INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-            if (poTileBand->GetColorTable())
-                sExtraArg.eResampleAlg = GRIORA_NearestNeighbour;
-            else if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-            else
-                sExtraArg.eResampleAlg = m_eResampling;
+        SourceDesc oSourceDesc;
 
-            eErr = poSource->DatasetRasterIO(
-                papoBands[0]->GetRasterDataType(), nXOff, nYOff, nXSize, nYSize,
-                pData, nBufXSize, nBufYSize, eBufType, nBandCount, panBandMap,
-                nPixelSpace, nLineSpace, nBandSpace, &sExtraArg);
+        std::vector<CPLErrorHandlerAccumulatorStruct> aoErrors;
+        CPLInstallErrorHandlerAccumulator(aoErrors);
+        const bool bCanOpenSource =
+            psJob->poDS->GetSourceDesc(osTileName, oSourceDesc,
+                                       &psJob->poQueueWorkingStates->oMutex) &&
+            oSourceDesc.poDS;
+        CPLUninstallErrorHandlerAccumulator();
+
+        if (!bCanOpenSource)
+        {
+            if (!aoErrors.empty())
+            {
+                std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+                if (psJob->posErrorMsg->empty())
+                    *(psJob->posErrorMsg) = aoErrors.back().msg;
+            }
+            *psJob->pbSuccess = false;
         }
         else
         {
-            for (int i = 0; i < nBandCount && eErr == CE_None; ++i)
+            GDALRasterIOExtraArg sArg = *(psJob->psExtraArg);
+            sArg.pfnProgress = nullptr;
+            sArg.pProgressData = nullptr;
+
+            std::unique_ptr<VRTSource::WorkingState> poWorkingState;
             {
-                const int nBandNr = panBandMap[i];
-                GByte *pabyBandData =
-                    static_cast<GByte *>(pData) + i * nBandSpace;
-                auto poTileBand = poTileDS->GetRasterBand(nBandNr);
-                if (poComplexSource)
+                std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+                poWorkingState =
+                    std::move(psJob->poQueueWorkingStates->oStates.back());
+                psJob->poQueueWorkingStates->oStates.pop_back();
+                CPLAssert(poWorkingState.get());
+            }
+
+            double dfXOff = psJob->nXOff;
+            double dfYOff = psJob->nYOff;
+            double dfXSize = psJob->nXSize;
+            double dfYSize = psJob->nYSize;
+            if (psJob->psExtraArg->bFloatingPointWindowValidity)
+            {
+                dfXOff = psJob->psExtraArg->dfXOff;
+                dfYOff = psJob->psExtraArg->dfYOff;
+                dfXSize = psJob->psExtraArg->dfXSize;
+                dfYSize = psJob->psExtraArg->dfYSize;
+            }
+
+            aoErrors.clear();
+            CPLInstallErrorHandlerAccumulator(aoErrors);
+            const bool bRenderOK =
+                psJob->poDS->RenderSource(
+                    oSourceDesc, /*bNeedInitBuffer = */ true, psJob->nBandNrMax,
+                    psJob->nXOff, psJob->nYOff, psJob->nXSize, psJob->nYSize,
+                    dfXOff, dfYOff, dfXSize, dfYSize, psJob->nBufXSize,
+                    psJob->nBufYSize, psJob->pData, psJob->eBufType,
+                    psJob->nBandCount, psJob->panBandMap, psJob->nPixelSpace,
+                    psJob->nLineSpace, psJob->nBandSpace, &sArg,
+                    *(poWorkingState.get())) == CE_None;
+            CPLUninstallErrorHandlerAccumulator();
+
+            if (!bRenderOK)
+            {
+                if (!aoErrors.empty())
                 {
-                    int bHasNoData = false;
-                    const double dfNoDataValue =
-                        poTileBand->GetNoDataValue(&bHasNoData);
-                    poComplexSource->SetNoDataValue(
-                        bHasNoData ? dfNoDataValue : VRT_NODATA_UNSET);
+                    std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+                    if (psJob->posErrorMsg->empty())
+                        *(psJob->posErrorMsg) = aoErrors.back().msg;
                 }
-                poSource->SetRasterBand(poTileBand, false);
-
-                GDALRasterIOExtraArg sExtraArg;
-                INIT_RASTERIO_EXTRA_ARG(sExtraArg);
-                if (poTileBand->GetColorTable())
-                    sExtraArg.eResampleAlg = GRIORA_NearestNeighbour;
-                else if (psExtraArg->eResampleAlg != GRIORA_NearestNeighbour)
-                    sExtraArg.eResampleAlg = psExtraArg->eResampleAlg;
-                else
-                    sExtraArg.eResampleAlg = m_eResampling;
+                *psJob->pbSuccess = false;
+            }
 
-                eErr = poSource->RasterIO(
-                    papoBands[nBandNr - 1]->GetRasterDataType(), nXOff, nYOff,
-                    nXSize, nYSize, pabyBandData, nBufXSize, nBufYSize,
-                    eBufType, nPixelSpace, nLineSpace, &sExtraArg,
-                    m_oWorkingState);
+            {
+                std::lock_guard oLock(psJob->poQueueWorkingStates->oMutex);
+                psJob->poQueueWorkingStates->oStates.push_back(
+                    std::move(poWorkingState));
             }
         }
-        return eErr;
-    };
-
-    if (!bNeedInitBuffer)
-    {
-        return RenderSource(m_aoSourceDesc.back());
     }
-    else
-    {
-        InitBuffer(pData, nBufXSize, nBufYSize, eBufType, nBandCount,
-                   panBandMap, nPixelSpace, nLineSpace, nBandSpace);
 
-        // Now render from bottom of the stack to top.
-        for (auto &oSourceDesc : m_aoSourceDesc)
-        {
-            if (oSourceDesc.poDS && RenderSource(oSourceDesc) != CE_None)
-                return CE_Failure;
-        }
-
-        return CE_None;
-    }
+    ++(*psJob->pnCompletedJobs);
 }
 
 /************************************************************************/
@@ -3765,20 +4208,24 @@ void GDALRegister_GTI()
 
     poDriver->SetMetadataItem(GDAL_DCAP_VIRTUALIO, "YES");
 
-    poDriver->SetMetadataItem(GDAL_DMD_OPENOPTIONLIST,
-                              "<OpenOptionList>"
-                              "  <Option name='LAYER' type='string'/>"
-                              "  <Option name='LOCATION_FIELD' type='string'/>"
-                              "  <Option name='SORT_FIELD' type='string'/>"
-                              "  <Option name='SORT_FIELD_ASC' type='boolean'/>"
-                              "  <Option name='FILTER' type='string'/>"
-                              "  <Option name='RESX' type='float'/>"
-                              "  <Option name='RESY' type='float'/>"
-                              "  <Option name='MINX' type='float'/>"
-                              "  <Option name='MINY' type='float'/>"
-                              "  <Option name='MAXX' type='float'/>"
-                              "  <Option name='MAXY' type='float'/>"
-                              "</OpenOptionList>");
+    poDriver->SetMetadataItem(
+        GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "  <Option name='LAYER' type='string'/>"
+        "  <Option name='LOCATION_FIELD' type='string'/>"
+        "  <Option name='SORT_FIELD' type='string'/>"
+        "  <Option name='SORT_FIELD_ASC' type='boolean'/>"
+        "  <Option name='FILTER' type='string'/>"
+        "  <Option name='RESX' type='float'/>"
+        "  <Option name='RESY' type='float'/>"
+        "  <Option name='MINX' type='float'/>"
+        "  <Option name='MINY' type='float'/>"
+        "  <Option name='MAXX' type='float'/>"
+        "  <Option name='MAXY' type='float'/>"
+        "<Option name='NUM_THREADS' type='string' description="
+        "'Number of worker threads for reading. Can be set to ALL_CPUS' "
+        "default='ALL_CPUS'/>"
+        "</OpenOptionList>");
 
     GetGDALDriverManager()->RegisterDriver(poDriver.release());
 }

From fa5fb9ea65f50843cb5254c855cc6032cc670369 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Jul 2024 21:42:59 +0200
Subject: [PATCH 11/94] [Lint] VRTSourcedRasterBand::IGetDataCoverageStatus():
 use smart pointers

---
 frmts/vrt/vrtsourcedrasterband.cpp | 56 +++++++++++++-----------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/frmts/vrt/vrtsourcedrasterband.cpp b/frmts/vrt/vrtsourcedrasterband.cpp
index 0296ad334c24..dad40430aab3 100644
--- a/frmts/vrt/vrtsourcedrasterband.cpp
+++ b/frmts/vrt/vrtsourcedrasterband.cpp
@@ -651,8 +651,7 @@ int VRTSourcedRasterBand::IGetDataCoverageStatus(
     int /* nXOff */, int /* nYOff */, int /* nXSize */, int /* nYSize */,
     int /* nMaskFlagStop */, double *pdfDataPct)
 {
-    // TODO(rouault): Should this set pdfDataPct?
-    if (pdfDataPct != nullptr)
+    if (pdfDataPct)
         *pdfDataPct = -1.0;
     return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
            GDAL_DATA_COVERAGE_STATUS_DATA;
@@ -663,24 +662,25 @@ int VRTSourcedRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
                                                  int nMaskFlagStop,
                                                  double *pdfDataPct)
 {
-    if (pdfDataPct != nullptr)
+    if (pdfDataPct)
         *pdfDataPct = -1.0;
     int nStatus = 0;
 
-    OGRPolygon *poPolyNonCoveredBySources = new OGRPolygon();
-    OGRLinearRing *poLR = new OGRLinearRing();
-    poLR->addPoint(nXOff, nYOff);
-    poLR->addPoint(nXOff, nYOff + nYSize);
-    poLR->addPoint(nXOff + nXSize, nYOff + nYSize);
-    poLR->addPoint(nXOff + nXSize, nYOff);
-    poLR->addPoint(nXOff, nYOff);
-    poPolyNonCoveredBySources->addRingDirectly(poLR);
+    auto poPolyNonCoveredBySources = std::make_unique<OGRPolygon>();
+    {
+        auto poLR = std::make_unique<OGRLinearRing>();
+        poLR->addPoint(nXOff, nYOff);
+        poLR->addPoint(nXOff, nYOff + nYSize);
+        poLR->addPoint(nXOff + nXSize, nYOff + nYSize);
+        poLR->addPoint(nXOff + nXSize, nYOff);
+        poLR->addPoint(nXOff, nYOff);
+        poPolyNonCoveredBySources->addRingDirectly(poLR.release());
+    }
 
     for (int iSource = 0; iSource < nSources; iSource++)
     {
         if (!papoSources[iSource]->IsSimpleSource())
         {
-            delete poPolyNonCoveredBySources;
             return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
                    GDAL_DATA_COVERAGE_STATUS_DATA;
         }
@@ -705,7 +705,6 @@ int VRTSourcedRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
         {
             if (pdfDataPct)
                 *pdfDataPct = 100.0;
-            delete poPolyNonCoveredBySources;
             return GDAL_DATA_COVERAGE_STATUS_DATA;
         }
         // Check intersection of bounding boxes.
@@ -713,55 +712,48 @@ int VRTSourcedRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
             dfDstXOff < nXOff + nXSize && dfDstYOff < nYOff + nYSize)
         {
             nStatus |= GDAL_DATA_COVERAGE_STATUS_DATA;
-            if (poPolyNonCoveredBySources != nullptr)
+            if (poPolyNonCoveredBySources)
             {
                 OGRPolygon oPolySource;
-                poLR = new OGRLinearRing();
+                auto poLR = std::make_unique<OGRLinearRing>();
                 poLR->addPoint(dfDstXOff, dfDstYOff);
                 poLR->addPoint(dfDstXOff, dfDstYOff + dfDstYSize);
                 poLR->addPoint(dfDstXOff + dfDstXSize, dfDstYOff + dfDstYSize);
                 poLR->addPoint(dfDstXOff + dfDstXSize, dfDstYOff);
                 poLR->addPoint(dfDstXOff, dfDstYOff);
-                oPolySource.addRingDirectly(poLR);
-                OGRGeometry *poRes =
-                    poPolyNonCoveredBySources->Difference(&oPolySource);
-                if (poRes != nullptr && poRes->IsEmpty())
+                oPolySource.addRingDirectly(poLR.release());
+                auto poRes = std::unique_ptr<OGRGeometry>(
+                    poPolyNonCoveredBySources->Difference(&oPolySource));
+                if (poRes && poRes->IsEmpty())
                 {
-                    delete poRes;
                     if (pdfDataPct)
                         *pdfDataPct = 100.0;
-                    delete poPolyNonCoveredBySources;
                     return GDAL_DATA_COVERAGE_STATUS_DATA;
                 }
-                else if (poRes != nullptr &&
-                         poRes->getGeometryType() == wkbPolygon)
+                else if (poRes && poRes->getGeometryType() == wkbPolygon)
                 {
-                    delete poPolyNonCoveredBySources;
-                    poPolyNonCoveredBySources = poRes->toPolygon();
+                    poPolyNonCoveredBySources.reset(
+                        poRes.release()->toPolygon());
                 }
                 else
                 {
-                    delete poRes;
-                    delete poPolyNonCoveredBySources;
-                    poPolyNonCoveredBySources = nullptr;
+                    poPolyNonCoveredBySources.reset();
                 }
             }
         }
         if (nMaskFlagStop != 0 && (nStatus & nMaskFlagStop) != 0)
         {
-            delete poPolyNonCoveredBySources;
             return nStatus;
         }
     }
-    if (poPolyNonCoveredBySources != nullptr)
+    if (poPolyNonCoveredBySources)
     {
         if (!poPolyNonCoveredBySources->IsEmpty())
             nStatus |= GDAL_DATA_COVERAGE_STATUS_EMPTY;
-        if (pdfDataPct != nullptr)
+        if (pdfDataPct)
             *pdfDataPct = 100.0 * (1.0 - poPolyNonCoveredBySources->get_Area() /
                                              nXSize / nYSize);
     }
-    delete poPolyNonCoveredBySources;
     return nStatus;
 }
 #endif  // HAVE_GEOS

From feb13e2a94b91eb8cd1129b92f136f8bdd834872 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 19 Jul 2024 23:27:57 +0200
Subject: [PATCH 12/94] Shape: fix off-by-one write heap buffer overflow when
 deleting exactly 128, 232, etc. features and repacking

Fixes #10451
---
 ogr/ogrsf_frmts/shape/ogrshapelayer.cpp | 80 ++++++++-----------------
 1 file changed, 25 insertions(+), 55 deletions(-)

diff --git a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
index 49a4c3177601..432b792bd653 100644
--- a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
+++ b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
@@ -2808,66 +2808,44 @@ OGRErr OGRShapeLayer::Repack()
     /* -------------------------------------------------------------------- */
     /*      Build a list of records to be dropped.                          */
     /* -------------------------------------------------------------------- */
-    int *panRecordsToDelete = static_cast<int *>(CPLMalloc(sizeof(int) * 128));
-    int nDeleteCount = 0;
-    int nDeleteCountAlloc = 128;
+    std::vector<int> anRecordsToDelete;
     OGRErr eErr = OGRERR_NONE;
 
     CPLDebug("Shape", "REPACK: Checking if features have been deleted");
 
     if (hDBF != nullptr)
     {
-        for (int iShape = 0; iShape < nTotalShapeCount; iShape++)
+        try
         {
-            if (DBFIsRecordDeleted(hDBF, iShape))
+            for (int iShape = 0; iShape < nTotalShapeCount; iShape++)
             {
-                if (nDeleteCount == nDeleteCountAlloc)
+                if (DBFIsRecordDeleted(hDBF, iShape))
                 {
-                    const int nDeleteCountAllocNew =
-                        nDeleteCountAlloc + nDeleteCountAlloc / 3 + 32;
-                    if (nDeleteCountAlloc >= (INT_MAX - 32) / 4 * 3 ||
-                        nDeleteCountAllocNew >
-                            INT_MAX / static_cast<int>(sizeof(int)))
-                    {
-                        CPLError(CE_Failure, CPLE_AppDefined,
-                                 "Too many features to delete : %d",
-                                 nDeleteCount);
-                        CPLFree(panRecordsToDelete);
-                        return OGRERR_FAILURE;
-                    }
-                    nDeleteCountAlloc = nDeleteCountAllocNew;
-                    int *panRecordsToDeleteNew = static_cast<int *>(
-                        VSI_REALLOC_VERBOSE(panRecordsToDelete,
-                                            nDeleteCountAlloc * sizeof(int)));
-                    if (panRecordsToDeleteNew == nullptr)
-                    {
-                        CPLFree(panRecordsToDelete);
-                        return OGRERR_FAILURE;
-                    }
-                    panRecordsToDelete = panRecordsToDeleteNew;
+                    anRecordsToDelete.push_back(iShape);
+                }
+                if (VSIFEofL(VSI_SHP_GetVSIL(hDBF->fp)) ||
+                    VSIFErrorL(VSI_SHP_GetVSIL(hDBF->fp)))
+                {
+                    return OGRERR_FAILURE;  // I/O error.
                 }
-                panRecordsToDelete[nDeleteCount++] = iShape;
-            }
-            if (VSIFEofL(VSI_SHP_GetVSIL(hDBF->fp)) ||
-                VSIFErrorL(VSI_SHP_GetVSIL(hDBF->fp)))
-            {
-                CPLFree(panRecordsToDelete);
-                return OGRERR_FAILURE;  // I/O error.
             }
         }
+        catch (const std::bad_alloc &)
+        {
+            CPLError(CE_Failure, CPLE_OutOfMemory, "Out of memory in Repack()");
+            return OGRERR_FAILURE;
+        }
     }
 
     /* -------------------------------------------------------------------- */
     /*      If there are no records marked for deletion, we take no         */
     /*      action.                                                         */
     /* -------------------------------------------------------------------- */
-    if (nDeleteCount == 0 && !bSHPNeedsRepack)
+    if (anRecordsToDelete.empty() && !bSHPNeedsRepack)
     {
         CPLDebug("Shape", "REPACK: nothing to do");
-        CPLFree(panRecordsToDelete);
         return OGRERR_NONE;
     }
-    panRecordsToDelete[nDeleteCount] = -1;
 
     /* -------------------------------------------------------------------- */
     /*      Find existing filenames with exact case (see #3293).            */
@@ -2920,7 +2898,6 @@ OGRErr OGRShapeLayer::Repack()
                  "Cannot find the filename of the DBF file, but we managed to "
                  "open it before !");
         // Should not happen, really.
-        CPLFree(panRecordsToDelete);
         return OGRERR_FAILURE;
     }
 
@@ -2930,7 +2907,6 @@ OGRErr OGRShapeLayer::Repack()
                  "Cannot find the filename of the SHP file, but we managed to "
                  "open it before !");
         // Should not happen, really.
-        CPLFree(panRecordsToDelete);
         return OGRERR_FAILURE;
     }
 
@@ -2940,7 +2916,6 @@ OGRErr OGRShapeLayer::Repack()
                  "Cannot find the filename of the SHX file, but we managed to "
                  "open it before !");
         // Should not happen, really.
-        CPLFree(panRecordsToDelete);
         return OGRERR_FAILURE;
     }
 
@@ -2956,9 +2931,10 @@ OGRErr OGRShapeLayer::Repack()
     /* -------------------------------------------------------------------- */
     bool bMustReopenDBF = false;
     CPLString oTempFileDBF;
-    const int nNewRecords = nTotalShapeCount - nDeleteCount;
+    const int nNewRecords =
+        nTotalShapeCount - static_cast<int>(anRecordsToDelete.size());
 
-    if (hDBF != nullptr && nDeleteCount > 0)
+    if (hDBF != nullptr && !anRecordsToDelete.empty())
     {
         CPLDebug("Shape", "REPACK: repacking .dbf");
         bMustReopenDBF = true;
@@ -2969,8 +2945,6 @@ OGRErr OGRShapeLayer::Repack()
         DBFHandle hNewDBF = DBFCloneEmpty(hDBF, oTempFileDBF);
         if (hNewDBF == nullptr)
         {
-            CPLFree(panRecordsToDelete);
-
             CPLError(CE_Failure, CPLE_OpenFailed,
                      "Failed to create temp file %s.", oTempFileDBF.c_str());
             return OGRERR_FAILURE;
@@ -2991,12 +2965,13 @@ OGRErr OGRShapeLayer::Repack()
         /* --------------------------------------------------------------------
          */
         int iDestShape = 0;
-        int iNextDeletedShape = 0;
+        size_t iNextDeletedShape = 0;
 
         for (int iShape = 0; iShape < nTotalShapeCount && eErr == OGRERR_NONE;
              iShape++)
         {
-            if (panRecordsToDelete[iNextDeletedShape] == iShape)
+            if (iNextDeletedShape < anRecordsToDelete.size() &&
+                anRecordsToDelete[iNextDeletedShape] == iShape)
             {
                 iNextDeletedShape++;
             }
@@ -3017,7 +2992,6 @@ OGRErr OGRShapeLayer::Repack()
 
         if (eErr != OGRERR_NONE)
         {
-            CPLFree(panRecordsToDelete);
             VSIUnlink(oTempFileDBF);
             return eErr;
         }
@@ -3059,7 +3033,6 @@ OGRErr OGRShapeLayer::Repack()
         SHPHandle hNewSHP = SHPCreate(oTempFileSHP, hSHP->nShapeType);
         if (hNewSHP == nullptr)
         {
-            CPLFree(panRecordsToDelete);
             if (!oTempFileDBF.empty())
                 VSIUnlink(oTempFileDBF);
             return OGRERR_FAILURE;
@@ -3070,12 +3043,13 @@ OGRErr OGRShapeLayer::Repack()
         /*      Copy over all records that are not deleted. */
         /* --------------------------------------------------------------------
          */
-        int iNextDeletedShape = 0;
+        size_t iNextDeletedShape = 0;
 
         for (int iShape = 0; iShape < nTotalShapeCount && eErr == OGRERR_NONE;
              iShape++)
         {
-            if (panRecordsToDelete[iNextDeletedShape] == iShape)
+            if (iNextDeletedShape < anRecordsToDelete.size() &&
+                anRecordsToDelete[iNextDeletedShape] == iShape)
             {
                 iNextDeletedShape++;
             }
@@ -3125,7 +3099,6 @@ OGRErr OGRShapeLayer::Repack()
 
         if (eErr != OGRERR_NONE)
         {
-            CPLFree(panRecordsToDelete);
             VSIUnlink(oTempFileSHP);
             VSIUnlink(oTempFileSHX);
             if (!oTempFileDBF.empty())
@@ -3136,9 +3109,6 @@ OGRErr OGRShapeLayer::Repack()
         }
     }
 
-    CPLFree(panRecordsToDelete);
-    panRecordsToDelete = nullptr;
-
     // We could also use pack in place for Unix but this involves extra I/O
     // w.r.t to the delete and rename approach
 

From 3b09f4e0e5cd7c5efad1822ed9e620557c7bfd54 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Jul 2024 02:32:14 +0200
Subject: [PATCH 13/94] GTFS: fix error when applying an attribute filter on a
 field whose advertized data type is not string

Fixes https://github.com/duckdb/duckdb_spatial/issues/343
---
 autotest/ogr/ogr_gtfs.py               |  5 +++++
 ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp | 16 +++-------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/autotest/ogr/ogr_gtfs.py b/autotest/ogr/ogr_gtfs.py
index 923d989dc7d0..e8defefbed09 100755
--- a/autotest/ogr/ogr_gtfs.py
+++ b/autotest/ogr/ogr_gtfs.py
@@ -103,6 +103,11 @@ def test_ogr_gtfs_content():
     f = lyr.GetNextFeature()
     assert f is None
 
+    lyr = ds.GetLayerByName("routes")
+    assert lyr
+    lyr.SetAttributeFilter("route_type = 3")
+    assert lyr.GetFeatureCount() == 30
+
     lyr = ds.GetLayerByName("stops")
     assert lyr
     assert lyr.GetGeomType() == ogr.wkbPoint
diff --git a/ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp b/ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp
index bb86c5af78ef..a11c9a17272f 100644
--- a/ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp
+++ b/ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp
@@ -98,7 +98,6 @@ class OGRGTFSLayer final : public OGRLayer
     OGRFeature *GetNextFeature() override;
     int TestCapability(const char *) override;
     GIntBig GetFeatureCount(int bForce) override;
-    OGRErr SetAttributeFilter(const char *) override;
 
     OGRFeatureDefn *GetLayerDefn() override
     {
@@ -353,30 +352,21 @@ OGRFeature *OGRGTFSLayer::GetNextFeature()
                 }
             }
         }
-        if (m_poFilterGeom == nullptr ||
-            FilterGeometry(poFeature->GetGeometryRef()))
+        if ((!m_poFilterGeom || FilterGeometry(poFeature->GetGeometryRef())) &&
+            (!m_poAttrQuery || m_poAttrQuery->Evaluate(poFeature.get())))
         {
             return poFeature.release();
         }
     }
 }
 
-/***********************************************************************/
-/*                       SetAttributeFilter()                          */
-/***********************************************************************/
-
-OGRErr OGRGTFSLayer::SetAttributeFilter(const char *pszFilter)
-{
-    return m_poUnderlyingLayer->SetAttributeFilter(pszFilter);
-}
-
 /***********************************************************************/
 /*                          GetFeatureCount()                          */
 /***********************************************************************/
 
 GIntBig OGRGTFSLayer::GetFeatureCount(int bForce)
 {
-    if (m_poFilterGeom != nullptr)
+    if (m_poFilterGeom || m_poAttrQuery)
         return OGRLayer::GetFeatureCount(bForce);
     return m_poUnderlyingLayer->GetFeatureCount(bForce);
 }

From a3d2b4e357257d99c100225f4c10e4bf291082e9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Jul 2024 02:20:49 +0200
Subject: [PATCH 14/94] XLSX: support documents whose XML elements have a
 prefix

Fixes https://github.com/duckdb/duckdb_spatial/issues/362
---
 autotest/ogr/data/xlsx/with_xml_prefix.xlsx | Bin 0 -> 2457 bytes
 autotest/ogr/ogr_xlsx.py                    |  15 +++++++
 ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp  |  45 ++++++++++++++------
 3 files changed, 46 insertions(+), 14 deletions(-)
 create mode 100644 autotest/ogr/data/xlsx/with_xml_prefix.xlsx

diff --git a/autotest/ogr/data/xlsx/with_xml_prefix.xlsx b/autotest/ogr/data/xlsx/with_xml_prefix.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..4d23ef8ddf26261784663b877b684c626a460d78
GIT binary patch
literal 2457
zcmWIWW@Zs#U|`^2C|~h9;;~b|)q5cCE+YejFoO(3v~zx5Norn6d`M+MYH_SyMQ%=L
z2qy#cB%KLqi+{~ZE3M#WU}Sm0%)kI9)=sqbJ7OTvx;|;A>&FyL0VmIG5gCn5+!5z2
zHeRd$WZ`Wg&FcP$t75MP>mtWRQa3-}`<?dY{P+I6{Z^;_W}INT|9NhPrStkj8Go*P
zR(<_!+WYo*Pj!_xDt*23+46Y>yF-?nx@SwrzLF9Tzh^~0!Y(WOikx=j-IfkGnEqww
z$>%(FCEr&(O){>IIQ^A1`pq0!y<Ntuo*TJkPdT%cSKa<!gNbAI;sTzm!lOzWYEzWY
zcHE2%TwQSK$7(5_{YJu3zofrZYX{B=b>7^$MRDFKWi?}^>S>zxUg4h-wtkShw2{vx
z;I!YL_nV^snQ>e>FSU;$02p>$z|dk~*u?uK0?dFCY{0OKFG|fR)&~dI0$@;8GtNd2
zE|7ji*mtOXjNb{=uK^5uZn%CukSXvm|A%Qv?|I+6Lk0q@4^~HPR!^R^ic5n}+AK#<
z+~Ax==cEdq+kd{~#D4ME%M{1-YSHQCm7hJ|fB(Jw=H2O$F`7pv&TT4Hbev#(r*~a=
zfoECh;dQxvCa<SR7fRHM{5<N)>g-k5EpgVNyN|WH=x36pj@46%sxP;EcB$(u{d43)
z&VkjMe)04EDR0`kc%kj=(@uJS8TXqy%qe-Hsd?ack2&AvnUz|bxE@{5v<SO&?e)4l
zA)D6NnU!)f-DZpbwv8VVdcs1ep~npLeMJr==$-+6jK$Z8paW?ROX6eS3Jf|4V9@bH
zG?(WWWhdq5XTy^$4ug98ZTSuv@U)iu305xG<lzYY8yR8YmT}iCOW3`TYp*mjFuk@k
zy*Tycy#1%@_m%ZeuI9KEx}Kkv!?;_8wQ<`rx7+I)G`HMV4oS63H~)0FHACRzy&^O5
z3+)e#G<UwcsNr{FVejr~djb`=?VJ3@W>s7Dkp#D${+F9gyrL`qM=$%MoH+F$lNj5^
zDaFEn8$QhJTOj>I>v#Q>mAR$8>Z{b7&1#m|_GulNawq$^Ldwk3SKDHQr_B~e1RW<@
z(D5OBU!0MeS^`agmk5O-JJ6hntiUDTfuZ=72^f+X=75bega_wY>?WQKI-Pe|L152s
zZGrDBx7$~3N?K(0x54W#)1wCxM>mM&<kr_QdUra{maBTzJ9BO=&+grS*HjyMy%w1<
zOYHU>p-d?Y&Ej=0)wj(~-}U@v-a54n;@3SpkEBb4pEZ3e(B5Tuy(EZxd#j_AeD=Yt
zM!8$Y#m!S6iCiu@f6AslDN4h+(ye2?By&EK>w$?I4Fq35U%)NAQ_Vo1RW%|wwJP-q
z`>oXqUQ>1-TzXDQ|4j8E*Ka3;6n{IuEIq-0L0qw`eD00d)eQNIS*|Rxi~HZ$|LMHl
zBEDrMu}{C3PQAFyo40QdD@W+D`}Hpqe+Axff4TbMq2kgQ#<=&>)8i2lVucnVoREM-
zDh%|QW~UheF<RM)NYNl8UP#M6*a(aZIbe#GLN)?9T_ef{keMKiW@hhsLr~&oy)ZY}
z<=)C@ww8d)dOB-Xh<5}n@6DL3;kj^5Z=-S{tCHA?BL`A$-mjZ9|GRtS`Ns$Jo-}W3
zbDsG0zzL7rS(giEEQ)%+VBINUUZrKd7qZ18tPC5S<rm*pX1jS=!zoR6<`j+B?t;Ou
ztxKHdxw`K-`C0c@KJzrS?7Y5zf@_1KE*(6TsUlo|pknJknW{w`YXtW#KEe3>p)ubN
zJ=bX|3CE{3=QSpVK6-RA>nl@$HzSiAGonmHt&b#t0m8rl3=xJcjUX1*+KClXJE4UH
z#9&;7HN;>B1_6e@jy6E^VX*}?3siJtH4EWL)Pft?ku`9$pixEGahPQxvg4|NSrc3`
z0u2HcXn0(PSuP^GY&*mt<kS=zg3nM$&|wxg$gbN8YzF{c2Qn01_yElW6+U<zidpm^
zJM=GxnaBkZ&~#8igw=G2i!t*fvWwkV!7fIMZ!Eb8IZ<NfO=QP*A{&PswutD*YCbC)
OC^>TiA*k%_1M>iMUMDaB

literal 0
HcmV?d00001

diff --git a/autotest/ogr/ogr_xlsx.py b/autotest/ogr/ogr_xlsx.py
index 197563a1c964..632df94bcfab 100755
--- a/autotest/ogr/ogr_xlsx.py
+++ b/autotest/ogr/ogr_xlsx.py
@@ -650,3 +650,18 @@ def test_ogr_xlsx_write_sheet_without_row():
     assert ds.GetLayer(2).GetFeatureCount() == 1
     ds = None
     gdal.Unlink(tmpfilename)
+
+
+###############################################################################
+# Test reading a XLSX file with XML element prefixes
+
+
+def test_ogr_xlsx_read_xml_prefix():
+
+    ds = ogr.Open("data/xlsx/with_xml_prefix.xlsx")
+    lyr = ds.GetLayer(0)
+    assert lyr.GetLayerDefn().GetFieldDefn(0).GetName() == "Col1"
+    assert lyr.GetLayerDefn().GetFieldDefn(1).GetName() == "Col2"
+    f = lyr.GetNextFeature()
+    assert f["Col1"] == "foo"
+    assert f["Col2"] == "bar"
diff --git a/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp b/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
index 7222ca2ef468..9590b7b5f20b 100644
--- a/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
+++ b/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp
@@ -418,6 +418,18 @@ int OGRXLSXDataSource::Create(const char *pszFilename,
     return TRUE;
 }
 
+/************************************************************************/
+/*                           GetUnprefixed()                            */
+/************************************************************************/
+
+static const char *GetUnprefixed(const char *pszStr)
+{
+    const char *pszColumn = strchr(pszStr, ':');
+    if (pszColumn)
+        return pszColumn + 1;
+    return pszStr;
+}
+
 /************************************************************************/
 /*                           startElementCbk()                          */
 /************************************************************************/
@@ -434,6 +446,8 @@ void OGRXLSXDataSource::startElementCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     switch (stateStack[nStackDepth].eVal)
     {
@@ -474,6 +488,8 @@ void OGRXLSXDataSource::endElementCbk(const char *pszNameIn)
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
 
     nDepth--;
@@ -1346,6 +1362,8 @@ void OGRXLSXDataSource::startElementSSCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     switch (stateStack[nStackDepth].eVal)
     {
@@ -1381,11 +1399,14 @@ static void XMLCALL endElementSSCbk(void *pUserData, const char *pszNameIn)
     ((OGRXLSXDataSource *)pUserData)->endElementSSCbk(pszNameIn);
 }
 
-void OGRXLSXDataSource::endElementSSCbk(CPL_UNUSED const char *pszNameIn)
+void OGRXLSXDataSource::endElementSSCbk(const char * /*pszNameIn*/)
 {
     if (bStopParsing)
         return;
 
+    // If we were to use pszNameIn, then we need:
+    // pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
 
     nDepth--;
@@ -1529,6 +1550,8 @@ void OGRXLSXDataSource::startElementWBRelsCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     if (strcmp(pszNameIn, "Relationship") == 0)
     {
@@ -1593,18 +1616,6 @@ void OGRXLSXDataSource::AnalyseWorkbookRels(VSILFILE *fpWorkbookRels)
     VSIFCloseL(fpWorkbookRels);
 }
 
-/************************************************************************/
-/*                           GetUnprefixed()                            */
-/************************************************************************/
-
-static const char *GetUnprefixed(const char *pszStr)
-{
-    const char *pszColumn = strchr(pszStr, ':');
-    if (pszColumn)
-        return pszColumn + 1;
-    return pszStr;
-}
-
 /************************************************************************/
 /*                          startElementWBCbk()                         */
 /************************************************************************/
@@ -1621,8 +1632,10 @@ void OGRXLSXDataSource::startElementWBCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
-    if (strcmp(GetUnprefixed(pszNameIn), "sheet") == 0)
+    if (strcmp(pszNameIn, "sheet") == 0)
     {
         const char *pszSheetName = GetAttributeValue(ppszAttr, "name", nullptr);
         const char *pszId = GetAttributeValue(ppszAttr, "r:id", nullptr);
@@ -1725,6 +1738,8 @@ void OGRXLSXDataSource::startElementStylesCbk(const char *pszNameIn,
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     if (strcmp(pszNameIn, "numFmt") == 0)
     {
@@ -1810,6 +1825,8 @@ void OGRXLSXDataSource::endElementStylesCbk(const char *pszNameIn)
     if (bStopParsing)
         return;
 
+    pszNameIn = GetUnprefixed(pszNameIn);
+
     nWithoutEventCounter = 0;
     if (strcmp(pszNameIn, "cellXfs") == 0)
     {

From 5096564ced8dcab1f47c0392a7f68713ab756933 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 22 Jul 2024 14:24:03 +0200
Subject: [PATCH 15/94] GTI: start looking for OVERVIEW_<idx>_xxxx metadata
 items at index 0

---
 autotest/gdrivers/gti.py           |  7 ++++---
 doc/source/drivers/raster/gti.rst  | 12 ++++++++----
 frmts/vrt/gdaltileindexdataset.cpp |  7 ++++++-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/autotest/gdrivers/gti.py b/autotest/gdrivers/gti.py
index 13066179ef91..ecb0eede01a8 100755
--- a/autotest/gdrivers/gti.py
+++ b/autotest/gdrivers/gti.py
@@ -2069,7 +2069,7 @@ def test_gti_ovr_factor(tmp_vsimem):
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
     lyr.SetMetadataItem("MASK_BAND", "YES")
-    lyr.SetMetadataItem("OVERVIEW_1_FACTOR", "2")
+    lyr.SetMetadataItem("OVERVIEW_0_FACTOR", "2")
     del index_ds
 
     vrt_ds = gdal.Open(index_filename)
@@ -2106,6 +2106,7 @@ def test_gti_ovr_factor_invalid(tmp_vsimem):
 
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
+    # Also test GDAL 3.9.0 and 3.9.1 where the idx started at 1
     lyr.SetMetadataItem("OVERVIEW_1_FACTOR", "0.5")
     del index_ds
 
@@ -2120,7 +2121,7 @@ def test_gti_ovr_ds_name(tmp_vsimem):
 
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
-    lyr.SetMetadataItem("OVERVIEW_1_DATASET", "/i/do/not/exist")
+    lyr.SetMetadataItem("OVERVIEW_0_DATASET", "/i/do/not/exist")
     del index_ds
 
     vrt_ds = gdal.Open(index_filename)
@@ -2134,7 +2135,7 @@ def test_gti_ovr_lyr_name(tmp_vsimem):
 
     src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
     index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
-    lyr.SetMetadataItem("OVERVIEW_1_LAYER", "non_existing")
+    lyr.SetMetadataItem("OVERVIEW_0_LAYER", "non_existing")
     del index_ds
 
     vrt_ds = gdal.Open(index_filename)
diff --git a/doc/source/drivers/raster/gti.rst b/doc/source/drivers/raster/gti.rst
index a41a41b9c02b..3afebe4b0cc3 100644
--- a/doc/source/drivers/raster/gti.rst
+++ b/doc/source/drivers/raster/gti.rst
@@ -193,25 +193,29 @@ PostGIS, ...), the following layer metadata items may be set:
 
   Unit of the band.
 
-* ``OVERVIEW_<idx>_DATASET=<string>`` where idx is an integer index starting at 0.
+* ``OVERVIEW_<idx>_DATASET=<string>`` where idx is an integer index (starting at 0
+  since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
 
   Name of the dataset to use as the first overview level. This may be a
   raster dataset (for example a GeoTIFF file, or another GTI dataset).
   This may also be a vector dataset with a GTI compatible layer, potentially
   specified with ``OVERVIEW_<idx>_LAYER``.
 
-* ``OVERVIEW_<idx>_OPEN_OPTIONS=<key1=value1>[,key2=value2]...`` where idx is an integer index starting at 0.
+* ``OVERVIEW_<idx>_OPEN_OPTIONS=<key1=value1>[,key2=value2]...`` where idx is an integer index (starting at 0
+  since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
 
   Open options(s) to use to open ``OVERVIEW_<idx>_DATASET``.
 
-* ``OVERVIEW_<idx>_LAYER=<string>`` where idx is an integer index starting at 0.
+* ``OVERVIEW_<idx>_LAYER=<string>`` where idx is an integer index (starting at 0
+  since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
 
   Name of the vector layer to use as the first overview level, assuming
   ``OVERVIEW_<idx>_DATASET`` points to a vector dataset. ``OVERVIEW_<idx>_DATASET``
   may also not be specified, in which case the vector dataset of the full
   resolution virtual mosaic is used.
 
-* ``OVERVIEW_<idx>_FACTOR=<int>`` where idx is an integer index starting at 0.
+* ``OVERVIEW_<idx>_FACTOR=<int>`` where idx is an integer index (starting at 0
+  since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
 
   Sub-sampling factor, strictly greater than 1. If ``OVERVIEW_<idx>_DATASET``
   and ``OVERVIEW_<idx>_LAYER`` are not specified, then all tiles of the full
diff --git a/frmts/vrt/gdaltileindexdataset.cpp b/frmts/vrt/gdaltileindexdataset.cpp
index 122e7f782b98..987a6f8bff27 100644
--- a/frmts/vrt/gdaltileindexdataset.cpp
+++ b/frmts/vrt/gdaltileindexdataset.cpp
@@ -1738,7 +1738,7 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
         }
         else
         {
-            for (int iOvr = 1;; ++iOvr)
+            for (int iOvr = 0;; ++iOvr)
             {
                 const char *pszOvrDSName =
                     GetOption(CPLSPrintf("OVERVIEW_%d_DATASET", iOvr));
@@ -1749,7 +1749,12 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
                 const char *pszOvrFactor =
                     GetOption(CPLSPrintf("OVERVIEW_%d_FACTOR", iOvr));
                 if (!pszOvrDSName && !pszOvrLayer && !pszOvrFactor)
+                {
+                    // Before GDAL 3.9.2, we started the iteration at 1.
+                    if (iOvr == 0)
+                        continue;
                     break;
+                }
                 m_aoOverviewDescriptor.emplace_back(
                     std::string(pszOvrDSName ? pszOvrDSName : ""),
                     pszOpenOptions ? CPLStringList(CSLTokenizeString2(

From ea8fb19b2d839299a44d52f8e9b6dd598a5e1ef5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 22 Jul 2024 14:54:58 +0200
Subject: [PATCH 16/94] gti.py: more realistic test cases for overviews

---
 autotest/gdrivers/gti.py | 41 +++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/autotest/gdrivers/gti.py b/autotest/gdrivers/gti.py
index ecb0eede01a8..f313b0c2171a 100755
--- a/autotest/gdrivers/gti.py
+++ b/autotest/gdrivers/gti.py
@@ -48,14 +48,19 @@ def create_basic_tileindex(
     sort_field_name=None,
     sort_field_type=None,
     sort_values=None,
+    lyr_name="index",
+    add_to_existing=False,
 ):
     if isinstance(src_ds, list):
         src_ds_list = src_ds
     else:
         src_ds_list = [src_ds]
-    index_ds = ogr.GetDriverByName("GPKG").CreateDataSource(index_filename)
+    if add_to_existing:
+        index_ds = ogr.Open(index_filename, update=1)
+    else:
+        index_ds = ogr.GetDriverByName("GPKG").CreateDataSource(index_filename)
     lyr = index_ds.CreateLayer(
-        "index", srs=(src_ds_list[0].GetSpatialRef() if src_ds_list else None)
+        lyr_name, srs=(src_ds_list[0].GetSpatialRef() if src_ds_list else None)
     )
     lyr.CreateField(ogr.FieldDefn(location_field_name))
     if sort_values:
@@ -2312,7 +2317,10 @@ def test_gti_xml(tmp_vsimem):
 
     index_filename = str(tmp_vsimem / "index.gti.gpkg")
 
-    src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
+    tile_filename = str(tmp_vsimem / "byte.tif")
+    gdal.Translate(tile_filename, "data/byte.tif")
+
+    src_ds = gdal.Open(tile_filename)
     index_ds, _ = create_basic_tileindex(index_filename, src_ds)
     del index_ds
 
@@ -2437,30 +2445,46 @@ def test_gti_xml(tmp_vsimem):
     assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 10
     del vrt_ds
 
+    tile_ovr_filename = str(tmp_vsimem / "byte_ovr.tif")
+    gdal.Translate(tile_ovr_filename, "data/byte.tif", width=10)
+
+    index2_filename = str(tmp_vsimem / "index2.gti.gpkg")
+    create_basic_tileindex(index2_filename, gdal.Open(tile_ovr_filename))
+
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
-          <Dataset>{index_filename}</Dataset>
+          <Dataset>{index2_filename}</Dataset>
       </Overview>
 </GDALTileIndexDataset>"""
     vrt_ds = gdal.Open(xml_content)
     assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1
-    assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 20
+    assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 10
     del vrt_ds
 
+    create_basic_tileindex(
+        index_filename,
+        gdal.Open(tile_ovr_filename),
+        add_to_existing=True,
+        lyr_name="index_ovr",
+    )
+
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
-          <Layer>index</Layer>
+          <Layer>index_ovr</Layer>
       </Overview>
 </GDALTileIndexDataset>"""
     vrt_ds = gdal.Open(xml_content)
     assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1
-    assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 20
+    assert vrt_ds.GetRasterBand(1).GetOverview(0).XSize == 10
     del vrt_ds
 
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
           <Layer>index</Layer>
           <OpenOptions>
@@ -2523,6 +2547,7 @@ def test_gti_xml(tmp_vsimem):
 
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
       </Overview>
 </GDALTileIndexDataset>"""
@@ -2534,6 +2559,7 @@ def test_gti_xml(tmp_vsimem):
 
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
           <Dataset>i_do_not_exist</Dataset>
       </Overview>
@@ -2544,6 +2570,7 @@ def test_gti_xml(tmp_vsimem):
 
     xml_content = f"""<GDALTileIndexDataset>
   <IndexDataset>{index_filename}</IndexDataset>
+  <IndexLayer>index</IndexLayer>
       <Overview>
           <Layer>i_do_not_exist</Layer>
       </Overview>

From 17c0f347490adbdd649952603ffeb5ae4d7b9f43 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 22 Jul 2024 15:09:25 +0200
Subject: [PATCH 17/94] GTI: automatically add overviews of overviews, unless
 the OVERVIEW_LEVEL=NONE open option is specified

---
 autotest/gdrivers/gti.py           | 51 ++++++++++++++++++++++++++++++
 doc/source/drivers/raster/gti.rst  | 20 ++++++++++--
 frmts/vrt/gdaltileindexdataset.cpp | 45 +++++++++++++++++++++++++-
 3 files changed, 112 insertions(+), 4 deletions(-)

diff --git a/autotest/gdrivers/gti.py b/autotest/gdrivers/gti.py
index f313b0c2171a..37cca4794e9a 100755
--- a/autotest/gdrivers/gti.py
+++ b/autotest/gdrivers/gti.py
@@ -2148,6 +2148,57 @@ def test_gti_ovr_lyr_name(tmp_vsimem):
         vrt_ds.GetRasterBand(1).GetOverviewCount()
 
 
+def test_gti_ovr_of_ovr(tmp_vsimem):
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+
+    ovr_filename = str(tmp_vsimem / "byte_ovr.tif")
+    ovr_ds = gdal.Translate(ovr_filename, "data/byte.tif", width=10)
+    ovr_ds.BuildOverviews("NEAR", [2])
+    ovr_ds = None
+
+    src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
+    index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
+    lyr.SetMetadataItem("OVERVIEW_0_DATASET", ovr_filename)
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+    ovr_ds = gdal.Open(ovr_filename)
+    assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 2
+    assert (
+        vrt_ds.GetRasterBand(1).GetOverview(0).ReadRaster()
+        == ovr_ds.GetRasterBand(1).ReadRaster()
+    )
+    assert (
+        vrt_ds.GetRasterBand(1).GetOverview(1).ReadRaster()
+        == ovr_ds.GetRasterBand(1).GetOverview(0).ReadRaster()
+    )
+
+
+def test_gti_ovr_of_ovr_OVERVIEW_LEVEL_NONE(tmp_vsimem):
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+
+    ovr_filename = str(tmp_vsimem / "byte_ovr.tif")
+    ovr_ds = gdal.Translate(ovr_filename, "data/byte.tif", width=10)
+    ovr_ds.BuildOverviews("NEAR", [2])
+    ovr_ds = None
+
+    src_ds = gdal.Open(os.path.join(os.getcwd(), "data", "byte.tif"))
+    index_ds, lyr = create_basic_tileindex(index_filename, src_ds)
+    lyr.SetMetadataItem("OVERVIEW_0_DATASET", ovr_filename)
+    lyr.SetMetadataItem("OVERVIEW_0_OPEN_OPTIONS", "OVERVIEW_LEVEL=NONE")
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+    ovr_ds = gdal.Open(ovr_filename)
+    assert vrt_ds.GetRasterBand(1).GetOverviewCount() == 1
+    assert (
+        vrt_ds.GetRasterBand(1).GetOverview(0).ReadRaster()
+        == ovr_ds.GetRasterBand(1).ReadRaster()
+    )
+
+
 def test_gti_external_ovr(tmp_vsimem):
 
     index_filename = str(tmp_vsimem / "index.gti.gpkg")
diff --git a/doc/source/drivers/raster/gti.rst b/doc/source/drivers/raster/gti.rst
index 3afebe4b0cc3..0e6623932b12 100644
--- a/doc/source/drivers/raster/gti.rst
+++ b/doc/source/drivers/raster/gti.rst
@@ -201,6 +201,10 @@ PostGIS, ...), the following layer metadata items may be set:
   This may also be a vector dataset with a GTI compatible layer, potentially
   specified with ``OVERVIEW_<idx>_LAYER``.
 
+  Starting with GDAL 3.9.2, overviews of ``OVERVIEW_<idx>_DATASET=<string>``
+  are also automatically added, unless ``OVERVIEW_<idx>_OPEN_OPTIONS=OVERVIEW_LEVEL=NONE``
+  is specified.
+
 * ``OVERVIEW_<idx>_OPEN_OPTIONS=<key1=value1>[,key2=value2]...`` where idx is an integer index (starting at 0
   since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
 
@@ -209,6 +213,9 @@ PostGIS, ...), the following layer metadata items may be set:
 * ``OVERVIEW_<idx>_LAYER=<string>`` where idx is an integer index (starting at 0
   since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
 
+  Only taken into account if ``OVERVIEW_<idx>_DATASET=<string>`` is not specified,
+  or points to a GTI dataset.
+
   Name of the vector layer to use as the first overview level, assuming
   ``OVERVIEW_<idx>_DATASET`` points to a vector dataset. ``OVERVIEW_<idx>_DATASET``
   may also not be specified, in which case the vector dataset of the full
@@ -217,8 +224,12 @@ PostGIS, ...), the following layer metadata items may be set:
 * ``OVERVIEW_<idx>_FACTOR=<int>`` where idx is an integer index (starting at 0
   since GDAL 3.9.2, starting at 1 in GDAL 3.9.0 and 3.9.1)
 
-  Sub-sampling factor, strictly greater than 1. If ``OVERVIEW_<idx>_DATASET``
-  and ``OVERVIEW_<idx>_LAYER`` are not specified, then all tiles of the full
+  Sub-sampling factor, strictly greater than 1.
+
+  Only taken into account if ``OVERVIEW_<idx>_DATASET=<string>`` is not specified,
+  or points to a GTI dataset.
+
+  If ``OVERVIEW_<idx>_DATASET`` and ``OVERVIEW_<idx>_LAYER`` are not specified, then all tiles of the full
   resolution virtual mosaic are used, with the specified sub-sampling factor
   (it is recommended, but not required, that those tiles do have a corresponding overview).
   ``OVERVIEW_<idx>_DATASET`` and/or ``OVERVIEW_<idx>_LAYER`` may also be
@@ -228,6 +239,8 @@ All overviews *must* have exactly the same extent as the full resolution
 virtual mosaic. The GTI driver does not check that, and if that condition is
 not met, subsampled pixel request will lead to incorrect result.
 
+They also must be listed by decreasing size with increasing overview index.
+
 In addition to those layer metadata items, the dataset-level metadata item
 ``TILE_INDEX_LAYER`` may be set to indicate, for dataset with multiple layers,
 which one should be used as the tile index layer.
@@ -316,7 +329,8 @@ mentioned in the previous section.
         </Overview>
         <Overview>                                     <!-- optional -->
             <!-- 3rd overview level (and potentially 4th, 5th... depending on
-                 the number of overview levels in the pointed GeoTIFF file)
+                 the number of overview levels in the pointed GeoTIFF file.
+                 Only since GDAL 3.9.2)
             -->
             <Dataset>some.tif</Dataset>
         </Overview>
diff --git a/frmts/vrt/gdaltileindexdataset.cpp b/frmts/vrt/gdaltileindexdataset.cpp
index 987a6f8bff27..cc2b8310ea8f 100644
--- a/frmts/vrt/gdaltileindexdataset.cpp
+++ b/frmts/vrt/gdaltileindexdataset.cpp
@@ -2199,11 +2199,54 @@ void GDALTileIndexDataset::LoadOverviews()
                 !osDSName.empty() ? osDSName.c_str() : GetDescription(),
                 GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR, nullptr,
                 aosNewOpenOptions.List(), nullptr));
-            if (poOvrDS)
+
+            const auto IsSmaller =
+                [](const GDALDataset *a, const GDALDataset *b)
+            {
+                return (a->GetRasterXSize() < b->GetRasterXSize() &&
+                        a->GetRasterYSize() <= b->GetRasterYSize()) ||
+                       (a->GetRasterYSize() < b->GetRasterYSize() &&
+                        a->GetRasterXSize() <= b->GetRasterXSize());
+            };
+
+            if (poOvrDS &&
+                ((m_apoOverviews.empty() && IsSmaller(poOvrDS.get(), this)) ||
+                 ((!m_apoOverviews.empty() &&
+                   IsSmaller(poOvrDS.get(), m_apoOverviews.back().get())))))
             {
                 if (poOvrDS->GetRasterCount() == GetRasterCount())
                 {
                     m_apoOverviews.emplace_back(std::move(poOvrDS));
+                    // Add the overviews of the overview, unless the OVERVIEW_LEVEL
+                    // option option is specified
+                    if (aosOpenOptions.FetchNameValue("OVERVIEW_LEVEL") ==
+                        nullptr)
+                    {
+                        const int nOverviewCount = m_apoOverviews.back()
+                                                       ->GetRasterBand(1)
+                                                       ->GetOverviewCount();
+                        for (int i = 0; i < nOverviewCount; ++i)
+                        {
+                            aosNewOpenOptions.SetNameValue("OVERVIEW_LEVEL",
+                                                           CPLSPrintf("%d", i));
+                            std::unique_ptr<GDALDataset> poOvrOfOvrDS(
+                                GDALDataset::Open(
+                                    !osDSName.empty() ? osDSName.c_str()
+                                                      : GetDescription(),
+                                    GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR,
+                                    nullptr, aosNewOpenOptions.List(),
+                                    nullptr));
+                            if (poOvrOfOvrDS &&
+                                poOvrOfOvrDS->GetRasterCount() ==
+                                    GetRasterCount() &&
+                                IsSmaller(poOvrOfOvrDS.get(),
+                                          m_apoOverviews.back().get()))
+                            {
+                                m_apoOverviews.emplace_back(
+                                    std::move(poOvrOfOvrDS));
+                            }
+                        }
+                    }
                 }
                 else
                 {

From 6f27ac888e236576b14fec946139e97d7da9142c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 22 Jul 2024 17:00:15 +0200
Subject: [PATCH 18/94] GeoJSON: make sure geometry is reprojected even when it
 is invalid after coordinate rounding (3.9.0 regression)

Fixes https://github.com/qgis/QGIS/issues/58169
---
 autotest/ogr/ogr_geojson.py                   |  1 +
 .../geojson/ogrgeojsonwritelayer.cpp          | 49 ++++++++++++++-----
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/autotest/ogr/ogr_geojson.py b/autotest/ogr/ogr_geojson.py
index 804c91a92521..5cc7b962ffb5 100755
--- a/autotest/ogr/ogr_geojson.py
+++ b/autotest/ogr/ogr_geojson.py
@@ -4487,6 +4487,7 @@ def test_ogr_geojson_write_geometry_validity_fixing_rfc7946(tmp_vsimem):
     lyr = ds.GetLayer(0)
     f = lyr.GetNextFeature()
     assert f.GetGeometryRef().IsValid()
+    assert "((6.3889058 51.3181847," in f.GetGeometryRef().ExportToWkt()
 
 
 ###############################################################################
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
index 1ddb6922b0b6..d77827fc2ee5 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp
@@ -256,19 +256,45 @@ OGRErr OGRGeoJSONWriteLayer::ICreateFeature(OGRFeature *poFeature)
     {
         const double dfXYResolution =
             std::pow(10.0, double(-oWriteOptions_.nXYCoordPrecision));
-        auto poNewGeom = poFeature == poFeatureToWrite
-                             ? poOrigGeom->clone()
-                             : poFeatureToWrite->GetGeometryRef();
-        bool bDeleteNewGeom = (poFeature == poFeatureToWrite);
+        auto poNewGeom = std::unique_ptr<OGRGeometry>(
+            poFeatureToWrite->GetGeometryRef()->clone());
         OGRGeomCoordinatePrecision sPrecision;
         sPrecision.dfXYResolution = dfXYResolution;
         poNewGeom->roundCoordinates(sPrecision);
-        if (!IsValid(poNewGeom))
+        if (!IsValid(poNewGeom.get()))
         {
-            CPLDebug("GeoJSON", "Running SetPrecision() to correct an invalid "
-                                "geometry due to reduced precision output");
-            auto poValidGeom =
-                poOrigGeom->SetPrecision(dfXYResolution, /* nFlags = */ 0);
+            std::unique_ptr<OGRGeometry> poValidGeom;
+            if (poFeature == poFeatureToWrite)
+            {
+                CPLDebug("GeoJSON",
+                         "Running SetPrecision() to correct an invalid "
+                         "geometry due to reduced precision output");
+                poValidGeom.reset(
+                    poOrigGeom->SetPrecision(dfXYResolution, /* nFlags = */ 0));
+            }
+            else
+            {
+                CPLDebug("GeoJSON", "Running MakeValid() to correct an invalid "
+                                    "geometry due to reduced precision output");
+                poValidGeom.reset(poNewGeom->MakeValid());
+                if (poValidGeom)
+                {
+                    auto poValidGeomRoundCoordinates =
+                        std::unique_ptr<OGRGeometry>(poValidGeom->clone());
+                    poValidGeomRoundCoordinates->roundCoordinates(sPrecision);
+                    if (!IsValid(poValidGeomRoundCoordinates.get()))
+                    {
+                        CPLDebug("GeoJSON",
+                                 "Running SetPrecision() to correct an invalid "
+                                 "geometry due to reduced precision output");
+                        auto poValidGeom2 = std::unique_ptr<OGRGeometry>(
+                            poValidGeom->SetPrecision(dfXYResolution,
+                                                      /* nFlags = */ 0));
+                        if (poValidGeom2)
+                            poValidGeom = std::move(poValidGeom2);
+                    }
+                }
+            }
             if (poValidGeom)
             {
                 if (poFeature == poFeatureToWrite)
@@ -277,12 +303,9 @@ OGRErr OGRGeoJSONWriteLayer::ICreateFeature(OGRFeature *poFeature)
                     poFeatureToWrite->SetFrom(poFeature);
                     poFeatureToWrite->SetFID(poFeature->GetFID());
                 }
-
-                poFeatureToWrite->SetGeometryDirectly(poValidGeom);
+                poFeatureToWrite->SetGeometryDirectly(poValidGeom.release());
             }
         }
-        if (bDeleteNewGeom)
-            delete poNewGeom;
     }
 
     if (oWriteOptions_.bGenerateID && poFeatureToWrite->GetFID() == OGRNullFID)

From 2e3b67d00cb37d77686081cdedb9506a300baf4c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 22 Jul 2024 17:39:53 +0200
Subject: [PATCH 19/94] GDALCopyWords(): Fix double->uint64 when input value >
 UINT64_MAX that was wrongly converted to 0

---
 autotest/cpp/testcopywords.cpp | 145 +++++++++++++++++++++++++++++++++
 gcore/gdal_priv_templates.hpp  |  80 +++++++++++++-----
 2 files changed, 203 insertions(+), 22 deletions(-)

diff --git a/autotest/cpp/testcopywords.cpp b/autotest/cpp/testcopywords.cpp
index 7e00bf98946d..d145098b0d56 100644
--- a/autotest/cpp/testcopywords.cpp
+++ b/autotest/cpp/testcopywords.cpp
@@ -32,6 +32,7 @@
 
 #include <cstdint>
 #include <iostream>
+#include <limits>
 
 #include "gtest_include.h"
 
@@ -594,6 +595,150 @@ TEST_F(TestCopyWords, GDT_Float32and64)
         FROM_R(intype, CST_5000000000, GDT_CFloat64, CST_5000000000);
         FROM_R(intype, -CST_5000000000, GDT_CFloat64, -CST_5000000000);
     }
+
+    // Float32 to Int64
+    {
+        float in_value = std::numeric_limits<float>::quiet_NaN();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        float in_value = -std::numeric_limits<float>::infinity();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MIN);
+    }
+
+    {
+        float in_value = -std::numeric_limits<float>::max();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MIN);
+    }
+
+    {
+        float in_value = std::numeric_limits<float>::max();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MAX);
+    }
+
+    {
+        float in_value = std::numeric_limits<float>::infinity();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MAX);
+    }
+
+    // Float64 to Int64
+    {
+        double in_value = std::numeric_limits<double>::quiet_NaN();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        double in_value = -std::numeric_limits<double>::infinity();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MIN);
+    }
+
+    {
+        double in_value = -std::numeric_limits<double>::max();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MIN);
+    }
+
+    {
+        double in_value = std::numeric_limits<double>::max();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MAX);
+    }
+
+    {
+        double in_value = std::numeric_limits<double>::infinity();
+        int64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_Int64, 0, 1);
+        EXPECT_EQ(out_value, INT64_MAX);
+    }
+
+    // Float32 to UInt64
+    {
+        float in_value = std::numeric_limits<float>::quiet_NaN();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        float in_value = -std::numeric_limits<float>::infinity();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        float in_value = -std::numeric_limits<float>::max();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        float in_value = std::numeric_limits<float>::max();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, UINT64_MAX);
+    }
+
+    {
+        float in_value = std::numeric_limits<float>::infinity();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float32, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, UINT64_MAX);
+    }
+
+    // Float64 to UInt64
+    {
+        double in_value = -std::numeric_limits<double>::quiet_NaN();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        double in_value = -std::numeric_limits<double>::infinity();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        double in_value = -std::numeric_limits<double>::max();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, 0);
+    }
+
+    {
+        double in_value = std::numeric_limits<double>::max();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, UINT64_MAX);
+    }
+
+    {
+        double in_value = std::numeric_limits<double>::infinity();
+        uint64_t out_value = 0;
+        GDALCopyWords(&in_value, GDT_Float64, 0, &out_value, GDT_UInt64, 0, 1);
+        EXPECT_EQ(out_value, UINT64_MAX);
+    }
 }
 
 TEST_F(TestCopyWords, GDT_CInt16)
diff --git a/gcore/gdal_priv_templates.hpp b/gcore/gdal_priv_templates.hpp
index dcb2ceb9c8c0..dd41417855a3 100644
--- a/gcore/gdal_priv_templates.hpp
+++ b/gcore/gdal_priv_templates.hpp
@@ -371,16 +371,45 @@ template <> struct sGDALCopyWord<double, std::int64_t>
 {
     static inline void f(const double dfValueIn, std::int64_t &nValueOut)
     {
-        if (CPLIsNan(dfValueIn))
+        if (std::isnan(dfValueIn))
         {
             nValueOut = 0;
-            return;
         }
-        double dfMaxVal, dfMinVal;
-        GDALGetDataLimits<double, std::int64_t>(dfMaxVal, dfMinVal);
-        double dfValue = dfValueIn >= 0.0 ? dfValueIn + 0.5 : dfValueIn - 0.5;
-        nValueOut = static_cast<std::int64_t>(
-            GDALClampValue(dfValue, dfMaxVal, dfMinVal));
+        else if (dfValueIn >=
+                 static_cast<double>(std::numeric_limits<std::int64_t>::max()))
+        {
+            nValueOut = std::numeric_limits<std::int64_t>::max();
+        }
+        else if (dfValueIn <=
+                 static_cast<double>(std::numeric_limits<std::int64_t>::min()))
+        {
+            nValueOut = std::numeric_limits<std::int64_t>::min();
+        }
+        else
+        {
+            nValueOut = static_cast<std::int64_t>(
+                dfValueIn > 0.0f ? dfValueIn + 0.5f : dfValueIn - 0.5f);
+        }
+    }
+};
+
+template <> struct sGDALCopyWord<double, std::uint64_t>
+{
+    static inline void f(const double dfValueIn, std::uint64_t &nValueOut)
+    {
+        if (!(dfValueIn > 0))
+        {
+            nValueOut = 0;
+        }
+        else if (dfValueIn >
+                 static_cast<double>(std::numeric_limits<uint64_t>::max()))
+        {
+            nValueOut = std::numeric_limits<uint64_t>::max();
+        }
+        else
+        {
+            nValueOut = static_cast<std::uint64_t>(dfValueIn + 0.5);
+        }
     }
 };
 
@@ -424,7 +453,12 @@ template <> struct sGDALCopyWord<float, int>
 {
     static inline void f(const float fValueIn, int &nValueOut)
     {
-        if (fValueIn >= static_cast<float>(std::numeric_limits<int>::max()))
+        if (std::isnan(fValueIn))
+        {
+            nValueOut = 0;
+        }
+        else if (fValueIn >=
+                 static_cast<float>(std::numeric_limits<int>::max()))
         {
             nValueOut = std::numeric_limits<int>::max();
         }
@@ -447,15 +481,14 @@ template <> struct sGDALCopyWord<float, unsigned int>
 {
     static inline void f(const float fValueIn, unsigned int &nValueOut)
     {
-        if (fValueIn >=
-            static_cast<float>(std::numeric_limits<unsigned int>::max()))
+        if (!(fValueIn > 0))
         {
-            nValueOut = std::numeric_limits<unsigned int>::max();
+            nValueOut = 0;
         }
-        else if (fValueIn <=
-                 static_cast<float>(std::numeric_limits<unsigned int>::min()))
+        else if (fValueIn >=
+                 static_cast<float>(std::numeric_limits<unsigned int>::max()))
         {
-            nValueOut = std::numeric_limits<unsigned int>::min();
+            nValueOut = std::numeric_limits<unsigned int>::max();
         }
         else
         {
@@ -470,8 +503,12 @@ template <> struct sGDALCopyWord<float, std::int64_t>
 {
     static inline void f(const float fValueIn, std::int64_t &nValueOut)
     {
-        if (fValueIn >=
-            static_cast<float>(std::numeric_limits<std::int64_t>::max()))
+        if (std::isnan(fValueIn))
+        {
+            nValueOut = 0;
+        }
+        else if (fValueIn >=
+                 static_cast<float>(std::numeric_limits<std::int64_t>::max()))
         {
             nValueOut = std::numeric_limits<std::int64_t>::max();
         }
@@ -494,15 +531,14 @@ template <> struct sGDALCopyWord<float, std::uint64_t>
 {
     static inline void f(const float fValueIn, std::uint64_t &nValueOut)
     {
-        if (fValueIn >=
-            static_cast<float>(std::numeric_limits<std::uint64_t>::max()))
+        if (!(fValueIn > 0))
         {
-            nValueOut = std::numeric_limits<std::uint64_t>::max();
+            nValueOut = 0;
         }
-        else if (fValueIn <=
-                 static_cast<float>(std::numeric_limits<std::uint64_t>::min()))
+        else if (fValueIn >=
+                 static_cast<float>(std::numeric_limits<std::uint64_t>::max()))
         {
-            nValueOut = std::numeric_limits<std::uint64_t>::min();
+            nValueOut = std::numeric_limits<std::uint64_t>::max();
         }
         else
         {

From c4132bc144afc6ec4044c75c808b5c4f958cdfa0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 22 Jul 2024 20:55:20 +0200
Subject: [PATCH 20/94] Doc of OGRGeometry methods/functions: clarify that
 returned geometries must be freed, and how

---
 ogr/ogrgeometry.cpp | 141 +++++++++++++++++++++++---------------------
 1 file changed, 74 insertions(+), 67 deletions(-)

diff --git a/ogr/ogrgeometry.cpp b/ogr/ogrgeometry.cpp
index 62d378d1891e..b1ea43c4ab03 100644
--- a/ogr/ogrgeometry.cpp
+++ b/ogr/ogrgeometry.cpp
@@ -3103,7 +3103,7 @@ void OGR_G_FlattenTo2D(OGRGeometryH hGeom)
  * This method is the same as the C function OGR_G_ExportToGMLEx().
  *
  * @param papszOptions NULL-terminated list of options.
- * @return A GML fragment or NULL in case of error.
+ * @return A GML fragment to be freed with CPLFree() or NULL in case of error.
  */
 
 char *OGRGeometry::exportToGML(const char *const *papszOptions) const
@@ -3126,7 +3126,7 @@ char *OGRGeometry::exportToGML(const char *const *papszOptions) const
  *
  * This method is the same as the C function OGR_G_ExportToKML().
  *
- * @return A KML fragment or NULL in case of error.
+ * @return A KML fragment to be freed with CPLFree() or NULL in case of error.
  */
 
 char *OGRGeometry::exportToKML() const
@@ -3157,7 +3157,7 @@ char *OGRGeometry::exportToKML() const
  * This method is the same as the C function OGR_G_ExportToJson().
  *
  * @param papszOptions Null terminated list of options, or null (added in 3.9)
- * @return A GeoJSON fragment or NULL in case of error.
+ * @return A GeoJSON fragment to be freed with CPLFree() or NULL in case of error.
  */
 
 char *OGRGeometry::exportToJson(CSLConstList papszOptions) const
@@ -3209,7 +3209,7 @@ int OGRGetGenerate_DB2_V72_BYTE_ORDER()
 /************************************************************************/
 
 /** Create a new GEOS context.
- * @return a new GEOS context.
+ * @return a new GEOS context (to be freed with freeGEOSContext())
  */
 GEOSContextHandle_t OGRGeometry::createGEOSContext()
 {
@@ -3274,7 +3274,8 @@ static GEOSGeom convertToGEOSGeom(GEOSContextHandle_t hGEOSCtxt,
  * @param hGEOSCtxt GEOS context
  * @param bRemoveEmptyParts Whether empty parts of the geometry should be
  * removed before exporting to GEOS (GDAL >= 3.10)
- * @return a GEOSGeom object corresponding to the geometry.
+ * @return a GEOSGeom object corresponding to the geometry (to be freed with
+ * GEOSGeom_destroy_r()), or NULL in case of error
  */
 GEOSGeom
 OGRGeometry::exportToGEOS(UNUSED_IF_NO_GEOS GEOSContextHandle_t hGEOSCtxt,
@@ -3461,7 +3462,7 @@ OGRBoolean OGRGeometry::hasCurveGeometry(CPL_UNUSED int bLookForNonLinear) const
  *                     See OGRGeometryFactory::curveToLineString() for
  *                     valid options.
  *
- * @return a new geometry.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 2.0
  */
@@ -3496,7 +3497,7 @@ OGRGeometry::getLinearGeometry(CPL_UNUSED double dfMaxAngleStepSizeDegrees,
  * @param papszOptions options as a null-terminated list of strings.
  *                     Unused for now. Must be set to NULL.
  *
- * @return a new geometry.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 2.0
  */
@@ -3880,8 +3881,7 @@ static OGRBoolean OGRGEOSBooleanPredicate(
  *     NO (default): collapses are converted to empty geometries
  *     YES: collapses are converted to a valid geometry of lower dimension.</li>
  * </ul>
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 3.0
  */
@@ -3992,8 +3992,8 @@ OGRGeometry *OGRGeometry::MakeValid(CSLConstList papszOptions) const
  *
  * @param hGeom The Geometry to make valid.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.0
  */
@@ -4022,8 +4022,8 @@ OGRGeometryH OGR_G_MakeValid(OGRGeometryH hGeom)
  * @param hGeom The Geometry to make valid.
  * @param papszOptions Options.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.4
  */
@@ -4051,8 +4051,7 @@ OGRGeometryH OGR_G_MakeValidEx(OGRGeometryH hGeom, CSLConstList papszOptions)
  * If OGR is built without the GEOS library, this function will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 3.3
  */
@@ -4102,8 +4101,8 @@ OGRGeometry *OGRGeometry::Normalize() const
  * issuing a CPLE_NotSupported error.
  * @param hGeom The Geometry to normalize.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.3
  */
@@ -4133,8 +4132,7 @@ OGRGeometryH OGR_G_Normalize(OGRGeometryH hGeom)
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  */
 
 OGRGeometry *OGRGeometry::ConvexHull() const
@@ -4213,8 +4211,8 @@ OGRGeometry *OGRGeometry::ConvexHull() const
  *
  * @param hTarget The Geometry to calculate the convex hull of.
  *
- * @return a handle to a newly allocated geometry now owned by the caller,
- *         or NULL on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  */
 
 OGRGeometryH OGR_G_ConvexHull(OGRGeometryH hTarget)
@@ -4251,8 +4249,8 @@ OGRGeometryH OGR_G_ConvexHull(OGRGeometryH hTarget)
  * @param dfRatio Ratio of the area of the convex hull and the concave hull.
  * @param bAllowHoles Whether holes are allowed.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
+ *
  * @since GDAL 3.6
  */
 
@@ -4314,8 +4312,9 @@ OGRGeometry *OGRGeometry::ConcaveHull(double dfRatio, bool bAllowHoles) const
  * @param dfRatio Ratio of the area of the convex hull and the concave hull.
  * @param bAllowHoles Whether holes are allowed.
  *
- * @return a handle to a newly allocated geometry now owned by the caller,
- *         or NULL on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
+ *
  * @since GDAL 3.6
  */
 
@@ -4346,8 +4345,7 @@ OGRGeometryH OGR_G_ConcaveHull(OGRGeometryH hTarget, double dfRatio,
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -4415,8 +4413,8 @@ OGRGeometry *OGRGeometry::getBoundary() const
  *
  * @param hTarget The Geometry to calculate the boundary of.
  *
- * @return a handle to a newly allocated geometry now owned by the caller,
- *         or NULL on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -4474,7 +4472,7 @@ OGRGeometryH OGR_G_GetBoundary(OGRGeometryH hTarget)
  * @param nQuadSegs the number of segments used to approximate a 90
  * degree (quadrant) of curvature.
  *
- * @return the newly created geometry, or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  */
 
 OGRGeometry *OGRGeometry::Buffer(UNUSED_IF_NO_GEOS double dfDist,
@@ -4540,7 +4538,8 @@ OGRGeometry *OGRGeometry::Buffer(UNUSED_IF_NO_GEOS double dfDist,
  * @param nQuadSegs the number of segments used to approximate a 90 degree
  * (quadrant) of curvature.
  *
- * @return the newly created geometry, or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  */
 
 OGRGeometryH OGR_G_Buffer(OGRGeometryH hTarget, double dfDist, int nQuadSegs)
@@ -4581,7 +4580,8 @@ OGRGeometryH OGR_G_Buffer(OGRGeometryH hTarget, double dfDist, int nQuadSegs)
  *               the same unit as the coordinates of the geometry.
  * @param papszOptions NULL terminated list of options (may be NULL)
  *
- * @return the newly created geometry, or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
+ *
  * @since GDAL 3.10
  */
 
@@ -4796,7 +4796,9 @@ OGRGeometry::BufferEx(UNUSED_IF_NO_GEOS double dfDist,
  *               the same unit as the coordinates of the geometry.
  * @param papszOptions NULL terminated list of options (may be NULL)
  *
- * @return the newly created geometry, or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
+ *
  * @since GDAL 3.10
  */
 
@@ -4834,8 +4836,9 @@ OGRGeometryH OGR_G_BufferEx(OGRGeometryH hTarget, double dfDist,
  *
  * @param poOtherGeom the other geometry intersected with "this" geometry.
  *
- * @return a new geometry representing the intersection or NULL if there is
- * no intersection or an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if there is no
+ * intersection or if an error occurs.
+ *
  */
 
 OGRGeometry *
@@ -4918,8 +4921,8 @@ OGRGeometry::Intersection(UNUSED_PARAMETER const OGRGeometry *poOtherGeom) const
  * @param hThis the geometry.
  * @param hOther the other geometry.
  *
- * @return a new geometry representing the intersection or NULL if there is
- * no intersection or an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if there is not intersection of if an error occurs.
  */
 
 OGRGeometryH OGR_G_Intersection(OGRGeometryH hThis, OGRGeometryH hOther)
@@ -4954,7 +4957,7 @@ OGRGeometryH OGR_G_Intersection(OGRGeometryH hThis, OGRGeometryH hOther)
  *
  * @param poOtherGeom the other geometry unioned with "this" geometry.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  */
 
 OGRGeometry *
@@ -5035,7 +5038,8 @@ OGRGeometry::Union(UNUSED_PARAMETER const OGRGeometry *poOtherGeom) const
  * @param hThis the geometry.
  * @param hOther the other geometry.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  */
 
 OGRGeometryH OGR_G_Union(OGRGeometryH hThis, OGRGeometryH hOther)
@@ -5067,7 +5071,7 @@ OGRGeometryH OGR_G_Union(OGRGeometryH hThis, OGRGeometryH hOther)
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  *
@@ -5133,7 +5137,8 @@ OGRGeometry *OGRGeometry::UnionCascaded() const
  *
  * @param hThis the geometry.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @deprecated Use OGR_G_UnaryUnion() instead
  */
@@ -5166,7 +5171,7 @@ OGRGeometryH OGR_G_UnionCascaded(OGRGeometryH hThis)
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 3.7
  */
@@ -5233,7 +5238,8 @@ OGRGeometry *OGRGeometry::UnaryUnion() const
  *
  * @param hThis the geometry.
  *
- * @return a new geometry representing the union or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.7
  */
@@ -5269,8 +5275,8 @@ OGRGeometryH OGR_G_UnaryUnion(OGRGeometryH hThis)
  *
  * @param poOtherGeom the other geometry removed from "this" geometry.
  *
- * @return a new geometry representing the difference or NULL if the
- * difference is empty or an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if the difference
+ * is empty or if an error occurs.
  */
 
 OGRGeometry *
@@ -5352,8 +5358,8 @@ OGRGeometry::Difference(UNUSED_PARAMETER const OGRGeometry *poOtherGeom) const
  * @param hThis the geometry.
  * @param hOther the other geometry.
  *
- * @return a new geometry representing the difference or NULL if the
- * difference is empty or an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if the difference is empty or if an error occurs.
  */
 
 OGRGeometryH OGR_G_Difference(OGRGeometryH hThis, OGRGeometryH hOther)
@@ -5388,8 +5394,8 @@ OGRGeometryH OGR_G_Difference(OGRGeometryH hThis, OGRGeometryH hOther)
  *
  * @param poOtherGeom the other geometry.
  *
- * @return a new geometry representing the symmetric difference or NULL if the
- * difference is empty or an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if the difference
+ * is empty or if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -5474,8 +5480,8 @@ OGRGeometry::SymmetricDifference(const OGRGeometry *poOtherGeom) const
  * @param hThis the geometry.
  * @param hOther the other geometry.
  *
- * @return a new geometry representing the symmetric difference or NULL if the
- * difference is empty or an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if the difference is empty or if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -6186,8 +6192,8 @@ int OGR_G_Centroid(OGRGeometryH hGeom, OGRGeometryH hCentroidPoint)
  * issuing a CPLE_NotSupported error.
  *
  * @param hGeom the geometry to operate on.
- * @return a point guaranteed to lie on the surface or NULL if an error
- *         occurred.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.10
  */
@@ -6298,7 +6304,7 @@ OGRErr OGRGeometry::PointOnSurfaceInternal(OGRPoint *poPoint) const
  *
  * @param dTolerance the distance tolerance for the simplification.
  *
- * @return the simplified geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -6347,7 +6353,8 @@ OGRGeometry *OGRGeometry::Simplify(UNUSED_IF_NO_GEOS double dTolerance) const
  * @param hThis the geometry.
  * @param dTolerance the distance tolerance for the simplification.
  *
- * @return the simplified geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.8.0
  */
@@ -6376,7 +6383,7 @@ OGRGeometryH OGR_G_Simplify(OGRGeometryH hThis, double dTolerance)
  *
  * @param dTolerance the distance tolerance for the simplification.
  *
- * @return the simplified geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.9.0
  */
@@ -6427,7 +6434,8 @@ OGRGeometry::SimplifyPreserveTopology(UNUSED_IF_NO_GEOS double dTolerance) const
  * @param hThis the geometry.
  * @param dTolerance the distance tolerance for the simplification.
  *
- * @return the simplified geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.9.0
  */
@@ -6544,7 +6552,7 @@ void OGRGeometry::roundCoordinates(const OGRGeomCoordinatePrecision &sPrecision)
  * @param nFlags The bitwise OR of zero, one or several of OGR_GEOS_PREC_NO_TOPO
  *               and OGR_GEOS_PREC_KEEP_COLLAPSED
  *
- * @return a new geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since GDAL 3.9
  */
@@ -6602,7 +6610,8 @@ OGRGeometry *OGRGeometry::SetPrecision(UNUSED_IF_NO_GEOS double dfGridSize,
  * @param nFlags The bitwise OR of zero, one or several of OGR_GEOS_PREC_NO_TOPO
  *               and OGR_GEOS_PREC_KEEP_COLLAPSED
  *
- * @return a new geometry or NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since GDAL 3.9
  */
@@ -6631,8 +6640,7 @@ OGRGeometryH OGR_G_SetPrecision(OGRGeometryH hThis, double dfGridSize,
  * @param bOnlyEdges if TRUE, will return a MULTILINESTRING, otherwise it will
  *                   return a GEOMETRYCOLLECTION containing triangular POLYGONs.
  *
- * @return the geometry resulting from the Delaunay triangulation or
- * NULL if an error occurs.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 2.1
  */
@@ -6684,8 +6692,8 @@ OGRGeometry *OGRGeometry::DelaunayTriangulation(double dfTolerance,
  * @param bOnlyEdges if TRUE, will return a MULTILINESTRING, otherwise it will
  *                   return a GEOMETRYCOLLECTION containing triangular POLYGONs.
  *
- * @return the geometry resulting from the Delaunay triangulation or
- * NULL if an error occurs.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 2.1
  */
@@ -6725,8 +6733,7 @@ OGRGeometryH OGR_G_DelaunayTriangulation(OGRGeometryH hThis, double dfTolerance,
  * If OGR is built without the GEOS library, this method will always fail,
  * issuing a CPLE_NotSupported error.
  *
- * @return a newly allocated geometry now owned by the caller, or NULL
- * on failure.
+ * @return a new geometry to be freed by the caller, or NULL if an error occurs.
  *
  * @since OGR 1.9.0
  */
@@ -6815,8 +6822,8 @@ OGRGeometry *OGRGeometry::Polygonize() const
  *
  * @param hTarget The Geometry to be polygonized.
  *
- * @return a handle to a newly allocated geometry now owned by the caller,
- *         or NULL on failure.
+ * @return a new geometry to be freed by the caller with OGR_G_DestroyGeometry,
+ * or NULL if an error occurs.
  *
  * @since OGR 1.9.0
  */

From 86f60c6ac6d9c6e78b1a6873e2e8c5840914ce52 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Jul 2024 13:30:21 +0200
Subject: [PATCH 21/94] GTiff: honor GDAL_DISABLE_READDIR_ON_OPEN when working
 on a dataset opened with OVERVIEW_LEVEL open option

---
 autotest/gcore/tiff_read.py  | 81 ++++++++++++++++++++++++++++++++++++
 frmts/gtiff/gtiffdataset.cpp |  3 ++
 2 files changed, 84 insertions(+)

diff --git a/autotest/gcore/tiff_read.py b/autotest/gcore/tiff_read.py
index c58b1080cbde..152687229ba3 100755
--- a/autotest/gcore/tiff_read.py
+++ b/autotest/gcore/tiff_read.py
@@ -5234,3 +5234,84 @@ def test_tiff_read_missing_extrasamples_multi_threaded():
     with gdal.config_option("GDAL_NUM_THREADS", "2"):
         ds.ReadRaster()
     assert gdal.GetLastErrorMsg() == ""
+
+
+###############################################################################
+# Test that we honor GDAL_DISABLE_READDIR_ON_OPEN when working on a dataset opened with OVERVIEW_LEVEL open option
+
+
+@pytest.mark.require_curl()
+def test_tiff_read_overview_level_open_option_honor_GDAL_DISABLE_READDIR_ON_OPEN_EMPTY_DIR(
+    tmp_path,
+):
+
+    webserver_process = None
+    webserver_port = 0
+
+    (webserver_process, webserver_port) = webserver.launch(
+        handler=webserver.DispatcherHttpHandler
+    )
+    if webserver_port == 0:
+        pytest.skip()
+
+    gdal.VSICurlClearCache()
+
+    try:
+        tmp_filename = str(tmp_path / "test.tif")
+        ds = gdal.Translate(tmp_filename, "data/byte.tif")
+        ds.BuildOverviews("NEAR", [2])
+        ds.Close()
+
+        filesize = gdal.VSIStatL(tmp_filename).size
+        handler = webserver.SequentialHandler()
+        handler.add("HEAD", "/test.tif", 200, {"Content-Length": "%d" % filesize})
+
+        def method(request):
+            # sys.stderr.write('%s\n' % str(request.headers))
+
+            if request.headers["Range"].startswith("bytes="):
+                rng = request.headers["Range"][len("bytes=") :]
+                assert len(rng.split("-")) == 2
+                start = int(rng.split("-")[0])
+                end = int(rng.split("-")[1])
+
+                request.protocol_version = "HTTP/1.1"
+                request.send_response(206)
+                request.send_header("Content-type", "application/octet-stream")
+                request.send_header(
+                    "Content-Range", "bytes %d-%d/%d" % (start, end, filesize)
+                )
+                request.send_header("Content-Length", end - start + 1)
+                request.send_header("Connection", "close")
+                request.end_headers()
+                with open(tmp_filename, "rb") as f:
+                    f.seek(start, 0)
+                    request.wfile.write(f.read(end - start + 1))
+
+        for i in range(2):
+            handler.add("GET", "/test.tif", custom_method=method)
+
+        with gdaltest.config_options(
+            {
+                "GDAL_DISABLE_READDIR_ON_OPEN": "EMPTY_DIR",
+            }
+        ):
+            with webserver.install_http_handler(handler):
+                ds = gdal.OpenEx(
+                    "/vsicurl/http://127.0.0.1:%d/test.tif" % webserver_port,
+                    open_options=["OVERVIEW_LEVEL=0"],
+                )
+
+                msgs = []
+
+                def error_handler(type, code, msg):
+                    msgs.append(msg)
+
+                with gdaltest.error_handler(error_handler):
+                    gdal.Translate("", ds, format="MEM")
+                assert len(msgs) == 0
+
+    finally:
+        webserver.server_stop(webserver_process, webserver_port)
+
+        gdal.VSICurlClearCache()
diff --git a/frmts/gtiff/gtiffdataset.cpp b/frmts/gtiff/gtiffdataset.cpp
index 3e6f28c6dfc5..fc6fd5c0c178 100644
--- a/frmts/gtiff/gtiffdataset.cpp
+++ b/frmts/gtiff/gtiffdataset.cpp
@@ -1114,6 +1114,9 @@ void GTiffDataset::ScanDirectories()
                 GTiffDataset *poODS = new GTiffDataset();
                 poODS->ShareLockWithParentDataset(this);
                 poODS->SetStructuralMDFromParent(this);
+                if (m_bHasGotSiblingFiles)
+                    poODS->oOvManager.TransferSiblingFiles(
+                        CSLDuplicate(GetSiblingFiles()));
                 poODS->m_pszFilename = CPLStrdup(m_pszFilename);
                 poODS->m_nColorTableMultiplier = m_nColorTableMultiplier;
                 if (poODS->OpenOffset(VSI_TIFFOpenChild(m_hTIFF), nThisDir,

From 5275ee1e7dc64658feed38ded5f9259e41397392 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Jul 2024 15:10:49 +0200
Subject: [PATCH 22/94] LIBKML: fix LIBKML_RESOLVE_STYLE=YES when reading a KML
 file with dataset-level styles (3.9.1 regression)

Fixes https://github.com/qgis/QGIS/issues/58208
---
 autotest/ogr/ogr_libkml.py                    | 22 +++++++++++++++++++
 .../libkml/ogrlibkmlfeaturestyle.cpp          | 14 ++++--------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index cc32eb283013..b8f255904e33 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -1387,6 +1387,13 @@ def test_ogr_libkml_read_write_style(tmp_vsimem):
         "style1_highlight", 'SYMBOL(id:"http://style1_highlight",c:#10325476)'
     )
     ds.SetStyleTable(style_table)
+    lyr = ds.CreateLayer("test")
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetStyleString("@style1_normal")
+    lyr.CreateFeature(feat)
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetStyleString("@unknown_style")
+    lyr.CreateFeature(feat)
     ds = None
 
     with gdaltest.vsi_open(
@@ -1429,6 +1436,21 @@ def test_ogr_libkml_read_write_style(tmp_vsimem):
         print(data)
         pytest.fail(styles)
 
+    ds = ogr.Open(tmp_vsimem / "ogr_libkml_read_write_style_write.kml")
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f.GetStyleString() == "@style1_normal"
+    f = lyr.GetNextFeature()
+    assert f.GetStyleString() == "@unknown_style"
+
+    with gdaltest.config_option("LIBKML_RESOLVE_STYLE", "YES"):
+        ds = ogr.Open(tmp_vsimem / "ogr_libkml_read_write_style_write.kml")
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f.GetStyleString() == 'SYMBOL(id:"http://style1_normal",c:#67452301)'
+        f = lyr.GetNextFeature()
+        assert f.GetStyleString() == "@unknown_style"
+
 
 ###############################################################################
 # Test writing Update
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp
index 81dd5374a74a..587dd28bf290 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp
@@ -205,16 +205,10 @@ void kml2featurestyle(FeaturePtr poKmlFeature, OGRLIBKMLDataSource *poOgrDS,
         else
         {
             const size_t nPathLen = poOgrDS->GetStylePath().size();
-
-            if (nPathLen == 0)
-            {
-                if (!osUrl.empty() && osUrl[0] == '#')
-                    osStyleString = std::string("@").append(osUrl.c_str() + 1);
-            }
-            else if (osUrl.size() > nPathLen &&
-                     strncmp(osUrl.c_str(), poOgrDS->GetStylePath().c_str(),
-                             nPathLen) == 0 &&
-                     osUrl[nPathLen] == '#')
+            if (osUrl.size() > nPathLen && osUrl[nPathLen] == '#' &&
+                (nPathLen == 0 ||
+                 strncmp(osUrl.c_str(), poOgrDS->GetStylePath().c_str(),
+                         nPathLen) == 0))
             {
                 /***** should we resolve the style *****/
                 const char *pszResolve =

From 3af216ee7b51eb02de90e722cd720c317c1e4e24 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Jul 2024 21:46:37 +0200
Subject: [PATCH 23/94] Python bindings: avoid C++ bad_alloc in
 PythonBindingErrorHandler()

---
 swig/include/python/python_exceptions.i | 43 ++++++++++++++++++-------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/swig/include/python/python_exceptions.i b/swig/include/python/python_exceptions.i
index e52dcd9af4f1..c17c0be12dd1 100644
--- a/swig/include/python/python_exceptions.i
+++ b/swig/include/python/python_exceptions.i
@@ -16,6 +16,7 @@ struct PythonBindingErrorHandlerContext
     std::string     osInitialMsg{};
     std::string     osFailureMsg{};
     CPLErrorNum     nLastCode = CPLE_None;
+    bool            bMemoryError = false;
 };
 
 static void CPL_STDCALL
@@ -46,16 +47,31 @@ PythonBindingErrorHandler(CPLErr eclass, CPLErrorNum err_no, const char *msg )
   }
   else {
     ctxt->nLastCode = err_no;
-    if( ctxt->osFailureMsg.empty() ) {
-      ctxt->osFailureMsg = msg;
-      ctxt->osInitialMsg = ctxt->osFailureMsg;
-    } else {
-      if( ctxt->osFailureMsg.size() < 10000 ) {
-        ctxt->osFailureMsg = std::string(msg) + "\nMay be caused by: " + ctxt->osFailureMsg;
-        ctxt->osInitialMsg = ctxt->osFailureMsg;
-      }
-      else
-        ctxt->osFailureMsg = std::string(msg) + "\n[...]\nMay be caused by: " + ctxt->osInitialMsg;
+    try
+    {
+        if( ctxt->osFailureMsg.empty() ) {
+          ctxt->osFailureMsg = msg;
+          ctxt->osInitialMsg = ctxt->osFailureMsg;
+        } else {
+          if( ctxt->osFailureMsg.size() < 10000 ) {
+            std::string osTmp(msg);
+            osTmp += "\nMay be caused by: ";
+            osTmp += ctxt->osFailureMsg;
+            ctxt->osFailureMsg = std::move(osTmp);
+            ctxt->osInitialMsg = ctxt->osFailureMsg;
+          }
+          else
+          {
+            std::string osTmp(msg);
+            osTmp += "\n[...]\nMay be caused by: ";
+            osTmp += ctxt->osInitialMsg;
+            ctxt->osFailureMsg = std::move(osTmp);
+          }
+        }
+    }
+    catch( const std::exception& )
+    {
+        ctxt->bMemoryError = true;
     }
   }
 }
@@ -167,7 +183,12 @@ static void popErrorHandler()
     PythonBindingErrorHandlerContext* ctxt = static_cast<
       PythonBindingErrorHandlerContext*>(CPLGetErrorHandlerUserData());
     CPLPopErrorHandler();
-    if( !ctxt->osFailureMsg.empty() )
+    if( ctxt->bMemoryError )
+    {
+        CPLErrorSetState(
+          CE_Failure, CPLE_OutOfMemory, "Out of memory");
+    }
+    else if( !ctxt->osFailureMsg.empty() )
     {
       CPLErrorSetState(
           CPLGetLastErrorType() == CE_Failure ? CE_Failure: CE_Warning,

From 1a4b5d1710baecc86e9e1dddc31982b3174477e7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Jul 2024 20:36:05 +0200
Subject: [PATCH 24/94] Polygonize: optimizations to reduce runtime

On the test case of
https://lists.osgeo.org/pipermail/gdal-dev/2024-July/059158.html,
this reduces the runtime to 8 minutes (with GeoParquet output, without spatial sorting),
by optimizing some implementation details.
I believe this could be further reduced as most of the time is still spent in malloc/free
of temporary objects (the output is 90 million polygons!) and some objects could be reused,
but that would be more extensive changes
---
 alg/polygonize_polygonizer.cpp | 115 +++++++++++++++++++--------------
 alg/polygonize_polygonizer.h   |  31 ++++++---
 2 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/alg/polygonize_polygonizer.cpp b/alg/polygonize_polygonizer.cpp
index aac78ae41fbe..f32c05410d17 100644
--- a/alg/polygonize_polygonizer.cpp
+++ b/alg/polygonize_polygonizer.cpp
@@ -35,29 +35,18 @@ namespace gdal
 {
 namespace polygonizer
 {
-
-RPolygon::~RPolygon()
-{
-    for (auto &arc : oArcs)
-    {
-        delete arc;
-    }
-}
-
 IndexedArc RPolygon::newArc(bool bFollowRighthand)
 {
-    Arc *poArc = new Arc();
-    std::size_t iArcIndex = oArcs.size();
-    oArcs.push_back(poArc);
-    oArcRighthandFollow.push_back(bFollowRighthand);
-    oArcConnections.push_back(iArcIndex);
-    return IndexedArc{poArc, iArcIndex};
+    const std::size_t iArcIndex = oArcs.size();
+    const auto &oNewArc =
+        oArcs.emplace_back(static_cast<unsigned>(iArcIndex), bFollowRighthand);
+    return IndexedArc{oNewArc.poArc.get(), iArcIndex};
 }
 
 void RPolygon::setArcConnection(const IndexedArc &oArc,
                                 const IndexedArc &oNextArc)
 {
-    oArcConnections[oArc.iIndex] = oNextArc.iIndex;
+    oArcs[oArc.iIndex].nConnection = static_cast<unsigned>(oNextArc.iIndex);
 }
 
 void RPolygon::updateBottomRightPos(IndexType iRow, IndexType iCol)
@@ -361,13 +350,14 @@ Polygonizer<PolyIdType, DataType>::~Polygonizer()
 template <typename PolyIdType, typename DataType>
 RPolygon *Polygonizer<PolyIdType, DataType>::getPolygon(PolyIdType nPolygonId)
 {
-    if (oPolygonMap_.count(nPolygonId) == 0)
+    const auto oIter = oPolygonMap_.find(nPolygonId);
+    if (oIter == oPolygonMap_.end())
     {
         return createPolygon(nPolygonId);
     }
     else
     {
-        return oPolygonMap_[nPolygonId];
+        return oIter->second;
     }
 }
 
@@ -383,8 +373,10 @@ Polygonizer<PolyIdType, DataType>::createPolygon(PolyIdType nPolygonId)
 template <typename PolyIdType, typename DataType>
 void Polygonizer<PolyIdType, DataType>::destroyPolygon(PolyIdType nPolygonId)
 {
-    delete oPolygonMap_[nPolygonId];
-    oPolygonMap_.erase(nPolygonId);
+    const auto oIter = oPolygonMap_.find(nPolygonId);
+    CPLAssert(oIter != oPolygonMap_.end());
+    delete oIter->second;
+    oPolygonMap_.erase(oIter);
 }
 
 template <typename PolyIdType, typename DataType>
@@ -459,35 +451,55 @@ template <typename DataType>
 OGRPolygonWriter<DataType>::OGRPolygonWriter(OGRLayerH hOutLayer,
                                              int iPixValField,
                                              double *padfGeoTransform)
-    : PolygonReceiver<DataType>(), hOutLayer_(hOutLayer),
+    : PolygonReceiver<DataType>(), poOutLayer_(OGRLayer::FromHandle(hOutLayer)),
       iPixValField_(iPixValField), padfGeoTransform_(padfGeoTransform)
 {
+    poFeature_ = std::make_unique<OGRFeature>(poOutLayer_->GetLayerDefn());
+    poPolygon_ = new OGRPolygon();
+    poFeature_->SetGeometryDirectly(poPolygon_);
 }
 
 template <typename DataType>
 void OGRPolygonWriter<DataType>::receive(RPolygon *poPolygon,
                                          DataType nPolygonCellValue)
 {
-    std::vector<bool> oAccessedArc(poPolygon->oArcConnections.size(), false);
+    std::vector<bool> oAccessedArc(poPolygon->oArcs.size(), false);
     double *padfGeoTransform = padfGeoTransform_;
 
-    OGRGeometryH hPolygon = OGR_G_CreateGeometry(wkbPolygon);
+    OGRLinearRing *poFirstRing = poPolygon_->getExteriorRing();
+    if (poFirstRing && poPolygon_->getNumInteriorRings() == 0)
+    {
+        poFirstRing->empty();
+    }
+    else
+    {
+        poFirstRing = nullptr;
+        poPolygon_->empty();
+    }
 
-    auto AddRingToPolygon = [&poPolygon, &oAccessedArc, &hPolygon,
-                             padfGeoTransform](std::size_t iFirstArcIndex)
+    auto AddRingToPolygon =
+        [this, &poPolygon, &oAccessedArc,
+         padfGeoTransform](std::size_t iFirstArcIndex, OGRLinearRing *poRing)
     {
-        OGRGeometryH hRing = OGR_G_CreateGeometry(wkbLinearRing);
+        const bool bAddRing = poRing == nullptr;
+        if (!poRing)
+            poRing = new OGRLinearRing();
 
         auto AddArcToRing =
-            [&poPolygon, &hRing, padfGeoTransform](std::size_t iArcIndex)
+            [&poPolygon, poRing, padfGeoTransform](std::size_t iArcIndex)
         {
-            auto oArc = poPolygon->oArcs[iArcIndex];
-            bool bArcFollowRighthand =
-                poPolygon->oArcRighthandFollow[iArcIndex];
-            for (std::size_t i = 0; i < oArc->size(); ++i)
+            const auto &oArc = poPolygon->oArcs[iArcIndex];
+            const bool bArcFollowRighthand = oArc.bFollowRighthand;
+            const int nArcPointCount = static_cast<int>(oArc.poArc->size());
+            int nDstPointIdx = poRing->getNumPoints();
+            poRing->setNumPoints(nDstPointIdx + nArcPointCount,
+                                 /* bZeroizeNewContent = */ false);
+            for (int i = 0; i < nArcPointCount; ++i)
             {
                 const Point &oPixel =
-                    (*oArc)[bArcFollowRighthand ? i : (oArc->size() - i - 1)];
+                    (*oArc.poArc)[bArcFollowRighthand
+                                      ? i
+                                      : (nArcPointCount - i - 1)];
 
                 const double dfX = padfGeoTransform[0] +
                                    oPixel[1] * padfGeoTransform[1] +
@@ -496,51 +508,56 @@ void OGRPolygonWriter<DataType>::receive(RPolygon *poPolygon,
                                    oPixel[1] * padfGeoTransform[4] +
                                    oPixel[0] * padfGeoTransform[5];
 
-                OGR_G_AddPoint_2D(hRing, dfX, dfY);
+                poRing->setPoint(nDstPointIdx, dfX, dfY);
+                ++nDstPointIdx;
             }
         };
 
         AddArcToRing(iFirstArcIndex);
 
         std::size_t iArcIndex = iFirstArcIndex;
-        std::size_t iNextArcIndex = poPolygon->oArcConnections[iArcIndex];
+        std::size_t iNextArcIndex = poPolygon->oArcs[iArcIndex].nConnection;
         oAccessedArc[iArcIndex] = true;
         while (iNextArcIndex != iFirstArcIndex)
         {
             AddArcToRing(iNextArcIndex);
             iArcIndex = iNextArcIndex;
-            iNextArcIndex = poPolygon->oArcConnections[iArcIndex];
+            iNextArcIndex = poPolygon->oArcs[iArcIndex].nConnection;
             oAccessedArc[iArcIndex] = true;
         }
 
         // close ring manually
-        OGR_G_AddPoint_2D(hRing, OGR_G_GetX(hRing, 0), OGR_G_GetY(hRing, 0));
+        poRing->closeRings();
 
-        OGR_G_AddGeometryDirectly(hPolygon, hRing);
+        if (bAddRing)
+            poPolygon_->addRingDirectly(poRing);
     };
 
-    std::vector<bool>::iterator ite;
-    while ((ite = std::find_if_not(oAccessedArc.begin(), oAccessedArc.end(),
-                                   [](bool accessed) { return accessed; })) !=
-           oAccessedArc.end())
+    for (size_t i = 0; i < oAccessedArc.size(); ++i)
     {
-        AddRingToPolygon(ite - oAccessedArc.begin());
+        if (!oAccessedArc[i])
+        {
+            AddRingToPolygon(i, poFirstRing);
+            poFirstRing = nullptr;
+        }
     }
 
     // Create the feature object
-    OGRFeatureH hFeat = OGR_F_Create(OGR_L_GetLayerDefn(hOutLayer_));
-
-    OGR_F_SetGeometryDirectly(hFeat, hPolygon);
-
+    poFeature_->SetFID(OGRNullFID);
     if (iPixValField_ >= 0)
-        OGR_F_SetFieldDouble(hFeat, iPixValField_,
+        poFeature_->SetField(iPixValField_,
                              static_cast<double>(nPolygonCellValue));
 
     // Write the to the layer.
-    if (OGR_L_CreateFeature(hOutLayer_, hFeat) != OGRERR_NONE)
+    if (poOutLayer_->CreateFeature(poFeature_.get()) != OGRERR_NONE)
         eErr_ = CE_Failure;
 
-    OGR_F_Destroy(hFeat);
+    // Shouldn't happen for well behaved drivers, but better check...
+    else if (poFeature_->GetGeometryRef() != poPolygon_)
+    {
+        poPolygon_ = new OGRPolygon();
+        poFeature_->SetGeometryDirectly(poPolygon_);
+    }
 }
 
 }  // namespace polygonizer
diff --git a/alg/polygonize_polygonizer.h b/alg/polygonize_polygonizer.h
index f09593418c32..c5ecb4bd7224 100644
--- a/alg/polygonize_polygonizer.h
+++ b/alg/polygonize_polygonizer.h
@@ -41,6 +41,8 @@
 
 #include "cpl_error.h"
 #include "ogr_api.h"
+#include "ogr_geometry.h"
+#include "ogrsf_frmts.h"
 
 namespace gdal
 {
@@ -67,12 +69,24 @@ struct RPolygon
 {
     IndexType iBottomRightRow{0};
     IndexType iBottomRightCol{0};
+
+    struct ArcStruct
+    {
+        std::unique_ptr<Arc> poArc{};
+        // each element is the next arc index of the current arc
+        unsigned nConnection = 0;
+        // does arc follows the right-hand rule with
+        bool bFollowRighthand = false;
+
+        ArcStruct(unsigned nConnectionIn, bool bFollowRighthandIn)
+            : poArc(std::make_unique<Arc>()), nConnection(nConnectionIn),
+              bFollowRighthand(bFollowRighthandIn)
+        {
+        }
+    };
+
     // arc object list
-    std::vector<Arc *> oArcs{};
-    // does arc follows the right-hand rule with
-    std::vector<bool> oArcRighthandFollow{};
-    // each element is the next arc index of the current arc
-    std::vector<std::size_t> oArcConnections{};
+    std::vector<ArcStruct> oArcs{};
 
     RPolygon() = default;
 
@@ -80,8 +94,6 @@ struct RPolygon
 
     RPolygon &operator=(const RPolygon &) = delete;
 
-    ~RPolygon();
-
     /**
      * create a new arc object
      */
@@ -187,9 +199,12 @@ template <typename PolyIdType, typename DataType> class Polygonizer
 template <typename DataType>
 class OGRPolygonWriter : public PolygonReceiver<DataType>
 {
-    OGRLayerH hOutLayer_;
+    OGRLayer *poOutLayer_ = nullptr;
     int iPixValField_;
     double *padfGeoTransform_;
+    std::unique_ptr<OGRFeature> poFeature_{};
+    OGRPolygon *poPolygon_ =
+        nullptr;  // = poFeature_->GetGeometryRef(), owned by poFeature
 
     CPLErr eErr_{CE_None};
 

From e10393a27b0a6b91a515f4b93b3b64aea3ec19b2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Jul 2024 21:46:18 +0200
Subject: [PATCH 25/94] Polygonize: make it catch out of memory situations

---
 alg/polygonize.cpp             |  28 +++++--
 alg/polygonize_polygonizer.cpp | 141 ++++++++++++++++++++-------------
 alg/polygonize_polygonizer.h   |   2 +-
 3 files changed, 106 insertions(+), 65 deletions(-)

diff --git a/alg/polygonize.cpp b/alg/polygonize.cpp
index f9fb2b548e7a..4feb4edb1a79 100644
--- a/alg/polygonize.cpp
+++ b/alg/polygonize.cpp
@@ -336,17 +336,29 @@ static CPLErr GDALPolygonizeT(GDALRasterBandH hSrcBand,
                         : oFirstEnum.panPolyIdMap[panThisLineId[iX]];
             }
 
-            oPolygonizer.processLine(panLastLineId, panLastLineVal,
-                                     paoThisLineArm, paoLastLineArm, iY,
-                                     nXSize);
-            eErr = oPolygonWriter.getErr();
+            if (!oPolygonizer.processLine(panLastLineId, panLastLineVal,
+                                          paoThisLineArm, paoLastLineArm, iY,
+                                          nXSize))
+            {
+                eErr = CE_Failure;
+            }
+            else
+            {
+                eErr = oPolygonWriter.getErr();
+            }
         }
         else
         {
-            oPolygonizer.processLine(panThisLineId, panLastLineVal,
-                                     paoThisLineArm, paoLastLineArm, iY,
-                                     nXSize);
-            eErr = oPolygonWriter.getErr();
+            if (!oPolygonizer.processLine(panThisLineId, panLastLineVal,
+                                          paoThisLineArm, paoLastLineArm, iY,
+                                          nXSize))
+            {
+                eErr = CE_Failure;
+            }
+            else
+            {
+                eErr = oPolygonWriter.getErr();
+            }
         }
 
         if (eErr != CE_None)
diff --git a/alg/polygonize_polygonizer.cpp b/alg/polygonize_polygonizer.cpp
index f32c05410d17..014962cd7314 100644
--- a/alg/polygonize_polygonizer.cpp
+++ b/alg/polygonize_polygonizer.cpp
@@ -380,70 +380,80 @@ void Polygonizer<PolyIdType, DataType>::destroyPolygon(PolyIdType nPolygonId)
 }
 
 template <typename PolyIdType, typename DataType>
-void Polygonizer<PolyIdType, DataType>::processLine(
+bool Polygonizer<PolyIdType, DataType>::processLine(
     const PolyIdType *panThisLineId, const DataType *panLastLineVal,
     TwoArm *poThisLineArm, TwoArm *poLastLineArm, const IndexType nCurrentRow,
     const IndexType nCols)
 {
     TwoArm *poCurrent, *poAbove, *poLeft;
 
-    poCurrent = poThisLineArm + 1;
-    poCurrent->iRow = nCurrentRow;
-    poCurrent->iCol = 0;
-    poCurrent->poPolyInside = getPolygon(panThisLineId[0]);
-    poAbove = poLastLineArm + 1;
-    poLeft = poThisLineArm;
-    poLeft->poPolyInside = poTheOuterPolygon_;
-    ProcessArmConnections(poCurrent, poAbove, poLeft);
-    for (IndexType col = 1; col < nCols; ++col)
+    try
     {
-        IndexType iArmIndex = col + 1;
-        poCurrent = poThisLineArm + iArmIndex;
+        poCurrent = poThisLineArm + 1;
         poCurrent->iRow = nCurrentRow;
-        poCurrent->iCol = col;
-        poCurrent->poPolyInside = getPolygon(panThisLineId[col]);
-        poAbove = poLastLineArm + iArmIndex;
-        poLeft = poThisLineArm + iArmIndex - 1;
+        poCurrent->iCol = 0;
+        poCurrent->poPolyInside = getPolygon(panThisLineId[0]);
+        poAbove = poLastLineArm + 1;
+        poLeft = poThisLineArm;
+        poLeft->poPolyInside = poTheOuterPolygon_;
         ProcessArmConnections(poCurrent, poAbove, poLeft);
-    }
-    poCurrent = poThisLineArm + nCols + 1;
-    poCurrent->iRow = nCurrentRow;
-    poCurrent->iCol = nCols;
-    poCurrent->poPolyInside = poTheOuterPolygon_;
-    poAbove = poLastLineArm + nCols + 1;
-    poAbove->poPolyInside = poTheOuterPolygon_;
-    poLeft = poThisLineArm + nCols;
-    ProcessArmConnections(poCurrent, poAbove, poLeft);
-
-    /**
-     *
-     * Find those polygons haven't been processed on this line as we can be sure they are completed
-     *
-     */
-    std::vector<PolygonMapEntry> oCompletedPolygons;
-    for (auto &entry : oPolygonMap_)
-    {
-        RPolygon *poPolygon = entry.second;
-
-        if (poPolygon->iBottomRightRow + 1 == nCurrentRow)
+        for (IndexType col = 1; col < nCols; ++col)
         {
-            oCompletedPolygons.push_back(entry);
+            IndexType iArmIndex = col + 1;
+            poCurrent = poThisLineArm + iArmIndex;
+            poCurrent->iRow = nCurrentRow;
+            poCurrent->iCol = col;
+            poCurrent->poPolyInside = getPolygon(panThisLineId[col]);
+            poAbove = poLastLineArm + iArmIndex;
+            poLeft = poThisLineArm + iArmIndex - 1;
+            ProcessArmConnections(poCurrent, poAbove, poLeft);
         }
-    }
-    // cppcheck-suppress constVariableReference
-    for (auto &entry : oCompletedPolygons)
-    {
-        PolyIdType nPolyId = entry.first;
-        RPolygon *poPolygon = entry.second;
+        poCurrent = poThisLineArm + nCols + 1;
+        poCurrent->iRow = nCurrentRow;
+        poCurrent->iCol = nCols;
+        poCurrent->poPolyInside = poTheOuterPolygon_;
+        poAbove = poLastLineArm + nCols + 1;
+        poAbove->poPolyInside = poTheOuterPolygon_;
+        poLeft = poThisLineArm + nCols;
+        ProcessArmConnections(poCurrent, poAbove, poLeft);
 
-        // emit valid polygon only
-        if (nPolyId != nInvalidPolyId_)
+        /**
+         *
+         * Find those polygons haven't been processed on this line as we can be sure they are completed
+         *
+         */
+        std::vector<PolygonMapEntry> oCompletedPolygons;
+        for (auto &entry : oPolygonMap_)
         {
-            poPolygonReceiver_->receive(
-                poPolygon, panLastLineVal[poPolygon->iBottomRightCol]);
+            RPolygon *poPolygon = entry.second;
+
+            if (poPolygon->iBottomRightRow + 1 == nCurrentRow)
+            {
+                oCompletedPolygons.push_back(entry);
+            }
         }
+        // cppcheck-suppress constVariableReference
+        for (auto &entry : oCompletedPolygons)
+        {
+            PolyIdType nPolyId = entry.first;
+            RPolygon *poPolygon = entry.second;
 
-        destroyPolygon(nPolyId);
+            // emit valid polygon only
+            if (nPolyId != nInvalidPolyId_)
+            {
+                poPolygonReceiver_->receive(
+                    poPolygon, panLastLineVal[poPolygon->iBottomRightCol]);
+            }
+
+            destroyPolygon(nPolyId);
+        }
+        return true;
+    }
+    catch (const std::bad_alloc &)
+    {
+        CPLError(CE_Failure, CPLE_OutOfMemory,
+                 "Out of memory in Polygonizer::processLine");
+        return false;
     }
 }
 
@@ -481,9 +491,12 @@ void OGRPolygonWriter<DataType>::receive(RPolygon *poPolygon,
         [this, &poPolygon, &oAccessedArc,
          padfGeoTransform](std::size_t iFirstArcIndex, OGRLinearRing *poRing)
     {
-        const bool bAddRing = poRing == nullptr;
+        std::unique_ptr<OGRLinearRing> poNewRing;
         if (!poRing)
-            poRing = new OGRLinearRing();
+        {
+            poNewRing = std::make_unique<OGRLinearRing>();
+            poRing = poNewRing.get();
+        }
 
         auto AddArcToRing =
             [&poPolygon, poRing, padfGeoTransform](std::size_t iArcIndex)
@@ -494,6 +507,10 @@ void OGRPolygonWriter<DataType>::receive(RPolygon *poPolygon,
             int nDstPointIdx = poRing->getNumPoints();
             poRing->setNumPoints(nDstPointIdx + nArcPointCount,
                                  /* bZeroizeNewContent = */ false);
+            if (poRing->getNumPoints() < nDstPointIdx + nArcPointCount)
+            {
+                return false;
+            }
             for (int i = 0; i < nArcPointCount; ++i)
             {
                 const Point &oPixel =
@@ -511,16 +528,23 @@ void OGRPolygonWriter<DataType>::receive(RPolygon *poPolygon,
                 poRing->setPoint(nDstPointIdx, dfX, dfY);
                 ++nDstPointIdx;
             }
+            return true;
         };
 
-        AddArcToRing(iFirstArcIndex);
+        if (!AddArcToRing(iFirstArcIndex))
+        {
+            return false;
+        }
 
         std::size_t iArcIndex = iFirstArcIndex;
         std::size_t iNextArcIndex = poPolygon->oArcs[iArcIndex].nConnection;
         oAccessedArc[iArcIndex] = true;
         while (iNextArcIndex != iFirstArcIndex)
         {
-            AddArcToRing(iNextArcIndex);
+            if (!AddArcToRing(iNextArcIndex))
+            {
+                return false;
+            }
             iArcIndex = iNextArcIndex;
             iNextArcIndex = poPolygon->oArcs[iArcIndex].nConnection;
             oAccessedArc[iArcIndex] = true;
@@ -529,15 +553,20 @@ void OGRPolygonWriter<DataType>::receive(RPolygon *poPolygon,
         // close ring manually
         poRing->closeRings();
 
-        if (bAddRing)
-            poPolygon_->addRingDirectly(poRing);
+        if (poNewRing)
+            poPolygon_->addRingDirectly(poNewRing.release());
+        return true;
     };
 
     for (size_t i = 0; i < oAccessedArc.size(); ++i)
     {
         if (!oAccessedArc[i])
         {
-            AddRingToPolygon(i, poFirstRing);
+            if (!AddRingToPolygon(i, poFirstRing))
+            {
+                eErr_ = CE_Failure;
+                return;
+            }
             poFirstRing = nullptr;
         }
     }
diff --git a/alg/polygonize_polygonizer.h b/alg/polygonize_polygonizer.h
index c5ecb4bd7224..6688ec894aee 100644
--- a/alg/polygonize_polygonizer.h
+++ b/alg/polygonize_polygonizer.h
@@ -187,7 +187,7 @@ template <typename PolyIdType, typename DataType> class Polygonizer
         return poTheOuterPolygon_;
     }
 
-    void processLine(const PolyIdType *panThisLineId,
+    bool processLine(const PolyIdType *panThisLineId,
                      const DataType *panLastLineVal, TwoArm *poThisLineArm,
                      TwoArm *poLastLineArm, IndexType nCurrentRow,
                      IndexType nCols);

From 538594a6d247654c0814709d5529abf495296831 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Jul 2024 22:36:49 +0200
Subject: [PATCH 26/94] OGRGeometry classes: add a bool return type for methods
 that can fail

---
 ogr/ogr_geometry.h            | 100 ++++-----
 ogr/ogrcircularstring.cpp     |  17 +-
 ogr/ogrcompoundcurve.cpp      |  16 +-
 ogr/ogrcurvecollection.cpp    |  27 ++-
 ogr/ogrcurvepolygon.cpp       |  18 +-
 ogr/ogrgeometry.cpp           |  17 +-
 ogr/ogrgeometrycollection.cpp |  27 ++-
 ogr/ogrlinestring.cpp         | 402 +++++++++++++++++++---------------
 ogr/ogrpoint.cpp              |   3 +-
 ogr/ogrpolyhedralsurface.cpp  |  21 +-
 10 files changed, 365 insertions(+), 283 deletions(-)

diff --git a/ogr/ogr_geometry.h b/ogr/ogr_geometry.h
index 42144dce1419..08c1ed5835ad 100644
--- a/ogr/ogr_geometry.h
+++ b/ogr/ogr_geometry.h
@@ -544,9 +544,9 @@ class CPL_DLL OGRGeometry
     //! @endcond
     virtual void closeRings();
 
-    virtual void setCoordinateDimension(int nDimension);
-    virtual void set3D(OGRBoolean bIs3D);
-    virtual void setMeasured(OGRBoolean bIsMeasured);
+    virtual bool setCoordinateDimension(int nDimension);
+    virtual bool set3D(OGRBoolean bIs3D);
+    virtual bool setMeasured(OGRBoolean bIsMeasured);
 
     virtual void assignSpatialReference(const OGRSpatialReference *poSR);
 
@@ -558,7 +558,7 @@ class CPL_DLL OGRGeometry
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) = 0;
     OGRErr transformTo(const OGRSpatialReference *poSR);
 
-    virtual void segmentize(double dfMaxLength);
+    virtual bool segmentize(double dfMaxLength);
 
     // ISpatialRelation
     virtual OGRBoolean Intersects(const OGRGeometry *) const;
@@ -1227,7 +1227,7 @@ class CPL_DLL OGRPoint : public OGRGeometry
     }
 
     // Non standard
-    virtual void setCoordinateDimension(int nDimension) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
 
     /** Set x
      * @param xIn x
@@ -1532,10 +1532,10 @@ class CPL_DLL OGRSimpleCurve : public OGRCurve
     double *padfZ;
     double *padfM;
 
-    void Make3D();
+    bool Make3D();
     void Make2D();
     void RemoveM();
-    void AddM();
+    bool AddM();
 
     OGRErr importFromWKTListOnly(const char **ppszInput, int bHasZ, int bHasM,
                                  OGRRawPoint *&paoPointsIn, int &nMaxPoints,
@@ -1682,31 +1682,31 @@ class CPL_DLL OGRSimpleCurve : public OGRCurve
     virtual OGRBoolean Equals(const OGRGeometry *) const override;
 
     // non standard.
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
-    void setNumPoints(int nNewPointCount, int bZeroizeNewContent = TRUE);
-    void setPoint(int, OGRPoint *);
-    void setPoint(int, double, double);
-    void setZ(int, double);
-    void setM(int, double);
-    void setPoint(int, double, double, double);
-    void setPointM(int, double, double, double);
-    void setPoint(int, double, double, double, double);
-    void setPoints(int, const OGRRawPoint *, const double * = nullptr);
-    void setPointsM(int, const OGRRawPoint *, const double *);
-    void setPoints(int, const OGRRawPoint *, const double *, const double *);
-    void setPoints(int, const double *padfX, const double *padfY,
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
+    bool setNumPoints(int nNewPointCount, int bZeroizeNewContent = TRUE);
+    bool setPoint(int, OGRPoint *);
+    bool setPoint(int, double, double);
+    bool setZ(int, double);
+    bool setM(int, double);
+    bool setPoint(int, double, double, double);
+    bool setPointM(int, double, double, double);
+    bool setPoint(int, double, double, double, double);
+    bool setPoints(int, const OGRRawPoint *, const double * = nullptr);
+    bool setPointsM(int, const OGRRawPoint *, const double *);
+    bool setPoints(int, const OGRRawPoint *, const double *, const double *);
+    bool setPoints(int, const double *padfX, const double *padfY,
                    const double *padfZIn = nullptr);
-    void setPointsM(int, const double *padfX, const double *padfY,
+    bool setPointsM(int, const double *padfX, const double *padfY,
                     const double *padfMIn = nullptr);
-    void setPoints(int, const double *padfX, const double *padfY,
+    bool setPoints(int, const double *padfX, const double *padfY,
                    const double *padfZIn, const double *padfMIn);
-    void addPoint(const OGRPoint *);
-    void addPoint(double, double);
-    void addPoint(double, double, double);
-    void addPointM(double, double, double);
-    void addPoint(double, double, double, double);
+    bool addPoint(const OGRPoint *);
+    bool addPoint(double, double);
+    bool addPoint(double, double, double);
+    bool addPointM(double, double, double);
+    bool addPoint(double, double, double, double);
 
     bool removePoint(int);
 
@@ -1723,7 +1723,7 @@ class CPL_DLL OGRSimpleCurve : public OGRCurve
     // non-standard from OGRGeometry
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) override;
     virtual void flattenTo2D() override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
 
     virtual void swapXY() override;
 
@@ -2022,7 +2022,7 @@ class CPL_DLL OGRCircularString : public OGRSimpleCurve
     // Non-standard from OGRGeometry.
     virtual OGRwkbGeometryType getGeometryType() const override;
     virtual const char *getGeometryName() const override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
     virtual OGRBoolean
     hasCurveGeometry(int bLookForNonLinear = FALSE) const override;
     virtual OGRGeometry *
@@ -2144,9 +2144,9 @@ class CPL_DLL OGRCurveCollection
     OGRErr exportToWkb(const OGRGeometry *poGeom, unsigned char *,
                        const OGRwkbExportOptions * = nullptr) const;
     OGRBoolean Equals(const OGRCurveCollection *poOCC) const;
-    void setCoordinateDimension(OGRGeometry *poGeom, int nNewDimension);
-    void set3D(OGRGeometry *poGeom, OGRBoolean bIs3D);
-    void setMeasured(OGRGeometry *poGeom, OGRBoolean bIsMeasured);
+    bool setCoordinateDimension(OGRGeometry *poGeom, int nNewDimension);
+    bool set3D(OGRGeometry *poGeom, OGRBoolean bIs3D);
+    bool setMeasured(OGRGeometry *poGeom, OGRBoolean bIsMeasured);
     void assignSpatialReference(OGRGeometry *poGeom,
                                 const OGRSpatialReference *poSR);
     int getNumCurves() const;
@@ -2163,7 +2163,7 @@ class CPL_DLL OGRCurveCollection
 
     OGRErr transform(OGRGeometry *poGeom, OGRCoordinateTransformation *poCT);
     void flattenTo2D(OGRGeometry *poGeom);
-    void segmentize(double dfMaxLength);
+    bool segmentize(double dfMaxLength);
     void swapXY();
     OGRBoolean hasCurveGeometry(int bLookForNonLinear) const;
 };
@@ -2305,9 +2305,9 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve
     const OGRCurve *getCurve(int) const;
 
     // Non-standard.
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
 
     virtual void
     assignSpatialReference(const OGRSpatialReference *poSR) override;
@@ -2332,7 +2332,7 @@ class CPL_DLL OGRCompoundCurve : public OGRCurve
     virtual const char *getGeometryName() const override;
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) override;
     virtual void flattenTo2D() override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
     virtual OGRBoolean
     hasCurveGeometry(int bLookForNonLinear = FALSE) const override;
     virtual OGRGeometry *
@@ -2518,7 +2518,7 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) override;
     virtual void flattenTo2D() override;
     virtual OGRBoolean IsEmpty() const override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
     virtual OGRBoolean
     hasCurveGeometry(int bLookForNonLinear = FALSE) const override;
     virtual OGRGeometry *
@@ -2570,9 +2570,9 @@ class CPL_DLL OGRCurvePolygon : public OGRSurface
     virtual OGRBoolean Contains(const OGRGeometry *) const override;
 
     // Non standard
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
 
     virtual void
     assignSpatialReference(const OGRSpatialReference *poSR) override;
@@ -2971,7 +2971,7 @@ class CPL_DLL OGRGeometryCollection : public OGRGeometry
     virtual OGRErr transform(OGRCoordinateTransformation *poCT) override;
     virtual void flattenTo2D() override;
     virtual OGRBoolean IsEmpty() const override;
-    virtual void segmentize(double dfMaxLength) override;
+    virtual bool segmentize(double dfMaxLength) override;
     virtual OGRBoolean
     hasCurveGeometry(int bLookForNonLinear = FALSE) const override;
     virtual OGRGeometry *
@@ -3023,9 +3023,9 @@ class CPL_DLL OGRGeometryCollection : public OGRGeometry
     virtual OGRBoolean Equals(const OGRGeometry *) const override;
 
     // Non standard
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
     virtual OGRErr addGeometry(const OGRGeometry *);
     virtual OGRErr addGeometryDirectly(OGRGeometry *);
     OGRErr addGeometry(std::unique_ptr<OGRGeometry> geom);
@@ -3525,9 +3525,9 @@ class CPL_DLL OGRPolyhedralSurface : public OGRSurface
     const OGRPolygon *getGeometryRef(int i) const;
 
     virtual OGRBoolean IsEmpty() const override;
-    virtual void setCoordinateDimension(int nDimension) override;
-    virtual void set3D(OGRBoolean bIs3D) override;
-    virtual void setMeasured(OGRBoolean bIsMeasured) override;
+    virtual bool setCoordinateDimension(int nDimension) override;
+    virtual bool set3D(OGRBoolean bIs3D) override;
+    virtual bool setMeasured(OGRBoolean bIsMeasured) override;
     virtual void swapXY() override;
     OGRErr removeGeometry(int iIndex, int bDelete = TRUE);
 
diff --git a/ogr/ogrcircularstring.cpp b/ogr/ogrcircularstring.cpp
index b25a04bf42de..0a6ae655095c 100644
--- a/ogr/ogrcircularstring.cpp
+++ b/ogr/ogrcircularstring.cpp
@@ -359,10 +359,12 @@ void OGRCircularString::getEnvelope(OGREnvelope3D *psEnvelope) const
 /*                     OGRCircularString::segmentize()                  */
 /************************************************************************/
 
-void OGRCircularString::segmentize(double dfMaxLength)
+bool OGRCircularString::segmentize(double dfMaxLength)
 {
-    if (!IsValidFast() || nPointCount == 0)
-        return;
+    if (!IsValidFast())
+        return false;
+    if (nPointCount == 0)
+        return true;
 
     // So as to make sure that the same line followed in both directions
     // result in the same segmentized line.
@@ -371,12 +373,14 @@ void OGRCircularString::segmentize(double dfMaxLength)
          paoPoints[0].y < paoPoints[nPointCount - 1].y))
     {
         reversePoints();
-        segmentize(dfMaxLength);
+        const bool bRet = segmentize(dfMaxLength);
         reversePoints();
+        return bRet;
     }
 
     std::vector<OGRRawPoint> aoRawPoint;
     std::vector<double> adfZ;
+    bool bRet = true;
     for (int i = 0; i < nPointCount - 2; i += 2)
     {
         const double x0 = paoPoints[i].x;
@@ -416,6 +420,7 @@ void OGRCircularString::segmentize(double dfMaxLength)
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "segmentize nIntermediatePoints invalid: %lf",
                              dfVal);
+                    bRet = false;
                     break;
                 }
                 const int nIntermediatePoints = static_cast<int>(dfVal);
@@ -451,6 +456,7 @@ void OGRCircularString::segmentize(double dfMaxLength)
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "segmentize nIntermediatePoints invalid 2: %lf",
                              dfVal);
+                    bRet = false;
                     break;
                 }
                 int nIntermediatePoints = static_cast<int>(dfVal);
@@ -489,6 +495,7 @@ void OGRCircularString::segmentize(double dfMaxLength)
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "segmentize nIntermediatePoints invalid 2: %lf",
                              dfVal);
+                    bRet = false;
                     break;
                 }
                 int nIntermediatePoints = static_cast<int>(dfVal);
@@ -519,6 +526,7 @@ void OGRCircularString::segmentize(double dfMaxLength)
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "segmentize nIntermediatePoints invalid 3: %lf",
                              dfVal);
+                    bRet = false;
                     break;
                 }
                 const int nIntermediatePoints = static_cast<int>(dfVal);
@@ -561,6 +569,7 @@ void OGRCircularString::segmentize(double dfMaxLength)
             memcpy(padfZ, &adfZ[0], sizeof(double) * nPointCount);
         }
     }
+    return bRet;
 }
 
 /************************************************************************/
diff --git a/ogr/ogrcompoundcurve.cpp b/ogr/ogrcompoundcurve.cpp
index 0b2448f241c1..73ab33d9ee19 100644
--- a/ogr/ogrcompoundcurve.cpp
+++ b/ogr/ogrcompoundcurve.cpp
@@ -380,19 +380,19 @@ OGRBoolean OGRCompoundCurve::Equals(const OGRGeometry *poOther) const
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRCompoundCurve::setCoordinateDimension(int nNewDimension)
+bool OGRCompoundCurve::setCoordinateDimension(int nNewDimension)
 {
-    oCC.setCoordinateDimension(this, nNewDimension);
+    return oCC.setCoordinateDimension(this, nNewDimension);
 }
 
-void OGRCompoundCurve::set3D(OGRBoolean bIs3D)
+bool OGRCompoundCurve::set3D(OGRBoolean bIs3D)
 {
-    oCC.set3D(this, bIs3D);
+    return oCC.set3D(this, bIs3D);
 }
 
-void OGRCompoundCurve::setMeasured(OGRBoolean bIsMeasured)
+bool OGRCompoundCurve::setMeasured(OGRBoolean bIsMeasured)
 {
-    oCC.setMeasured(this, bIsMeasured);
+    return oCC.setMeasured(this, bIsMeasured);
 }
 
 /************************************************************************/
@@ -667,9 +667,9 @@ void OGRCompoundCurve::flattenTo2D()
 /*                              segmentize()                            */
 /************************************************************************/
 
-void OGRCompoundCurve::segmentize(double dfMaxLength)
+bool OGRCompoundCurve::segmentize(double dfMaxLength)
 {
-    oCC.segmentize(dfMaxLength);
+    return oCC.segmentize(dfMaxLength);
 }
 
 /************************************************************************/
diff --git a/ogr/ogrcurvecollection.cpp b/ogr/ogrcurvecollection.cpp
index 36d6466dd4da..014349ddd3b7 100644
--- a/ogr/ogrcurvecollection.cpp
+++ b/ogr/ogrcurvecollection.cpp
@@ -542,36 +542,39 @@ OGRBoolean OGRCurveCollection::Equals(const OGRCurveCollection *poOCC) const
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRCurveCollection::setCoordinateDimension(OGRGeometry *poGeom,
+bool OGRCurveCollection::setCoordinateDimension(OGRGeometry *poGeom,
                                                 int nNewDimension)
 {
     for (auto &&poSubGeom : *this)
     {
-        poSubGeom->setCoordinateDimension(nNewDimension);
+        if (!poSubGeom->setCoordinateDimension(nNewDimension))
+            return false;
     }
 
-    poGeom->OGRGeometry::setCoordinateDimension(nNewDimension);
+    return poGeom->OGRGeometry::setCoordinateDimension(nNewDimension);
 }
 
-void OGRCurveCollection::set3D(OGRGeometry *poGeom, OGRBoolean bIs3D)
+bool OGRCurveCollection::set3D(OGRGeometry *poGeom, OGRBoolean bIs3D)
 {
     for (auto &&poSubGeom : *this)
     {
-        poSubGeom->set3D(bIs3D);
+        if (!poSubGeom->set3D(bIs3D))
+            return false;
     }
 
-    poGeom->OGRGeometry::set3D(bIs3D);
+    return poGeom->OGRGeometry::set3D(bIs3D);
 }
 
-void OGRCurveCollection::setMeasured(OGRGeometry *poGeom,
+bool OGRCurveCollection::setMeasured(OGRGeometry *poGeom,
                                      OGRBoolean bIsMeasured)
 {
     for (auto &&poSubGeom : *this)
     {
-        poSubGeom->setMeasured(bIsMeasured);
+        if (!poSubGeom->setMeasured(bIsMeasured))
+            return false;
     }
 
-    poGeom->OGRGeometry::setMeasured(bIsMeasured);
+    return poGeom->OGRGeometry::setMeasured(bIsMeasured);
 }
 
 /************************************************************************/
@@ -685,12 +688,14 @@ void OGRCurveCollection::flattenTo2D(OGRGeometry *poGeom)
 /*                              segmentize()                            */
 /************************************************************************/
 
-void OGRCurveCollection::segmentize(double dfMaxLength)
+bool OGRCurveCollection::segmentize(double dfMaxLength)
 {
     for (auto &&poSubGeom : *this)
     {
-        poSubGeom->segmentize(dfMaxLength);
+        if (!poSubGeom->segmentize(dfMaxLength))
+            return false;
     }
+    return true;
 }
 
 /************************************************************************/
diff --git a/ogr/ogrcurvepolygon.cpp b/ogr/ogrcurvepolygon.cpp
index 206745d38a0b..4e9ada940076 100644
--- a/ogr/ogrcurvepolygon.cpp
+++ b/ogr/ogrcurvepolygon.cpp
@@ -734,20 +734,20 @@ double OGRCurvePolygon::get_GeodesicArea(
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRCurvePolygon::setCoordinateDimension(int nNewDimension)
+bool OGRCurvePolygon::setCoordinateDimension(int nNewDimension)
 
 {
-    oCC.setCoordinateDimension(this, nNewDimension);
+    return oCC.setCoordinateDimension(this, nNewDimension);
 }
 
-void OGRCurvePolygon::set3D(OGRBoolean bIs3D)
+bool OGRCurvePolygon::set3D(OGRBoolean bIs3D)
 {
-    oCC.set3D(this, bIs3D);
+    return oCC.set3D(this, bIs3D);
 }
 
-void OGRCurvePolygon::setMeasured(OGRBoolean bIsMeasured)
+bool OGRCurvePolygon::setMeasured(OGRBoolean bIsMeasured)
 {
-    oCC.setMeasured(this, bIsMeasured);
+    return oCC.setMeasured(this, bIsMeasured);
 }
 
 /************************************************************************/
@@ -772,15 +772,15 @@ OGRBoolean OGRCurvePolygon::IsEmpty() const
 /*                              segmentize()                            */
 /************************************************************************/
 
-void OGRCurvePolygon::segmentize(double dfMaxLength)
+bool OGRCurvePolygon::segmentize(double dfMaxLength)
 {
     if (EQUAL(getGeometryName(), "TRIANGLE"))
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "segmentize() is not valid for Triangle");
-        return;
+        return false;
     }
-    oCC.segmentize(dfMaxLength);
+    return oCC.segmentize(dfMaxLength);
 }
 
 /************************************************************************/
diff --git a/ogr/ogrgeometry.cpp b/ogr/ogrgeometry.cpp
index 62d378d1891e..c2d47519efbe 100644
--- a/ogr/ogrgeometry.cpp
+++ b/ogr/ogrgeometry.cpp
@@ -862,11 +862,13 @@ OGRwkbGeometryType OGRGeometry::getIsoGeometryType() const
  * This function is the same as the C function OGR_G_Segmentize()
  *
  * @param dfMaxLength the maximum distance between 2 points after segmentization
+ * @return (since 3.10) true in case of success, false in case of error.
  */
 
-void OGRGeometry::segmentize(CPL_UNUSED double dfMaxLength)
+bool OGRGeometry::segmentize(CPL_UNUSED double dfMaxLength)
 {
     // Do nothing.
+    return true;
 }
 
 /************************************************************************/
@@ -1080,16 +1082,17 @@ int OGR_G_IsMeasured(OGRGeometryH hGeom)
  * @deprecated use set3D() or setMeasured().
  *
  * @param nNewDimension New coordinate dimension value, either 2 or 3.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRGeometry::setCoordinateDimension(int nNewDimension)
+bool OGRGeometry::setCoordinateDimension(int nNewDimension)
 
 {
     if (nNewDimension == 2)
         flags &= ~OGR_G_3D;
     else
         flags |= OGR_G_3D;
-    setMeasured(FALSE);
+    return setMeasured(FALSE);
 }
 
 /**
@@ -1102,16 +1105,18 @@ void OGRGeometry::setCoordinateDimension(int nNewDimension)
  * children geometries.
  *
  * @param bIs3D Should the geometry have a Z dimension, either TRUE or FALSE.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  * @since GDAL 2.1
  */
 
-void OGRGeometry::set3D(OGRBoolean bIs3D)
+bool OGRGeometry::set3D(OGRBoolean bIs3D)
 
 {
     if (bIs3D)
         flags |= OGR_G_3D;
     else
         flags &= ~OGR_G_3D;
+    return true;
 }
 
 /**
@@ -1125,16 +1130,18 @@ void OGRGeometry::set3D(OGRBoolean bIs3D)
  *
  * @param bIsMeasured Should the geometry have a M dimension, either
  * TRUE or FALSE.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  * @since GDAL 2.1
  */
 
-void OGRGeometry::setMeasured(OGRBoolean bIsMeasured)
+bool OGRGeometry::setMeasured(OGRBoolean bIsMeasured)
 
 {
     if (bIsMeasured)
         flags |= OGR_G_MEASURED;
     else
         flags &= ~OGR_G_MEASURED;
+    return true;
 }
 
 /************************************************************************/
diff --git a/ogr/ogrgeometrycollection.cpp b/ogr/ogrgeometrycollection.cpp
index 0b9c3e90d404..f0e8526c1975 100644
--- a/ogr/ogrgeometrycollection.cpp
+++ b/ogr/ogrgeometrycollection.cpp
@@ -1100,35 +1100,38 @@ void OGRGeometryCollection::closeRings()
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRGeometryCollection::setCoordinateDimension(int nNewDimension)
+bool OGRGeometryCollection::setCoordinateDimension(int nNewDimension)
 
 {
     for (auto &poSubGeom : *this)
     {
-        poSubGeom->setCoordinateDimension(nNewDimension);
+        if (!poSubGeom->setCoordinateDimension(nNewDimension))
+            return false;
     }
 
-    OGRGeometry::setCoordinateDimension(nNewDimension);
+    return OGRGeometry::setCoordinateDimension(nNewDimension);
 }
 
-void OGRGeometryCollection::set3D(OGRBoolean bIs3D)
+bool OGRGeometryCollection::set3D(OGRBoolean bIs3D)
 {
     for (auto &poSubGeom : *this)
     {
-        poSubGeom->set3D(bIs3D);
+        if (!poSubGeom->set3D(bIs3D))
+            return false;
     }
 
-    OGRGeometry::set3D(bIs3D);
+    return OGRGeometry::set3D(bIs3D);
 }
 
-void OGRGeometryCollection::setMeasured(OGRBoolean bIsMeasured)
+bool OGRGeometryCollection::setMeasured(OGRBoolean bIsMeasured)
 {
     for (auto &poSubGeom : *this)
     {
-        poSubGeom->setMeasured(bIsMeasured);
+        if (!poSubGeom->setMeasured(bIsMeasured))
+            return false;
     }
 
-    OGRGeometry::setMeasured(bIsMeasured);
+    return OGRGeometry::setMeasured(bIsMeasured);
 }
 
 /************************************************************************/
@@ -1317,12 +1320,14 @@ void OGRGeometryCollection::assignSpatialReference(
 /*              OGRGeometryCollection::segmentize()                     */
 /************************************************************************/
 
-void OGRGeometryCollection::segmentize(double dfMaxLength)
+bool OGRGeometryCollection::segmentize(double dfMaxLength)
 {
     for (auto &poSubGeom : *this)
     {
-        poSubGeom->segmentize(dfMaxLength);
+        if (!poSubGeom->segmentize(dfMaxLength))
+            return false;
     }
+    return true;
 }
 
 /************************************************************************/
diff --git a/ogr/ogrlinestring.cpp b/ogr/ogrlinestring.cpp
index f3e155eac89f..5f6b3faba55c 100644
--- a/ogr/ogrlinestring.cpp
+++ b/ogr/ogrlinestring.cpp
@@ -149,32 +149,35 @@ void OGRSimpleCurve::empty()
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRSimpleCurve::setCoordinateDimension(int nNewDimension)
+bool OGRSimpleCurve::setCoordinateDimension(int nNewDimension)
 
 {
+    setMeasured(FALSE);
     if (nNewDimension == 2)
         Make2D();
     else if (nNewDimension == 3)
-        Make3D();
-    setMeasured(FALSE);
+        return Make3D();
+    return true;
 }
 
-void OGRSimpleCurve::set3D(OGRBoolean bIs3D)
+bool OGRSimpleCurve::set3D(OGRBoolean bIs3D)
 
 {
     if (bIs3D)
-        Make3D();
+        return Make3D();
     else
         Make2D();
+    return true;
 }
 
-void OGRSimpleCurve::setMeasured(OGRBoolean bIsMeasured)
+bool OGRSimpleCurve::setMeasured(OGRBoolean bIsMeasured)
 
 {
     if (bIsMeasured)
-        AddM();
+        return AddM();
     else
         RemoveM();
+    return true;
 }
 
 /************************************************************************/
@@ -211,7 +214,7 @@ void OGRSimpleCurve::Make2D()
 /*                               Make3D()                               */
 /************************************************************************/
 
-void OGRSimpleCurve::Make3D()
+bool OGRSimpleCurve::Make3D()
 
 {
     if (padfZ == nullptr)
@@ -223,10 +226,11 @@ void OGRSimpleCurve::Make3D()
             flags &= ~OGR_G_3D;
             CPLError(CE_Failure, CPLE_AppDefined,
                      "OGRSimpleCurve::Make3D() failed");
-            return;
+            return false;
         }
     }
     flags |= OGR_G_3D;
+    return true;
 }
 
 /************************************************************************/
@@ -248,7 +252,7 @@ void OGRSimpleCurve::RemoveM()
 /*                               AddM()                                 */
 /************************************************************************/
 
-void OGRSimpleCurve::AddM()
+bool OGRSimpleCurve::AddM()
 
 {
     if (padfM == nullptr)
@@ -260,10 +264,11 @@ void OGRSimpleCurve::AddM()
             flags &= ~OGR_G_MEASURED;
             CPLError(CE_Failure, CPLE_AppDefined,
                      "OGRSimpleCurve::AddM() failed");
-            return;
+            return false;
         }
     }
     flags |= OGR_G_MEASURED;
+    return true;
 }
 
 //! @endcond
@@ -400,9 +405,10 @@ double OGRSimpleCurve::getM(int iVertex) const
  * @param nNewPointCount the new number of points for geometry.
  * @param bZeroizeNewContent whether to set to zero the new elements of arrays
  *                           that are extended.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
+bool OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
 
 {
     CPLAssert(nNewPointCount >= 0);
@@ -416,7 +422,7 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
                                  static_cast<int>(sizeof(OGRRawPoint)))
         {
             CPLError(CE_Failure, CPLE_IllegalArg, "Too big point count.");
-            return;
+            return false;
         }
 
         // If first allocation, just aim for nNewPointCount
@@ -448,7 +454,7 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
             VSI_REALLOC_VERBOSE(paoPoints, sizeof(OGRRawPoint) * nNewCapacity));
         if (paoNewPoints == nullptr)
         {
-            return;
+            return false;
         }
         paoPoints = paoNewPoints;
 
@@ -458,7 +464,7 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
                 VSI_REALLOC_VERBOSE(padfZ, sizeof(double) * nNewCapacity));
             if (padfNewZ == nullptr)
             {
-                return;
+                return false;
             }
             padfZ = padfNewZ;
         }
@@ -469,7 +475,7 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
                 VSI_REALLOC_VERBOSE(padfM, sizeof(double) * nNewCapacity));
             if (padfNewM == nullptr)
             {
-                return;
+                return false;
             }
             padfM = padfNewM;
         }
@@ -497,6 +503,7 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
     }
 
     nPointCount = nNewPointCount;
+    return true;
 }
 
 /************************************************************************/
@@ -514,20 +521,23 @@ void OGRSimpleCurve::setNumPoints(int nNewPointCount, int bZeroizeNewContent)
  *
  * @param iPoint the index of the vertex to assign (zero based).
  * @param poPoint the value to assign to the vertex.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoint(int iPoint, OGRPoint *poPoint)
+bool OGRSimpleCurve::setPoint(int iPoint, OGRPoint *poPoint)
 
 {
     if ((flags & OGR_G_3D) && (flags & OGR_G_MEASURED))
-        setPoint(iPoint, poPoint->getX(), poPoint->getY(), poPoint->getZ(),
-                 poPoint->getM());
+        return setPoint(iPoint, poPoint->getX(), poPoint->getY(),
+                        poPoint->getZ(), poPoint->getM());
     else if (flags & OGR_G_3D)
-        setPoint(iPoint, poPoint->getX(), poPoint->getY(), poPoint->getZ());
+        return setPoint(iPoint, poPoint->getX(), poPoint->getY(),
+                        poPoint->getZ());
     else if (flags & OGR_G_MEASURED)
-        setPointM(iPoint, poPoint->getX(), poPoint->getY(), poPoint->getM());
+        return setPointM(iPoint, poPoint->getX(), poPoint->getY(),
+                         poPoint->getM());
     else
-        setPoint(iPoint, poPoint->getX(), poPoint->getY());
+        return setPoint(iPoint, poPoint->getX(), poPoint->getY());
 }
 
 /************************************************************************/
@@ -561,25 +571,26 @@ static inline bool CheckPointCount(int iPoint)
  * @param xIn input X coordinate to assign.
  * @param yIn input Y coordinate to assign.
  * @param zIn input Z coordinate to assign (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn)
+bool OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn)
 
 {
     if (!(flags & OGR_G_3D))
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        if (!CheckPointCount(iPoint))
-            return;
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 #ifdef DEBUG
     if (paoPoints == nullptr)
-        return;
+        return false;
 #endif
 
     paoPoints[iPoint].x = xIn;
@@ -589,6 +600,7 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn)
     {
         padfZ[iPoint] = zIn;
     }
+    return true;
 }
 
 /**
@@ -604,25 +616,26 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn)
  * @param xIn input X coordinate to assign.
  * @param yIn input Y coordinate to assign.
  * @param mIn input M coordinate to assign (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPointM(int iPoint, double xIn, double yIn, double mIn)
+bool OGRSimpleCurve::setPointM(int iPoint, double xIn, double yIn, double mIn)
 
 {
     if (!(flags & OGR_G_MEASURED))
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        if (!CheckPointCount(iPoint))
-            return;
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 #ifdef DEBUG
     if (paoPoints == nullptr)
-        return;
+        return false;
 #endif
 
     paoPoints[iPoint].x = xIn;
@@ -632,6 +645,7 @@ void OGRSimpleCurve::setPointM(int iPoint, double xIn, double yIn, double mIn)
     {
         padfM[iPoint] = mIn;
     }
+    return true;
 }
 
 /**
@@ -648,28 +662,32 @@ void OGRSimpleCurve::setPointM(int iPoint, double xIn, double yIn, double mIn)
  * @param yIn input Y coordinate to assign.
  * @param zIn input Z coordinate to assign (defaults to zero).
  * @param mIn input M coordinate to assign (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn,
+bool OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn,
                               double mIn)
 
 {
     if (!(flags & OGR_G_3D))
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
     if (!(flags & OGR_G_MEASURED))
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        if (!CheckPointCount(iPoint))
-            return;
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 #ifdef DEBUG
     if (paoPoints == nullptr)
-        return;
+        return false;
 #endif
 
     paoPoints[iPoint].x = xIn;
@@ -683,6 +701,7 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn,
     {
         padfM[iPoint] = mIn;
     }
+    return true;
 }
 
 /**
@@ -697,22 +716,21 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn, double zIn,
  * @param iPoint the index of the vertex to assign (zero based).
  * @param xIn input X coordinate to assign.
  * @param yIn input Y coordinate to assign.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn)
+bool OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn)
 
 {
     if (iPoint >= nPointCount)
     {
-        if (!CheckPointCount(iPoint))
-            return;
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1 || paoPoints == nullptr)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1) || !paoPoints)
+            return false;
     }
 
     paoPoints[iPoint].x = xIn;
     paoPoints[iPoint].y = yIn;
+    return true;
 }
 
 /************************************************************************/
@@ -730,24 +748,26 @@ void OGRSimpleCurve::setPoint(int iPoint, double xIn, double yIn)
  *
  * @param iPoint the index of the vertex to assign (zero based).
  * @param zIn input Z coordinate to assign.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setZ(int iPoint, double zIn)
+bool OGRSimpleCurve::setZ(int iPoint, double zIn)
 {
     if (getCoordinateDimension() == 2)
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        if (!CheckPointCount(iPoint))
-            return;
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 
     if (padfZ != nullptr)
         padfZ[iPoint] = zIn;
+    return true;
 }
 
 /************************************************************************/
@@ -765,24 +785,26 @@ void OGRSimpleCurve::setZ(int iPoint, double zIn)
  *
  * @param iPoint the index of the vertex to assign (zero based).
  * @param mIn input M coordinate to assign.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setM(int iPoint, double mIn)
+bool OGRSimpleCurve::setM(int iPoint, double mIn)
 {
     if (!(flags & OGR_G_MEASURED))
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     if (iPoint >= nPointCount)
     {
-        if (!CheckPointCount(iPoint))
-            return;
-        setNumPoints(iPoint + 1);
-        if (nPointCount < iPoint + 1)
-            return;
+        if (!CheckPointCount(iPoint) || !setNumPoints(iPoint + 1))
+            return false;
     }
 
     if (padfM != nullptr)
         padfM[iPoint] = mIn;
+    return true;
 }
 
 /************************************************************************/
@@ -798,22 +820,23 @@ void OGRSimpleCurve::setM(int iPoint, double mIn)
  * There is no SFCOM analog to this method.
  *
  * @param poPoint the point to assign to the new vertex.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPoint(const OGRPoint *poPoint)
+bool OGRSimpleCurve::addPoint(const OGRPoint *poPoint)
 
 {
     if (poPoint->Is3D() && poPoint->IsMeasured())
-        setPoint(nPointCount, poPoint->getX(), poPoint->getY(), poPoint->getZ(),
-                 poPoint->getM());
+        return setPoint(nPointCount, poPoint->getX(), poPoint->getY(),
+                        poPoint->getZ(), poPoint->getM());
     else if (poPoint->Is3D())
-        setPoint(nPointCount, poPoint->getX(), poPoint->getY(),
-                 poPoint->getZ());
+        return setPoint(nPointCount, poPoint->getX(), poPoint->getY(),
+                        poPoint->getZ());
     else if (poPoint->IsMeasured())
-        setPointM(nPointCount, poPoint->getX(), poPoint->getY(),
-                  poPoint->getM());
+        return setPointM(nPointCount, poPoint->getX(), poPoint->getY(),
+                         poPoint->getM());
     else
-        setPoint(nPointCount, poPoint->getX(), poPoint->getY());
+        return setPoint(nPointCount, poPoint->getX(), poPoint->getY());
 }
 
 /************************************************************************/
@@ -832,12 +855,13 @@ void OGRSimpleCurve::addPoint(const OGRPoint *poPoint)
  * @param y the Y coordinate to assign to the new point.
  * @param z the Z coordinate to assign to the new point (defaults to zero).
  * @param m the M coordinate to assign to the new point (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPoint(double x, double y, double z, double m)
+bool OGRSimpleCurve::addPoint(double x, double y, double z, double m)
 
 {
-    setPoint(nPointCount, x, y, z, m);
+    return setPoint(nPointCount, x, y, z, m);
 }
 
 /**
@@ -851,12 +875,13 @@ void OGRSimpleCurve::addPoint(double x, double y, double z, double m)
  * @param x the X coordinate to assign to the new point.
  * @param y the Y coordinate to assign to the new point.
  * @param z the Z coordinate to assign to the new point (defaults to zero).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPoint(double x, double y, double z)
+bool OGRSimpleCurve::addPoint(double x, double y, double z)
 
 {
-    setPoint(nPointCount, x, y, z);
+    return setPoint(nPointCount, x, y, z);
 }
 
 /**
@@ -869,12 +894,13 @@ void OGRSimpleCurve::addPoint(double x, double y, double z)
  *
  * @param x the X coordinate to assign to the new point.
  * @param y the Y coordinate to assign to the new point.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPoint(double x, double y)
+bool OGRSimpleCurve::addPoint(double x, double y)
 
 {
-    setPoint(nPointCount, x, y);
+    return setPoint(nPointCount, x, y);
 }
 
 /**
@@ -888,12 +914,13 @@ void OGRSimpleCurve::addPoint(double x, double y)
  * @param x the X coordinate to assign to the new point.
  * @param y the Y coordinate to assign to the new point.
  * @param m the M coordinate to assign to the new point.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::addPointM(double x, double y, double m)
+bool OGRSimpleCurve::addPointM(double x, double y, double m)
 
 {
-    setPointM(nPointCount, x, y, m);
+    return setPointM(nPointCount, x, y, m);
 }
 
 /************************************************************************/
@@ -948,19 +975,19 @@ bool OGRSimpleCurve::removePoint(int nIndex)
  * @param nPointsIn number of points being passed in paoPointsIn
  * @param paoPointsIn list of points being assigned.
  * @param padfMIn the M values that go with the points.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPointsM(int nPointsIn, const OGRRawPoint *paoPointsIn,
+bool OGRSimpleCurve::setPointsM(int nPointsIn, const OGRRawPoint *paoPointsIn,
                                 const double *padfMIn)
 
 {
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn
+    if (!setNumPoints(nPointsIn, FALSE)
 #ifdef DEBUG
         || paoPoints == nullptr
 #endif
     )
-        return;
+        return false;
 
     if (nPointsIn)
         memcpy(paoPoints, paoPointsIn, sizeof(OGRRawPoint) * nPointsIn);
@@ -974,10 +1001,12 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const OGRRawPoint *paoPointsIn,
     }
     else if (padfMIn)
     {
-        AddM();
+        if (!AddM())
+            return false;
         if (padfM && nPointsIn)
             memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
     }
+    return true;
 }
 
 /************************************************************************/
@@ -997,19 +1026,19 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const OGRRawPoint *paoPointsIn,
  * @param paoPointsIn list of points being assigned.
  * @param padfZIn the Z values that go with the points.
  * @param padfMIn the M values that go with the points.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
+bool OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
                                const double *padfZIn, const double *padfMIn)
 
 {
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn
+    if (!setNumPoints(nPointsIn, FALSE)
 #ifdef DEBUG
         || paoPoints == nullptr
 #endif
     )
-        return;
+        return false;
 
     if (nPointsIn)
         memcpy(paoPoints, paoPointsIn, sizeof(OGRRawPoint) * nPointsIn);
@@ -1023,7 +1052,8 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
     }
     else if (padfZIn)
     {
-        Make3D();
+        if (!Make3D())
+            return false;
         if (padfZ && nPointsIn)
             memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
     }
@@ -1037,10 +1067,12 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
     }
     else if (padfMIn)
     {
-        AddM();
+        if (!AddM())
+            return false;
         if (padfM && nPointsIn)
             memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
     }
+    return true;
 }
 
 /************************************************************************/
@@ -1059,19 +1091,19 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
  * @param nPointsIn number of points being passed in paoPointsIn
  * @param paoPointsIn list of points being assigned.
  * @param padfZIn the Z values that go with the points (optional, may be NULL).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
+bool OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
                                const double *padfZIn)
 
 {
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn
+    if (!setNumPoints(nPointsIn, FALSE)
 #ifdef DEBUG
         || paoPoints == nullptr
 #endif
     )
-        return;
+        return false;
 
     if (nPointsIn)
         memcpy(paoPoints, paoPointsIn, sizeof(OGRRawPoint) * nPointsIn);
@@ -1085,10 +1117,12 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
     }
     else if (padfZIn)
     {
-        Make3D();
+        if (!Make3D())
+            return false;
         if (padfZ && nPointsIn)
             memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
     }
+    return true;
 }
 
 /************************************************************************/
@@ -1108,9 +1142,10 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const OGRRawPoint *paoPointsIn,
  * @param padfY list of Y coordinates of points being assigned.
  * @param padfZIn list of Z coordinates of points being assigned (defaults to
  * NULL for 2D objects).
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
+bool OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
                                const double *padfY, const double *padfZIn)
 
 {
@@ -1120,14 +1155,16 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
     if (padfZIn == nullptr)
         Make2D();
     else
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Assign values.                                                  */
     /* -------------------------------------------------------------------- */
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn)
-        return;
+    if (!setNumPoints(nPointsIn, FALSE))
+        return false;
 
     for (int i = 0; i < nPointsIn; i++)
     {
@@ -1135,12 +1172,11 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
         paoPoints[i].y = padfY[i];
     }
 
-    if (padfZ == nullptr || !padfZIn || !nPointsIn)
+    if (padfZ && padfZIn && nPointsIn)
     {
-        return;
+        memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
     }
-
-    memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
+    return true;
 }
 
 /************************************************************************/
@@ -1159,9 +1195,10 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
  * @param padfX list of X coordinates of points being assigned.
  * @param padfY list of Y coordinates of points being assigned.
  * @param padfMIn list of M coordinates of points being assigned.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
+bool OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
                                 const double *padfY, const double *padfMIn)
 
 {
@@ -1171,14 +1208,16 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
     if (padfMIn == nullptr)
         RemoveM();
     else
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Assign values.                                                  */
     /* -------------------------------------------------------------------- */
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn)
-        return;
+    if (!setNumPoints(nPointsIn, FALSE))
+        return false;
 
     for (int i = 0; i < nPointsIn; i++)
     {
@@ -1186,12 +1225,11 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
         paoPoints[i].y = padfY[i];
     }
 
-    if (padfMIn == nullptr || !padfM || !nPointsIn)
+    if (padfMIn && padfM && nPointsIn)
     {
-        return;
+        memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
     }
-
-    memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
+    return true;
 }
 
 /************************************************************************/
@@ -1211,9 +1249,10 @@ void OGRSimpleCurve::setPointsM(int nPointsIn, const double *padfX,
  * @param padfY list of Y coordinates of points being assigned.
  * @param padfZIn list of Z coordinates of points being assigned.
  * @param padfMIn list of M coordinates of points being assigned.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
+bool OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
                                const double *padfY, const double *padfZIn,
                                const double *padfMIn)
 
@@ -1224,7 +1263,10 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
     if (padfZIn == nullptr)
         Make2D();
     else
-        Make3D();
+    {
+        if (!Make3D())
+            return false;
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Check measures.                                                 */
@@ -1232,14 +1274,16 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
     if (padfMIn == nullptr)
         RemoveM();
     else
-        AddM();
+    {
+        if (!AddM())
+            return false;
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Assign values.                                                  */
     /* -------------------------------------------------------------------- */
-    setNumPoints(nPointsIn, FALSE);
-    if (nPointCount < nPointsIn)
-        return;
+    if (!setNumPoints(nPointsIn, FALSE))
+        return false;
 
     for (int i = 0; i < nPointsIn; i++)
     {
@@ -1251,6 +1295,7 @@ void OGRSimpleCurve::setPoints(int nPointsIn, const double *padfX,
         memcpy(padfZ, padfZIn, sizeof(double) * nPointsIn);
     if (padfM != nullptr && padfMIn && nPointsIn)
         memcpy(padfM, padfMIn, sizeof(double) * nPointsIn);
+    return true;
 }
 
 /************************************************************************/
@@ -1465,8 +1510,7 @@ void OGRSimpleCurve::addSubLineString(const OGRLineString *poOtherLine,
     int nOldPoints = nPointCount;
     int nPointsToAdd = std::abs(nEndVertex - nStartVertex) + 1;
 
-    setNumPoints(nPointsToAdd + nOldPoints, FALSE);
-    if (nPointCount < nPointsToAdd + nOldPoints
+    if (!setNumPoints(nPointsToAdd + nOldPoints, FALSE)
 #ifdef DEBUG
         || paoPoints == nullptr
 #endif
@@ -1582,9 +1626,8 @@ OGRErr OGRSimpleCurve::importFromWkb(const unsigned char *pabyData,
         return OGRERR_NOT_ENOUGH_DATA;
     }
 
-    setNumPoints(nNewNumPoints, FALSE);
-    if (nPointCount < nNewNumPoints)
-        return OGRERR_FAILURE;
+    if (!setNumPoints(nNewNumPoints, FALSE))
+        return OGRERR_NOT_ENOUGH_MEMORY;
 
     nBytesConsumedOut = 9 + 8 * static_cast<size_t>(nPointCount) *
                                 (2 + ((flags & OGR_G_3D) ? 1 : 0) +
@@ -1825,11 +1868,13 @@ OGRErr OGRSimpleCurve::importFromWkt(const char **ppszInput)
 
     if ((flagsFromInput & OGR_G_3D) && !(flags & OGR_G_3D))
     {
-        set3D(TRUE);
+        if (!set3D(TRUE))
+            return OGRERR_NOT_ENOUGH_MEMORY;
     }
     if ((flagsFromInput & OGR_G_MEASURED) && !(flags & OGR_G_MEASURED))
     {
-        setMeasured(TRUE);
+        if (!setMeasured(TRUE))
+            return OGRERR_NOT_ENOUGH_MEMORY;
     }
 
     *ppszInput = pszInput;
@@ -2133,7 +2178,7 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
                                           int bAsRatio) const
 
 {
-    OGRLineString *poNewLineString = new OGRLineString();
+    auto poNewLineString = std::make_unique<OGRLineString>();
 
     poNewLineString->assignSpatialReference(getSpatialReference());
     poNewLineString->setCoordinateDimension(getCoordinateDimension());
@@ -2165,10 +2210,14 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
     int i = 0;  // Used after if blocks.
     if (dfDistanceFrom == 0)
     {
+        bool bRet;
         if (getCoordinateDimension() == 3)
-            poNewLineString->addPoint(paoPoints[0].x, paoPoints[0].y, padfZ[0]);
+            bRet = poNewLineString->addPoint(paoPoints[0].x, paoPoints[0].y,
+                                             padfZ[0]);
         else
-            poNewLineString->addPoint(paoPoints[0].x, paoPoints[0].y);
+            bRet = poNewLineString->addPoint(paoPoints[0].x, paoPoints[0].y);
+        if (!bRet)
+            return nullptr;
     }
     else
     {
@@ -2191,16 +2240,19 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
                     double dfY = paoPoints[i].y * (1 - dfRatio) +
                                  paoPoints[i + 1].y * dfRatio;
 
+                    bool bRet;
                     if (getCoordinateDimension() == 3)
                     {
-                        poNewLineString->addPoint(dfX, dfY,
-                                                  padfZ[i] * (1 - dfRatio) +
-                                                      padfZ[i + 1] * dfRatio);
+                        bRet = poNewLineString->addPoint(
+                            dfX, dfY,
+                            padfZ[i] * (1 - dfRatio) + padfZ[i + 1] * dfRatio);
                     }
                     else
                     {
-                        poNewLineString->addPoint(dfX, dfY);
+                        bRet = poNewLineString->addPoint(dfX, dfY);
                     }
+                    if (!bRet)
+                        return nullptr;
 
                     // Check if dfDistanceTo is in same segment.
                     if (dfLength <= dfDistanceTo &&
@@ -2215,23 +2267,22 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
 
                         if (getCoordinateDimension() == 3)
                         {
-                            poNewLineString->addPoint(dfX, dfY,
-                                                      padfZ[i] * (1 - dfRatio) +
-                                                          padfZ[i + 1] *
-                                                              dfRatio);
+                            bRet = poNewLineString->addPoint(
+                                dfX, dfY,
+                                padfZ[i] * (1 - dfRatio) +
+                                    padfZ[i + 1] * dfRatio);
                         }
                         else
                         {
-                            poNewLineString->addPoint(dfX, dfY);
+                            bRet = poNewLineString->addPoint(dfX, dfY);
                         }
 
-                        if (poNewLineString->getNumPoints() < 2)
+                        if (!bRet || poNewLineString->getNumPoints() < 2)
                         {
-                            delete poNewLineString;
-                            poNewLineString = nullptr;
+                            return nullptr;
                         }
 
-                        return poNewLineString;
+                        return poNewLineString.release();
                     }
                     i++;
                     dfLength += dfSegLength;
@@ -2246,10 +2297,14 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
     // Add points.
     for (; i < nPointCount - 1; i++)
     {
+        bool bRet;
         if (getCoordinateDimension() == 3)
-            poNewLineString->addPoint(paoPoints[i].x, paoPoints[i].y, padfZ[i]);
+            bRet = poNewLineString->addPoint(paoPoints[i].x, paoPoints[i].y,
+                                             padfZ[i]);
         else
-            poNewLineString->addPoint(paoPoints[i].x, paoPoints[i].y);
+            bRet = poNewLineString->addPoint(paoPoints[i].x, paoPoints[i].y);
+        if (!bRet)
+            return nullptr;
 
         const double dfDeltaX = paoPoints[i + 1].x - paoPoints[i].x;
         const double dfDeltaY = paoPoints[i + 1].y - paoPoints[i].y;
@@ -2269,34 +2324,36 @@ OGRLineString *OGRSimpleCurve::getSubLine(double dfDistanceFrom,
                                    paoPoints[i + 1].y * dfRatio;
 
                 if (getCoordinateDimension() == 3)
-                    poNewLineString->addPoint(dfX, dfY,
-                                              padfZ[i] * (1 - dfRatio) +
-                                                  padfZ[i + 1] * dfRatio);
+                    bRet = poNewLineString->addPoint(
+                        dfX, dfY,
+                        padfZ[i] * (1 - dfRatio) + padfZ[i + 1] * dfRatio);
                 else
-                    poNewLineString->addPoint(dfX, dfY);
+                    bRet = poNewLineString->addPoint(dfX, dfY);
+                if (!bRet)
+                    return nullptr;
 
-                return poNewLineString;
+                return poNewLineString.release();
             }
 
             dfLength += dfSegLength;
         }
     }
 
+    bool bRet;
     if (getCoordinateDimension() == 3)
-        poNewLineString->addPoint(paoPoints[nPointCount - 1].x,
-                                  paoPoints[nPointCount - 1].y,
-                                  padfZ[nPointCount - 1]);
+        bRet = poNewLineString->addPoint(paoPoints[nPointCount - 1].x,
+                                         paoPoints[nPointCount - 1].y,
+                                         padfZ[nPointCount - 1]);
     else
-        poNewLineString->addPoint(paoPoints[nPointCount - 1].x,
-                                  paoPoints[nPointCount - 1].y);
+        bRet = poNewLineString->addPoint(paoPoints[nPointCount - 1].x,
+                                         paoPoints[nPointCount - 1].y);
 
-    if (poNewLineString->getNumPoints() < 2)
+    if (!bRet || poNewLineString->getNumPoints() < 2)
     {
-        delete poNewLineString;
-        poNewLineString = nullptr;
+        return nullptr;
     }
 
-    return poNewLineString;
+    return poNewLineString.release();
 }
 
 /************************************************************************/
@@ -2527,16 +2584,16 @@ OGRBoolean OGRSimpleCurve::IsEmpty() const
 /*                     OGRSimpleCurve::segmentize()                     */
 /************************************************************************/
 
-void OGRSimpleCurve::segmentize(double dfMaxLength)
+bool OGRSimpleCurve::segmentize(double dfMaxLength)
 {
     if (dfMaxLength <= 0)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "dfMaxLength must be strictly positive");
-        return;
+        return false;
     }
     if (nPointCount < 2)
-        return;
+        return true;
 
     // So as to make sure that the same line followed in both directions
     // result in the same segmentized line.
@@ -2545,9 +2602,9 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
          paoPoints[0].y < paoPoints[nPointCount - 1].y))
     {
         reversePoints();
-        segmentize(dfMaxLength);
+        bool bRet = segmentize(dfMaxLength);
         reversePoints();
-        return;
+        return bRet;
     }
 
     int nNewPointCount = 0;
@@ -2585,7 +2642,7 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "Too many points in a segment: %d or %d",
                          nNewPointCount, nIntermediatePoints);
-                return;
+                return false;
             }
 
             nNewPointCount += nIntermediatePoints;
@@ -2593,13 +2650,13 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
     }
 
     if (nPointCount == nNewPointCount)
-        return;
+        return true;
 
     // Allocate new arrays
     OGRRawPoint *paoNewPoints = static_cast<OGRRawPoint *>(
         VSI_MALLOC_VERBOSE(sizeof(OGRRawPoint) * nNewPointCount));
     if (paoNewPoints == nullptr)
-        return;
+        return false;
     double *padfNewZ = nullptr;
     double *padfNewM = nullptr;
     if (padfZ != nullptr)
@@ -2609,7 +2666,7 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
         if (padfNewZ == nullptr)
         {
             VSIFree(paoNewPoints);
-            return;
+            return false;
         }
     }
     if (padfM != nullptr)
@@ -2620,7 +2677,7 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
         {
             VSIFree(paoNewPoints);
             VSIFree(padfNewZ);
-            return;
+            return false;
         }
     }
 
@@ -2698,6 +2755,7 @@ void OGRSimpleCurve::segmentize(double dfMaxLength)
         CPLFree(padfM);
         padfM = padfNewM;
     }
+    return true;
 }
 
 /************************************************************************/
diff --git a/ogr/ogrpoint.cpp b/ogr/ogrpoint.cpp
index aa35407f0ea5..220dfc198de2 100644
--- a/ogr/ogrpoint.cpp
+++ b/ogr/ogrpoint.cpp
@@ -263,7 +263,7 @@ void OGRPoint::flattenTo2D()
 /*                       setCoordinateDimension()                       */
 /************************************************************************/
 
-void OGRPoint::setCoordinateDimension(int nNewDimension)
+bool OGRPoint::setCoordinateDimension(int nNewDimension)
 
 {
     if (nNewDimension == 2)
@@ -272,6 +272,7 @@ void OGRPoint::setCoordinateDimension(int nNewDimension)
         flags |= OGR_G_3D;
 
     setMeasured(FALSE);
+    return true;
 }
 
 /************************************************************************/
diff --git a/ogr/ogrpolyhedralsurface.cpp b/ogr/ogrpolyhedralsurface.cpp
index 1e438b0851d7..c04cc395b474 100644
--- a/ogr/ogrpolyhedralsurface.cpp
+++ b/ogr/ogrpolyhedralsurface.cpp
@@ -918,11 +918,9 @@ OGRBoolean OGRPolyhedralSurface::IsEmpty() const
  * \brief Set the type as 3D geometry
  */
 
-void OGRPolyhedralSurface::set3D(OGRBoolean bIs3D)
+bool OGRPolyhedralSurface::set3D(OGRBoolean bIs3D)
 {
-    oMP.set3D(bIs3D);
-
-    OGRGeometry::set3D(bIs3D);
+    return oMP.set3D(bIs3D) && OGRGeometry::set3D(bIs3D);
 }
 
 /************************************************************************/
@@ -933,11 +931,10 @@ void OGRPolyhedralSurface::set3D(OGRBoolean bIs3D)
  * \brief Set the type as Measured
  */
 
-void OGRPolyhedralSurface::setMeasured(OGRBoolean bIsMeasured)
+bool OGRPolyhedralSurface::setMeasured(OGRBoolean bIsMeasured)
 {
-    oMP.setMeasured(bIsMeasured);
-
-    OGRGeometry::setMeasured(bIsMeasured);
+    return oMP.setMeasured(bIsMeasured) &&
+           OGRGeometry::setMeasured(bIsMeasured);
 }
 
 /************************************************************************/
@@ -952,13 +949,13 @@ void OGRPolyhedralSurface::setMeasured(OGRBoolean bIsMeasured)
  * This will also remove the M dimension if present before this call.
  *
  * @param nNewDimension New coordinate dimension value, either 2 or 3.
+ * @return (since 3.10) true in case of success, false in case of memory allocation error
  */
 
-void OGRPolyhedralSurface::setCoordinateDimension(int nNewDimension)
+bool OGRPolyhedralSurface::setCoordinateDimension(int nNewDimension)
 {
-    oMP.setCoordinateDimension(nNewDimension);
-
-    OGRGeometry::setCoordinateDimension(nNewDimension);
+    return oMP.setCoordinateDimension(nNewDimension) &&
+           OGRGeometry::setCoordinateDimension(nNewDimension);
 }
 
 /************************************************************************/

From ae6747ab339a7c06a7c00be9ba5a9dbb61f072d4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Jul 2024 23:08:47 +0200
Subject: [PATCH 27/94] LIBKML: fix reading/writing style URL in KMZ files

Fixes #10478
---
 autotest/ogr/ogr_libkml.py                    | 48 +++++++++++++++++++
 .../libkml/ogrlibkmldatasource.cpp            |  4 +-
 .../libkml/ogrlibkmlfeaturestyle.cpp          | 12 ++++-
 3 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index b8f255904e33..8357eaa6f32d 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -1452,6 +1452,54 @@ def test_ogr_libkml_read_write_style(tmp_vsimem):
         assert f.GetStyleString() == "@unknown_style"
 
 
+###############################################################################
+# Test style in KMZ file
+
+
+def test_ogr_libkml_write_style_kmz(tmp_vsimem):
+
+    filename = tmp_vsimem / "ogr_libkml_read_write_style_write.kmz"
+    # Automatic StyleMap creation testing
+    ds = ogr.GetDriverByName("LIBKML").CreateDataSource(filename)
+    style_table = ogr.StyleTable()
+    style_table.AddStyle(
+        "style1_normal", 'SYMBOL(id:"http://style1_normal",c:#67452301)'
+    )
+    style_table.AddStyle(
+        "style1_highlight", 'SYMBOL(id:"http://style1_highlight",c:#10325476)'
+    )
+    ds.SetStyleTable(style_table)
+    lyr = ds.CreateLayer("test")
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetStyleString("@style1_normal")
+    lyr.CreateFeature(feat)
+    feat = ogr.Feature(lyr.GetLayerDefn())
+    feat.SetStyleString("@unknown_style")
+    lyr.CreateFeature(feat)
+    ds = None
+
+    f = gdal.VSIFOpenL(f"/vsizip/{filename}/layers/test.kml", "rb")
+    assert f
+    data = gdal.VSIFReadL(1, 10000, f)
+    gdal.VSIFCloseL(f)
+    assert b"<styleUrl>../style/style.kml#style1_normal</styleUrl>" in data
+
+    ds = ogr.Open(filename)
+    lyr = ds.GetLayer(0)
+    f = lyr.GetNextFeature()
+    assert f.GetStyleString() == "@style1_normal"
+    f = lyr.GetNextFeature()
+    assert f.GetStyleString() == "@unknown_style"
+
+    with gdaltest.config_option("LIBKML_RESOLVE_STYLE", "YES"):
+        ds = ogr.Open(filename)
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        assert f.GetStyleString() == 'SYMBOL(id:"http://style1_normal",c:#67452301)'
+        f = lyr.GetNextFeature()
+        assert f.GetStyleString() == "@unknown_style"
+
+
 ###############################################################################
 # Test writing Update
 
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
index 5cf1c16b394e..b5ba35e54105 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
@@ -1864,7 +1864,9 @@ int OGRLIBKMLDataSource::CreateKmz(const char * /* pszFilename */,
         }
     }
 
-    m_osStylePath = "style/style.kml";
+    // Layers are written in a layers/ subdirectory, hence ../style
+    // to access style/style.kml
+    m_osStylePath = "../style/style.kml";
 
     m_isKmz = true;
     bUpdated = true;
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp
index 587dd28bf290..9b6c8e2eec4b 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeaturestyle.cpp
@@ -171,7 +171,17 @@ void kml2featurestyle(FeaturePtr poKmlFeature, OGRLIBKMLDataSource *poOgrDS,
     for (int i = 0; i < nStyleURLIterations; ++i)
     {
         /***** is the name in the layer style table *****/
-        const std::string osUrl(poKmlFeature->get_styleurl());
+        std::string osUrl(poKmlFeature->get_styleurl());
+
+        // Starting with GDAL 3.9.2, style URLs in KMZ files we generate start
+        // with ../style/style.kml# to reflect the file hierarchy
+        // Strip the leading ../ for correct resolution.
+        constexpr const char *DOTDOT_URL = "../style/style.kml#";
+        if (osUrl.size() > strlen(DOTDOT_URL) &&
+            memcmp(osUrl.data(), DOTDOT_URL, strlen(DOTDOT_URL)) == 0)
+        {
+            osUrl = osUrl.substr(strlen("../"));
+        }
 
         OGRStyleTable *poOgrSTBLLayer = nullptr;
         const char *pszTest = nullptr;

From 99ed22ef8d87b22cdbe235233b9b1ebdf8d0da2a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 02:02:26 +0200
Subject: [PATCH 28/94] GTI: emit warning if bounding box from the tile's
 feature extent in the index does not match actual bounding box of tile

---
 autotest/gdrivers/gti.py           | 41 ++++++++++++++++
 frmts/vrt/gdaltileindexdataset.cpp | 75 ++++++++++++++++++++++++------
 2 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/autotest/gdrivers/gti.py b/autotest/gdrivers/gti.py
index 8888103c4b7e..5c8749221274 100755
--- a/autotest/gdrivers/gti.py
+++ b/autotest/gdrivers/gti.py
@@ -2075,6 +2075,47 @@ def test_gti_overlapping_sources_mask_band(tmp_vsimem):
     ) == (255, 254)
 
 
+def test_gti_consistency_index_geometry_vs_source_extent(tmp_vsimem):
+
+    filename1 = str(tmp_vsimem / "test.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(filename1, 10, 10)
+    ds.SetGeoTransform([2, 1, 0, 49, 0, -1])
+    ds.GetRasterBand(1).Fill(255)
+    expected_cs = ds.GetRasterBand(1).Checksum()
+    del ds
+
+    index_filename = str(tmp_vsimem / "index.gti.gpkg")
+    index_ds, _ = create_basic_tileindex(
+        index_filename,
+        [gdal.Open(filename1)],
+    )
+    del index_ds
+
+    vrt_ds = gdal.Open(index_filename)
+    with gdal.quiet_errors():
+        gdal.ErrorReset()
+        assert vrt_ds.GetRasterBand(1).Checksum() == expected_cs
+        assert gdal.GetLastErrorMsg() == ""
+
+    # No intersection
+    with gdal.Open(filename1, gdal.GA_Update) as ds:
+        ds.SetGeoTransform([100, 1, 0, 49, 0, -1])
+
+    vrt_ds = gdal.Open(index_filename)
+    with gdal.quiet_errors():
+        assert vrt_ds.GetRasterBand(1).Checksum() == 0
+        assert "does not intersect at all" in gdal.GetLastErrorMsg()
+
+    # Partial intersection
+    with gdal.Open(filename1, gdal.GA_Update) as ds:
+        ds.SetGeoTransform([4, 1, 0, 49, 0, -1])
+
+    vrt_ds = gdal.Open(index_filename)
+    with gdal.quiet_errors():
+        assert vrt_ds.GetRasterBand(1).Checksum() == 958
+        assert "does not fully contain" in gdal.GetLastErrorMsg()
+
+
 def test_gti_mask_band_explicit(tmp_vsimem):
 
     index_filename = str(tmp_vsimem / "index.gti.gpkg")
diff --git a/frmts/vrt/gdaltileindexdataset.cpp b/frmts/vrt/gdaltileindexdataset.cpp
index 97e5b9465127..d981282e6c80 100644
--- a/frmts/vrt/gdaltileindexdataset.cpp
+++ b/frmts/vrt/gdaltileindexdataset.cpp
@@ -3040,19 +3040,13 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
         poSource = std::move(poComplexSource);
     }
 
-    if (!GetSrcDstWin(adfGeoTransformTile, poTileDS->GetRasterXSize(),
-                      poTileDS->GetRasterYSize(), m_adfGeoTransform.data(),
-                      GetRasterXSize(), GetRasterYSize(),
-                      &poSource->m_dfSrcXOff, &poSource->m_dfSrcYOff,
-                      &poSource->m_dfSrcXSize, &poSource->m_dfSrcYSize,
-                      &poSource->m_dfDstXOff, &poSource->m_dfDstYOff,
-                      &poSource->m_dfDstXSize, &poSource->m_dfDstYSize))
-    {
-        // Should not happen on a consistent tile index
-        CPLDebug("VRT", "Tile %s does not actually intersect area of interest",
-                 osTileName.c_str());
-        return false;
-    }
+    GetSrcDstWin(adfGeoTransformTile, poTileDS->GetRasterXSize(),
+                 poTileDS->GetRasterYSize(), m_adfGeoTransform.data(),
+                 GetRasterXSize(), GetRasterYSize(), &poSource->m_dfSrcXOff,
+                 &poSource->m_dfSrcYOff, &poSource->m_dfSrcXSize,
+                 &poSource->m_dfSrcYSize, &poSource->m_dfDstXOff,
+                 &poSource->m_dfDstYOff, &poSource->m_dfDstXSize,
+                 &poSource->m_dfDstYSize);
 
     oSourceDesc.osName = osTileName;
     oSourceDesc.poDS = std::move(poTileDS);
@@ -3140,6 +3134,61 @@ bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
         if (!GetSourceDesc(osTileName, oSourceDesc))
             continue;
 
+        // Check consistency of bounding box in tile index vs actual
+        // extent of the tile.
+        double adfTileGT[6];
+        if (oSourceDesc.poDS->GetGeoTransform(adfTileGT) == CE_None &&
+            adfTileGT[GT_ROTATION_PARAM1] == 0 &&
+            adfTileGT[GT_ROTATION_PARAM2] == 0)
+        {
+            OGREnvelope sActualTileExtent;
+            sActualTileExtent.MinX = adfTileGT[GT_TOPLEFT_X];
+            sActualTileExtent.MaxX =
+                sActualTileExtent.MinX +
+                oSourceDesc.poDS->GetRasterXSize() * adfTileGT[GT_WE_RES];
+            sActualTileExtent.MaxY = adfTileGT[GT_TOPLEFT_Y];
+            sActualTileExtent.MinY =
+                sActualTileExtent.MaxY +
+                oSourceDesc.poDS->GetRasterYSize() * adfTileGT[GT_NS_RES];
+            const auto poGeom = poFeature->GetGeometryRef();
+            if (poGeom && !poGeom->IsEmpty())
+            {
+                OGREnvelope sGeomTileExtent;
+                poGeom->getEnvelope(&sGeomTileExtent);
+                sGeomTileExtent.MinX -= m_adfGeoTransform[GT_WE_RES];
+                sGeomTileExtent.MaxX += m_adfGeoTransform[GT_WE_RES];
+                sGeomTileExtent.MinY -= std::fabs(m_adfGeoTransform[GT_NS_RES]);
+                sGeomTileExtent.MaxY += std::fabs(m_adfGeoTransform[GT_NS_RES]);
+                if (!sGeomTileExtent.Contains(sActualTileExtent))
+                {
+                    if (!sGeomTileExtent.Intersects(sActualTileExtent))
+                    {
+                        CPLError(CE_Warning, CPLE_AppDefined,
+                                 "Tile index is out of sync with actual "
+                                 "extent of %s. Bounding box from tile index "
+                                 "is (%g, %g, %g, %g) does not intersect at "
+                                 "all bounding box from tile (%g, %g, %g, %g)",
+                                 osTileName.c_str(), sGeomTileExtent.MinX,
+                                 sGeomTileExtent.MinY, sGeomTileExtent.MaxX,
+                                 sGeomTileExtent.MaxY, sActualTileExtent.MinX,
+                                 sActualTileExtent.MinY, sActualTileExtent.MaxX,
+                                 sActualTileExtent.MaxY);
+                        continue;
+                    }
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "Tile index is out of sync with actual extent "
+                             "of %s. Bounding box from tile index is (%g, %g, "
+                             "%g, %g) does not fully contain bounding box from "
+                             "tile (%g, %g, %g, %g)",
+                             osTileName.c_str(), sGeomTileExtent.MinX,
+                             sGeomTileExtent.MinY, sGeomTileExtent.MaxX,
+                             sGeomTileExtent.MaxY, sActualTileExtent.MinX,
+                             sActualTileExtent.MinY, sActualTileExtent.MaxX,
+                             sActualTileExtent.MaxY);
+                }
+            }
+        }
+
         const auto &poSource = oSourceDesc.poSource;
         if (dfXOff >= poSource->m_dfDstXOff + poSource->m_dfDstXSize ||
             dfYOff >= poSource->m_dfDstYOff + poSource->m_dfDstYSize ||

From aac5fc98ca5566a8e2bd4d776a76462457f4ca2d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 12:39:21 +0200
Subject: [PATCH 29/94] gdalinfo: add -nonodata and -nomask options

---
 apps/gdalinfo_lib.cpp                   | 29 ++++++++++++++++++++--
 autotest/utilities/test_gdalinfo_lib.py | 32 +++++++++++++++++++++++++
 doc/source/programs/gdalinfo.rst        | 17 ++++++++++++-
 swig/include/python/gdal_python.i       |  5 ++++
 4 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/apps/gdalinfo_lib.cpp b/apps/gdalinfo_lib.cpp
index e357e76e211e..4b9a346ef65a 100644
--- a/apps/gdalinfo_lib.cpp
+++ b/apps/gdalinfo_lib.cpp
@@ -105,6 +105,12 @@ struct GDALInfoOptions
     /*! force computation of the checksum for each band in the dataset */
     bool bComputeChecksum = false;
 
+    /*! allow or suppress printing of nodata value */
+    bool bShowNodata = true;
+
+    /*! allow or suppress printing of mask information */
+    bool bShowMask = true;
+
     /*! allow or suppress ground control points list printing. It may be useful
         for datasets with huge amount of GCPs, such as L1B AVHRR or HDF4 MODIS
         which contain thousands of them. */
@@ -261,6 +267,8 @@ GDALInfoAppOptionsGetParser(GDALInfoOptions *psOptions,
         .store_into(psOptions->bReportHistograms)
         .help(_("Report histogram information for all bands."));
 
+    argParser->add_usage_newline();
+
     argParser->add_inverted_logic_flag(
         "-nogcp", &psOptions->bShowGCPs,
         _("Suppress ground control points list printing."));
@@ -278,6 +286,15 @@ GDALInfoAppOptionsGetParser(GDALInfoOptions *psOptions,
     argParser->add_inverted_logic_flag("-nofl", &psOptions->bShowFileList,
                                        _("Suppress display of the file list."));
 
+    argParser->add_inverted_logic_flag(
+        "-nonodata", &psOptions->bShowNodata,
+        _("Suppress nodata printing (implies -nomask)."));
+
+    argParser->add_inverted_logic_flag("-nomask", &psOptions->bShowMask,
+                                       _("Suppress mask printing."));
+
+    argParser->add_usage_newline();
+
     argParser->add_argument("-checksum")
         .flag()
         .store_into(psOptions->bComputeChecksum)
@@ -1360,7 +1377,11 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
         }
 
         int bGotNodata = FALSE;
-        if (eDT == GDT_Int64)
+        if (!psOptions->bShowNodata)
+        {
+            // nothing to do
+        }
+        else if (eDT == GDT_Int64)
         {
             const auto nNoData =
                 GDALGetRasterNoDataValueAsInt64(hBand, &bGotNodata);
@@ -1596,7 +1617,8 @@ char *GDALInfo(GDALDatasetH hDataset, const GDALInfoOptions *psOptions)
             Concat(osStr, psOptions->bStdoutOutput, "  Overviews: arbitrary\n");
         }
 
-        const int nMaskFlags = GDALGetMaskFlags(hBand);
+        const int nMaskFlags =
+            psOptions->bShowMask ? GDALGetMaskFlags(hBand) : GMF_ALL_VALID;
         if ((nMaskFlags & (GMF_NODATA | GMF_ALL_VALID)) == 0 ||
             nMaskFlags == (GMF_NODATA | GMF_PER_DATASET))
         {
@@ -2307,6 +2329,9 @@ GDALInfoOptionsNew(char **papszArgv,
         return nullptr;
     }
 
+    if (!psOptions->bShowNodata)
+        psOptions->bShowMask = false;
+
     return psOptions.release();
 }
 
diff --git a/autotest/utilities/test_gdalinfo_lib.py b/autotest/utilities/test_gdalinfo_lib.py
index ade1b8ab0b5c..8c7cfd3ead44 100755
--- a/autotest/utilities/test_gdalinfo_lib.py
+++ b/autotest/utilities/test_gdalinfo_lib.py
@@ -309,3 +309,35 @@ def test_gdalinfo_lib_json_engineering_crs():
     assert "coordinateSystem" in ret
     assert "cornerCoordinates" in ret
     assert "wgs84Extent" not in ret
+
+
+###############################################################################
+# Test -nonodata
+
+
+def test_gdalinfo_lib_nonodata(tmp_path):
+
+    ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    ds.GetRasterBand(1).SetNoDataValue(1)
+
+    ret = gdal.Info(ds, format="json")
+    assert "noDataValue" in ret["bands"][0]
+
+    ret = gdal.Info(ds, format="json", showNodata=False)
+    assert "noDataValue" not in ret["bands"][0]
+
+
+###############################################################################
+# Test -nomask
+
+
+def test_gdalinfo_lib_nomask(tmp_path):
+
+    ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    ds.GetRasterBand(1).CreateMaskBand(gdal.GMF_PER_DATASET)
+
+    ret = gdal.Info(ds, format="json")
+    assert "mask" in ret["bands"][0]
+
+    ret = gdal.Info(ds, format="json", showMask=False)
+    assert "mask" not in ret["bands"][0]
diff --git a/doc/source/programs/gdalinfo.rst b/doc/source/programs/gdalinfo.rst
index 5c55f2920e39..01ef40ad0d97 100644
--- a/doc/source/programs/gdalinfo.rst
+++ b/doc/source/programs/gdalinfo.rst
@@ -17,7 +17,7 @@ Synopsis
 
     gdalinfo [--help] [--help-general]
              [-json] [-mm] [-stats | -approx_stats] [-hist]
-             [-nogcp] [-nomd] [-norat] [-noct] [-nofl]
+             [-nogcp] [-nomd] [-norat] [-noct] [-nofl] [-nonodata] [-nomask]
              [-checksum] [-listmdd] [-mdd <domain>|all]
              [-proj4] [-wkt_format {WKT1|WKT2|<other_format>}]...
              [-sd <subdataset>] [-oo <NAME>=<VALUE>]... [-if <format>]...
@@ -83,6 +83,21 @@ The following command line parameters can appear in any order
 
     Suppress printing of color table.
 
+.. option:: -nonodata
+
+    .. versionadded:: 3.10
+
+    Suppress nodata printing. Implies :option:`-nomask`.
+
+    Can be useful for example when querying a remove GRIB2 dataset that has an
+    index .idx side-car file, together with :option:`-nomd`
+
+.. option:: -nomask
+
+    .. versionadded:: 3.10
+
+    Suppress band mask printing. Is implied if :option:`-nonodata` is specified.
+
 .. option:: -checksum
 
     Force computation of the checksum for each band in the dataset.
diff --git a/swig/include/python/gdal_python.i b/swig/include/python/gdal_python.i
index dc11f684ca30..264d3c2b7ca5 100644
--- a/swig/include/python/gdal_python.i
+++ b/swig/include/python/gdal_python.i
@@ -2190,6 +2190,7 @@ def InfoOptions(options=None, format='text', deserialize=True,
          computeMinMax=False, reportHistograms=False, reportProj4=False,
          stats=False, approxStats=False, computeChecksum=False,
          showGCPs=True, showMetadata=True, showRAT=True, showColorTable=True,
+         showNodata=True, showMask=True,
          listMDD=False, showFileList=True, allMetadata=False,
          extraMDDomains=None, wktFormat=None):
     """ Create a InfoOptions() object that can be passed to gdal.Info()
@@ -2231,6 +2232,10 @@ def InfoOptions(options=None, format='text', deserialize=True,
             new_options += ['-norat']
         if not showColorTable:
             new_options += ['-noct']
+        if not showNodata:
+            new_options += ['-nonodata']
+        if not showMask:
+            new_options += ['-nomask']
         if listMDD:
             new_options += ['-listmdd']
         if not showFileList:

From 018ff69b10168f4a7e15ef6f74a96a7370a964e0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 12:40:03 +0200
Subject: [PATCH 30/94] GRIB: display hint to speed-up operations when using
 gdalinfo on a remote GRIB2 file with an .idx side car file

---
 frmts/grib/CMakeLists.txt  |  5 ++
 frmts/grib/gribdataset.cpp | 99 ++++++++++++++++++++++++++++++++++++--
 frmts/grib/gribdataset.h   | 12 ++++-
 3 files changed, 111 insertions(+), 5 deletions(-)

diff --git a/frmts/grib/CMakeLists.txt b/frmts/grib/CMakeLists.txt
index 16023f73157a..01f58c263e0a 100644
--- a/frmts/grib/CMakeLists.txt
+++ b/frmts/grib/CMakeLists.txt
@@ -135,6 +135,11 @@ target_include_directories(
   gdal_GRIB PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/degrib/degrib>
                     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/degrib/g2clib> $<TARGET_PROPERTY:gdal_MEM,SOURCE_DIR>)
 target_compile_options(gdal_GRIB PRIVATE ${GDAL_SOFTWARNFLAGS}) # FIXME: only needed for files within degrib/ actually
+
+if (BUILD_APPS)
+  target_compile_definitions(gdal_GRIB PRIVATE -DBUILD_APPS)
+endif()
+
 if (GDAL_USE_PNG_INTERNAL)
   gdal_add_vendored_lib(gdal_GRIB libpng)
   target_compile_definitions(gdal_GRIB PRIVATE -DUSE_PNG)
diff --git a/frmts/grib/gribdataset.cpp b/frmts/grib/gribdataset.cpp
index e73529dea49f..5d2603a44d6c 100644
--- a/frmts/grib/gribdataset.cpp
+++ b/frmts/grib/gribdataset.cpp
@@ -43,6 +43,12 @@
 #include <fcntl.h>
 #endif
 
+#ifndef _WIN32
+#include <unistd.h>  // isatty()
+#else
+#include <io.h>  // _isatty()
+#endif
+
 #include <algorithm>
 #include <set>
 #include <string>
@@ -902,15 +908,71 @@ CPLErr GRIBRasterBand::LoadData()
     return CE_None;
 }
 
+/************************************************************************/
+/*                       IsGdalinfoInteractive()                        */
+/************************************************************************/
+
+#ifdef BUILD_APPS
+static bool IsGdalinfoInteractive()
+{
+    static const bool bIsGdalinfoInteractive = []()
+    {
+#ifndef _WIN32
+        if (isatty(static_cast<int>(fileno(stdout))))
+#else
+        if (_isatty(_fileno(stdout)))
+#endif
+        {
+            std::string osPath;
+            osPath.resize(1024);
+            if (CPLGetExecPath(&osPath[0], static_cast<int>(osPath.size())))
+            {
+                osPath = CPLGetBasename(osPath.c_str());
+            }
+            return osPath == "gdalinfo";
+        }
+        return false;
+    }();
+    return bIsGdalinfoInteractive;
+}
+#endif
+
 /************************************************************************/
 /*                             GetMetaData()                            */
 /************************************************************************/
 char **GRIBRasterBand::GetMetadata(const char *pszDomain)
 {
     FindMetaData();
-    if (m_nGribVersion == 2 &&
+    if ((pszDomain == nullptr || pszDomain[0] == 0) && m_nGribVersion == 2 &&
         CPLTestBool(CPLGetConfigOption("GRIB_PDS_ALL_BANDS", "ON")))
     {
+#ifdef BUILD_APPS
+        // Detect slow execution of e.g.
+        // "gdalinfo /vsis3/noaa-hrrr-bdp-pds/hrrr.20220804/conus/hrrr.t00z.wrfsfcf01.grib2"
+        GRIBDataset *poGDS = static_cast<GRIBDataset *>(poDS);
+        if (poGDS->m_bSideCarIdxUsed && !poGDS->m_bWarnedGdalinfoNomd &&
+            poGDS->GetRasterCount() > 10 &&
+            !VSIIsLocal(poGDS->GetDescription()) && IsGdalinfoInteractive())
+        {
+            if (poGDS->m_nFirstMetadataQueriedTimeStamp)
+            {
+                if (time(nullptr) - poGDS->m_nFirstMetadataQueriedTimeStamp > 2)
+                {
+                    poGDS->m_bWarnedGdalinfoNomd = true;
+
+                    CPLError(
+                        CE_Warning, CPLE_AppDefined,
+                        "If metadata does not matter, faster result could be "
+                        "obtained by adding the -nomd switch to gdalinfo");
+                }
+            }
+            else
+            {
+                poGDS->m_nFirstMetadataQueriedTimeStamp = time(nullptr);
+            }
+        }
+#endif
+
         FindPDSTemplateGRIB2();
     }
     return GDALPamRasterBand::GetMetadata(pszDomain);
@@ -1012,6 +1074,34 @@ double GRIBRasterBand::GetNoDataValue(int *pbSuccess)
     if (m_Grib_MetaData == nullptr)
     {
         GRIBDataset *poGDS = static_cast<GRIBDataset *>(poDS);
+
+#ifdef BUILD_APPS
+        // Detect slow execution of e.g.
+        // "gdalinfo /vsis3/noaa-hrrr-bdp-pds/hrrr.20220804/conus/hrrr.t00z.wrfsfcf01.grib2"
+
+        if (poGDS->m_bSideCarIdxUsed && !poGDS->m_bWarnedGdalinfoNonodata &&
+            poGDS->GetRasterCount() > 10 &&
+            !VSIIsLocal(poGDS->GetDescription()) && IsGdalinfoInteractive())
+        {
+            if (poGDS->m_nFirstNodataQueriedTimeStamp)
+            {
+                if (time(nullptr) - poGDS->m_nFirstNodataQueriedTimeStamp > 2)
+                {
+                    poGDS->m_bWarnedGdalinfoNonodata = true;
+
+                    CPLError(CE_Warning, CPLE_AppDefined,
+                             "If nodata value does not matter, faster result "
+                             "could be obtained by adding the -nonodata switch "
+                             "to gdalinfo");
+                }
+            }
+            else
+            {
+                poGDS->m_nFirstNodataQueriedTimeStamp = time(nullptr);
+            }
+        }
+#endif
+
         ReadGribData(poGDS->fp, start, subgNum, nullptr, &m_Grib_MetaData);
         if (m_Grib_MetaData == nullptr)
         {
@@ -1316,7 +1406,7 @@ CPLErr GRIBDataset::GetGeoTransform(double *padfTransform)
 /************************************************************************/
 
 std::unique_ptr<gdal::grib::InventoryWrapper>
-GRIBDataset::Inventory(VSILFILE *fp, GDALOpenInfo *poOpenInfo)
+GRIBDataset::Inventory(GDALOpenInfo *poOpenInfo)
 {
     std::unique_ptr<gdal::grib::InventoryWrapper> pInventories;
 
@@ -1354,6 +1444,9 @@ GRIBDataset::Inventory(VSILFILE *fp, GDALOpenInfo *poOpenInfo)
         if (pInventories->result() <= 0 || pInventories->length() == 0)
             pInventories = nullptr;
         VSIFCloseL(fpSideCar);
+#ifdef BUILD_APPS
+        m_bSideCarIdxUsed = true;
+#endif
     }
     else
         CPLDebug("GRIB", "Failed opening sidecar %s",
@@ -1447,7 +1540,7 @@ GDALDataset *GRIBDataset::Open(GDALOpenInfo *poOpenInfo)
     // The band-data that is read is stored into the first RasterBand,
     // simply so that the same portion of the file is not read twice.
 
-    auto pInventories = Inventory(poDS->fp, poOpenInfo);
+    auto pInventories = poDS->Inventory(poOpenInfo);
     if (pInventories->result() <= 0)
     {
         char *errMsg = errSprintf(nullptr);
diff --git a/frmts/grib/gribdataset.h b/frmts/grib/gribdataset.h
index b33d72f7fb07..be5eff428915 100644
--- a/frmts/grib/gribdataset.h
+++ b/frmts/grib/gribdataset.h
@@ -44,6 +44,7 @@
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
+#include <time.h>
 
 #include <algorithm>
 #include <memory>
@@ -114,8 +115,7 @@ class GRIBDataset final : public GDALPamDataset
   private:
     void SetGribMetaData(grib_MetaData *meta);
     static GDALDataset *OpenMultiDim(GDALOpenInfo *);
-    static std::unique_ptr<gdal::grib::InventoryWrapper>
-    Inventory(VSILFILE *, GDALOpenInfo *);
+    std::unique_ptr<gdal::grib::InventoryWrapper> Inventory(GDALOpenInfo *);
 
     VSILFILE *fp;
     // Calculate and store once as GetGeoTransform may be called multiple times.
@@ -135,6 +135,14 @@ class GRIBDataset final : public GDALPamDataset
     std::shared_ptr<OGRSpatialReference> m_poSRS{};
     std::unique_ptr<OGRSpatialReference> m_poLL{};
     std::unique_ptr<OGRCoordinateTransformation> m_poCT{};
+
+#ifdef BUILD_APPS
+    bool m_bSideCarIdxUsed = false;
+    bool m_bWarnedGdalinfoNomd = false;
+    time_t m_nFirstMetadataQueriedTimeStamp = 0;
+    bool m_bWarnedGdalinfoNonodata = false;
+    time_t m_nFirstNodataQueriedTimeStamp = 0;
+#endif
 };
 
 /************************************************************************/

From c04b25f803ef8ab5a3dffdfaccfceb82c257394c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 13:37:56 +0200
Subject: [PATCH 31/94] =?UTF-8?q?PG:=20fix=20support=20for=20geometry/geog?=
 =?UTF-8?q?raphy=20OID=20in=20range=C2=A0[2147483648,=204294967295]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #10486
---
 ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp | 4 ++--
 ogr/ogrsf_frmts/pg/ogrpglayer.cpp      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
index 1c2c6a93b8e0..f38c9e7329e0 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
@@ -831,12 +831,12 @@ int OGRPGDataSource::Open(const char *pszNewName, int bUpdate, int bTestOpen,
             if (EQUAL(pszTypname, "geometry"))
             {
                 bHavePostGIS = TRUE;
-                nGeometryOID = atoi(pszOid);
+                nGeometryOID = static_cast<Oid>(strtoul(pszOid, nullptr, 10));
             }
             else if (CPLTestBool(CPLGetConfigOption("PG_USE_GEOGRAPHY", "YES")))
             {
                 bHaveGeography = TRUE;
-                nGeographyOID = atoi(pszOid);
+                nGeographyOID = static_cast<Oid>(strtoul(pszOid, nullptr, 10));
             }
         }
     }
diff --git a/ogr/ogrsf_frmts/pg/ogrpglayer.cpp b/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
index a196317b7ce6..8e186860d7d5 100644
--- a/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
@@ -564,7 +564,7 @@ OGRFeature *OGRPGLayer::RecordToFeature(PGresult *hResult,
     for (int iField = 0; iField < PQnfields(hResult); iField++)
     {
 #if defined(BINARY_CURSOR_ENABLED)
-        int nTypeOID = PQftype(hResult, iField);
+        const Oid nTypeOID = PQftype(hResult, iField);
 #endif
         const char *pszFieldName = PQfname(hResult, iField);
 

From a348569c531450c2c375dedee3beeb3d3c068af5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 15:13:53 +0200
Subject: [PATCH 32/94] OGR_GreatCircle_ API: do not hardcode Earth radius

---
 ogr/gml2ogrgeometry.cpp                     | 100 +++++++++++++-------
 ogr/ogr_geo_utils.cpp                       |  13 ++-
 ogr/ogr_geo_utils.h                         |   9 +-
 ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp |  14 ++-
 ogr/test_geo_utils.cpp                      |  38 +++++---
 5 files changed, 116 insertions(+), 58 deletions(-)

diff --git a/ogr/gml2ogrgeometry.cpp b/ogr/gml2ogrgeometry.cpp
index 70cbe1706b84..7165bc5cccfb 100644
--- a/ogr/gml2ogrgeometry.cpp
+++ b/ogr/gml2ogrgeometry.cpp
@@ -851,6 +851,20 @@ static double GetDistanceInMetre(double dfDistance, const char *pszUnits)
     return -1;
 }
 
+/************************************************************************/
+/*                            GetSemiMajor()                            */
+/************************************************************************/
+
+static double GetSemiMajor(const OGRSpatialReference *poSRS)
+{
+    double dfSemiMajor = poSRS->GetSemiMajor();
+    // Standardize on OGR_GREATCIRCLE_DEFAULT_RADIUS for Earth ellipsoids.
+    if (std::fabs(dfSemiMajor - OGR_GREATCIRCLE_DEFAULT_RADIUS) <
+        0.05 * OGR_GREATCIRCLE_DEFAULT_RADIUS)
+        dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
+    return dfSemiMajor;
+}
+
 /************************************************************************/
 /*                      GML2OGRGeometry_XMLNode()                       */
 /*                                                                      */
@@ -1155,7 +1169,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
     const auto storeArcByCenterPointParameters =
         [](const CPLXMLNode *psChild, const char *l_pszSRSName,
            bool &bIsApproximateArc, double &dfLastCurveApproximateArcRadius,
-           bool &bLastCurveWasApproximateArcInvertedAxisOrder)
+           bool &bLastCurveWasApproximateArcInvertedAxisOrder,
+           double &dfSemiMajor)
     {
         const CPLXMLNode *psRadius = FindBareXMLChild(psChild, "radius");
         if (psRadius && psRadius->eType == CXT_Element)
@@ -1173,6 +1188,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     {
                         bInvertedAxisOrder =
                             CPL_TO_BOOL(oSRS.EPSGTreatsAsLatLong());
+                        dfSemiMajor = GetSemiMajor(&oSRS);
                         bSRSUnitIsDegree =
                             fabs(oSRS.GetAngularUnits(nullptr) -
                                  CPLAtof(SRS_UA_DEGREE_CONV)) < 1e-8;
@@ -1194,7 +1210,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
         [](OGRGeometry *poGeom, OGRCompoundCurve *poCC,
            const bool bIsApproximateArc, const bool bLastCurveWasApproximateArc,
            const double dfLastCurveApproximateArcRadius,
-           const bool bLastCurveWasApproximateArcInvertedAxisOrder)
+           const bool bLastCurveWasApproximateArcInvertedAxisOrder,
+           const double dfSemiMajor)
     {
         if (bIsApproximateArc)
         {
@@ -1213,10 +1230,12 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     double dfDistance = 0.0;
                     if (bLastCurveWasApproximateArcInvertedAxisOrder)
                         dfDistance = OGR_GreatCircle_Distance(
-                            p.getX(), p.getY(), p2.getX(), p2.getY());
+                            p.getX(), p.getY(), p2.getX(), p2.getY(),
+                            dfSemiMajor);
                     else
                         dfDistance = OGR_GreatCircle_Distance(
-                            p.getY(), p.getX(), p2.getY(), p2.getX());
+                            p.getY(), p.getX(), p2.getY(), p2.getX(),
+                            dfSemiMajor);
                     // CPLDebug("OGR", "%f %f",
                     //          dfDistance,
                     //          dfLastCurveApproximateArcRadius
@@ -1249,10 +1268,12 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     double dfDistance = 0.0;
                     if (bLastCurveWasApproximateArcInvertedAxisOrder)
                         dfDistance = OGR_GreatCircle_Distance(
-                            p.getX(), p.getY(), p2.getX(), p2.getY());
+                            p.getX(), p.getY(), p2.getX(), p2.getY(),
+                            dfSemiMajor);
                     else
                         dfDistance = OGR_GreatCircle_Distance(
-                            p.getY(), p.getX(), p2.getY(), p2.getX());
+                            p.getY(), p.getX(), p2.getY(), p2.getX(),
+                            dfSemiMajor);
                     // CPLDebug(
                     //    "OGR", "%f %f",
                     //    dfDistance,
@@ -1290,6 +1311,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
         double dfFirstChildApproximateArcRadius = 0.0;
         bool bFirstChildWasApproximateArcInvertedAxisOrder = false;
 
+        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
+
         for (const CPLXMLNode *psChild = psNode->psChild; psChild != nullptr;
              psChild = psChild->psNext)
         {
@@ -1352,7 +1375,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     storeArcByCenterPointParameters(
                         psChild3, pszSRSName, bIsApproximateArc,
                         dfLastCurveApproximateArcRadius,
-                        bLastCurveWasApproximateArcInvertedAxisOrder);
+                        bLastCurveWasApproximateArcInvertedAxisOrder,
+                        dfSemiMajor);
                     if (bIsFirstChild && bIsApproximateArc)
                     {
                         bFirstChildIsApproximateArc = true;
@@ -1390,7 +1414,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                         poGeom.get(), poCC.get(), bIsApproximateArc,
                         bLastCurveWasApproximateArc,
                         dfLastCurveApproximateArcRadius,
-                        bLastCurveWasApproximateArcInvertedAxisOrder);
+                        bLastCurveWasApproximateArcInvertedAxisOrder,
+                        dfSemiMajor);
 
                     auto poCurve =
                         std::unique_ptr<OGRCurve>(poGeom.release()->toCurve());
@@ -1448,7 +1473,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                                     psChild2, pszSRSName,
                                     bLastChildIsApproximateArc,
                                     dfLastCurveApproximateArcRadius,
-                                    bLastCurveWasApproximateArcInvertedAxisOrder);
+                                    bLastCurveWasApproximateArcInvertedAxisOrder,
+                                    dfSemiMajor);
                             }
                             else
                             {
@@ -1486,11 +1512,11 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 poLS->EndPoint(&p2);
                 double dfDistance = 0.0;
                 if (bFirstChildWasApproximateArcInvertedAxisOrder)
-                    dfDistance = OGR_GreatCircle_Distance(p.getX(), p.getY(),
-                                                          p2.getX(), p2.getY());
+                    dfDistance = OGR_GreatCircle_Distance(
+                        p.getX(), p.getY(), p2.getX(), p2.getY(), dfSemiMajor);
                 else
-                    dfDistance = OGR_GreatCircle_Distance(p.getY(), p.getX(),
-                                                          p2.getY(), p2.getX());
+                    dfDistance = OGR_GreatCircle_Distance(
+                        p.getY(), p.getX(), p2.getY(), p2.getX(), dfSemiMajor);
                 if (dfDistance < dfFirstChildApproximateArcRadius / 5.0)
                 {
                     CPLDebug("OGR", "Moving approximate start of "
@@ -1511,11 +1537,11 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 poLS->EndPoint(&p2);
                 double dfDistance = 0.0;
                 if (bLastCurveWasApproximateArcInvertedAxisOrder)
-                    dfDistance = OGR_GreatCircle_Distance(p.getX(), p.getY(),
-                                                          p2.getX(), p2.getY());
+                    dfDistance = OGR_GreatCircle_Distance(
+                        p.getX(), p.getY(), p2.getX(), p2.getY(), dfSemiMajor);
                 else
-                    dfDistance = OGR_GreatCircle_Distance(p.getY(), p.getX(),
-                                                          p2.getY(), p2.getX());
+                    dfDistance = OGR_GreatCircle_Distance(
+                        p.getY(), p.getX(), p2.getY(), p2.getX(), dfSemiMajor);
                 if (dfDistance < dfLastCurveApproximateArcRadius / 5.0)
                 {
                     CPLDebug("OGR", "Moving approximate end of "
@@ -1778,6 +1804,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
 
         bool bSRSUnitIsDegree = false;
         bool bInvertedAxisOrder = false;
+        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
         if (pszSRSName != nullptr)
         {
             OGRSpatialReference oSRS;
@@ -1785,6 +1812,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
             {
                 if (oSRS.IsGeographic())
                 {
+                    dfSemiMajor = GetSemiMajor(&oSRS);
                     bInvertedAxisOrder =
                         CPL_TO_BOOL(oSRS.EPSGTreatsAsLatLong());
                     bSRSUnitIsDegree = fabs(oSRS.GetAngularUnits(nullptr) -
@@ -1792,6 +1820,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 }
                 else if (oSRS.IsProjected())
                 {
+                    dfSemiMajor = GetSemiMajor(&oSRS);
                     bInvertedAxisOrder =
                         CPL_TO_BOOL(oSRS.EPSGTreatsAsNorthingEasting());
                 }
@@ -1822,15 +1851,15 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                         dfCenterX, dfCenterY, dfDistance,
                         // See
                         // https://ext.eurocontrol.int/aixm_confluence/display/ACG/ArcByCenterPoint+Interpretation+Summary
-                        dfAngle, &dfLat, &dfLong);
+                        dfAngle, dfSemiMajor, &dfLat, &dfLong);
                     p.setX(dfLat);  // yes, external code will do the swap later
                     p.setY(dfLong);
                 }
                 else
                 {
-                    OGR_GreatCircle_ExtendPosition(dfCenterY, dfCenterX,
-                                                   dfDistance, 90 - dfAngle,
-                                                   &dfLat, &dfLong);
+                    OGR_GreatCircle_ExtendPosition(
+                        dfCenterY, dfCenterX, dfDistance, 90 - dfAngle,
+                        dfSemiMajor, &dfLat, &dfLong);
                     p.setX(dfLong);
                     p.setY(dfLat);
                 }
@@ -1842,15 +1871,16 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
             if (bInvertedAxisOrder)
             {
                 OGR_GreatCircle_ExtendPosition(dfCenterX, dfCenterY, dfDistance,
-                                               dfEndAngle, &dfLat, &dfLong);
+                                               dfEndAngle, dfSemiMajor, &dfLat,
+                                               &dfLong);
                 p.setX(dfLat);  // yes, external code will do the swap later
                 p.setY(dfLong);
             }
             else
             {
                 OGR_GreatCircle_ExtendPosition(dfCenterY, dfCenterX, dfDistance,
-                                               90 - dfEndAngle, &dfLat,
-                                               &dfLong);
+                                               90 - dfEndAngle, dfSemiMajor,
+                                               &dfLat, &dfLong);
                 p.setX(dfLong);
                 p.setY(dfLat);
             }
@@ -1902,6 +1932,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
 
         bool bSRSUnitIsDegree = false;
         bool bInvertedAxisOrder = false;
+        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
         if (pszSRSName != nullptr)
         {
             OGRSpatialReference oSRS;
@@ -1909,6 +1940,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
             {
                 if (oSRS.IsGeographic())
                 {
+                    dfSemiMajor = GetSemiMajor(&oSRS);
                     bInvertedAxisOrder =
                         CPL_TO_BOOL(oSRS.EPSGTreatsAsLatLong());
                     bSRSUnitIsDegree = fabs(oSRS.GetAngularUnits(nullptr) -
@@ -1916,6 +1948,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 }
                 else if (oSRS.IsProjected())
                 {
+                    dfSemiMajor = GetSemiMajor(&oSRS);
                     bInvertedAxisOrder =
                         CPL_TO_BOOL(oSRS.EPSGTreatsAsNorthingEasting());
                 }
@@ -1938,17 +1971,17 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                 double dfLat = 0.0;
                 if (bInvertedAxisOrder)
                 {
-                    OGR_GreatCircle_ExtendPosition(dfCenterX, dfCenterY,
-                                                   dfDistance, dfAngle, &dfLat,
-                                                   &dfLong);
+                    OGR_GreatCircle_ExtendPosition(
+                        dfCenterX, dfCenterY, dfDistance, dfAngle, dfSemiMajor,
+                        &dfLat, &dfLong);
                     p.setX(dfLat);  // yes, external code will do the swap later
                     p.setY(dfLong);
                 }
                 else
                 {
-                    OGR_GreatCircle_ExtendPosition(dfCenterY, dfCenterX,
-                                                   dfDistance, dfAngle, &dfLat,
-                                                   &dfLong);
+                    OGR_GreatCircle_ExtendPosition(
+                        dfCenterY, dfCenterX, dfDistance, dfAngle, dfSemiMajor,
+                        &dfLat, &dfLong);
                     p.setX(dfLong);
                     p.setY(dfLat);
                 }
@@ -2547,6 +2580,7 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
         bool bLastCurveWasApproximateArc = false;
         bool bLastCurveWasApproximateArcInvertedAxisOrder = false;
         double dfLastCurveApproximateArcRadius = 0.0;
+        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
 
         for (const CPLXMLNode *psChild = psNode->psChild; psChild != nullptr;
              psChild = psChild->psNext)
@@ -2583,7 +2617,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                     storeArcByCenterPointParameters(
                         psChild, pszSRSName, bIsApproximateArc,
                         dfLastCurveApproximateArcRadius,
-                        bLastCurveWasApproximateArcInvertedAxisOrder);
+                        bLastCurveWasApproximateArcInvertedAxisOrder,
+                        dfSemiMajor);
                 }
 
                 if (wkbFlatten(poGeom->getGeometryType()) != wkbLineString)
@@ -2609,7 +2644,8 @@ static std::unique_ptr<OGRGeometry> GML2OGRGeometry_XMLNode_Internal(
                         poGeom.get(), poCC.get(), bIsApproximateArc,
                         bLastCurveWasApproximateArc,
                         dfLastCurveApproximateArcRadius,
-                        bLastCurveWasApproximateArcInvertedAxisOrder);
+                        bLastCurveWasApproximateArcInvertedAxisOrder,
+                        dfSemiMajor);
 
                     auto poAsCurve =
                         std::unique_ptr<OGRCurve>(poGeom.release()->toCurve());
diff --git a/ogr/ogr_geo_utils.cpp b/ogr/ogr_geo_utils.cpp
index 1d43a585df9a..5e1e977c7a3b 100644
--- a/ogr/ogr_geo_utils.cpp
+++ b/ogr/ogr_geo_utils.cpp
@@ -30,9 +30,6 @@
 #include "cpl_port.h"
 #include "cpl_error.h"
 
-constexpr double RAD2METER = (180.0 / M_PI) * 60.0 * 1852.0;
-constexpr double METER2RAD = 1.0 / RAD2METER;
-
 constexpr double DEG2RAD = M_PI / 180.0;
 constexpr double RAD2DEG = 1.0 / DEG2RAD;
 
@@ -50,7 +47,8 @@ static double OGR_Safe_acos(double x)
 /************************************************************************/
 
 double OGR_GreatCircle_Distance(double LatA_deg, double LonA_deg,
-                                double LatB_deg, double LonB_deg)
+                                double LatB_deg, double LonB_deg,
+                                double dfRadius)
 {
     const double cosP = cos((LonB_deg - LonA_deg) * DEG2RAD);
     const double LatA_rad = LatA_deg * DEG2RAD;
@@ -60,7 +58,7 @@ double OGR_GreatCircle_Distance(double LatA_deg, double LonA_deg,
     const double cosb = cos(LatB_rad);
     const double sinb = sin(LatB_rad);
     const double cos_angle = sina * sinb + cosa * cosb * cosP;
-    return OGR_Safe_acos(cos_angle) * RAD2METER;
+    return OGR_Safe_acos(cos_angle) * dfRadius;
 }
 
 /************************************************************************/
@@ -131,13 +129,14 @@ double OGR_GreatCircle_InitialHeading(double LatA_deg, double LonA_deg,
 
 int OGR_GreatCircle_ExtendPosition(double dfLatA_deg, double dfLonA_deg,
                                    double dfDistance, double dfHeadingInA,
-                                   double *pdfLatB_deg, double *pdfLonB_deg)
+                                   double dfRadius, double *pdfLatB_deg,
+                                   double *pdfLonB_deg)
 {
     const double dfHeadingRad = dfHeadingInA * DEG2RAD;
     const double cos_Heading = cos(dfHeadingRad);
     const double sin_Heading = sin(dfHeadingRad);
 
-    const double dfDistanceRad = dfDistance * METER2RAD;
+    const double dfDistanceRad = dfDistance / dfRadius;
     const double cos_Distance = cos(dfDistanceRad);
     const double sin_Distance = sin(dfDistanceRad);
 
diff --git a/ogr/ogr_geo_utils.h b/ogr/ogr_geo_utils.h
index 47e7fb7e11fb..4befd385d80f 100644
--- a/ogr/ogr_geo_utils.h
+++ b/ogr/ogr_geo_utils.h
@@ -41,8 +41,13 @@
  * for an airport runway, from its extreme points, track and length.
  */
 
+// Such that OGR_GREATCIRCLE_DEFAULT_RADIUS * M_PI * 2 == 360 * 60.0 * 1852.0
+// that is that one degree == 60 nautical miles
+constexpr double OGR_GREATCIRCLE_DEFAULT_RADIUS = 6366707.01949370746;
+
 double OGR_GreatCircle_Distance(double dfLatA_deg, double dfLonA_deg,
-                                double dfLatB_deg, double dfLonB_deg);
+                                double dfLatB_deg, double dfLonB_deg,
+                                double dfRadius);
 
 double OGR_GreatCircle_InitialHeading(double dfLatA_deg, double dfLonA_deg,
                                       double dfLatB_deg, double dfLonB_deg);
@@ -50,7 +55,7 @@ double OGR_GreatCircle_InitialHeading(double dfLatA_deg, double dfLonA_deg,
 /* such as ExtendPosition(A, Distance(A,B), InitialHeading(A,B)) ~= B */
 int CPL_DLL OGR_GreatCircle_ExtendPosition(double dfLatA_deg, double dfLonA_deg,
                                            double dfDistance,
-                                           double dfHeadingInA,
+                                           double dfHeadingInA, double dfRadius,
                                            double *pdfLatB_deg,
                                            double *pdfLonB_deg);
 
diff --git a/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp b/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
index 14340b072981..5b153981025d 100644
--- a/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
+++ b/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp
@@ -1579,6 +1579,8 @@ void OGRElasticLayer::BuildFeature(OGRFeature *poFeature, json_object *poSource,
         else if ((oIter = m_aosMapToGeomFieldIndex.find(osCurPath)) !=
                  m_aosMapToGeomFieldIndex.end())
         {
+            const auto poSRS = m_poFeatureDefn->GetGeomFieldDefn(oIter->second)
+                                   ->GetSpatialRef();
             OGRGeometry *poGeom = nullptr;
             if (m_abIsGeoPoint[oIter->second])
             {
@@ -1677,12 +1679,16 @@ void OGRElasticLayer::BuildFeature(OGRFeature *poFeature, json_object *poSource,
                     {
                         dfRadius *= dfUnit;
                         OGRLinearRing *poRing = new OGRLinearRing();
+                        double dfSemiMajor = OGR_GREATCIRCLE_DEFAULT_RADIUS;
+                        if (poSRS && poSRS->IsGeographic())
+                            dfSemiMajor = poSRS->GetSemiMajor();
                         for (double dfStep = 0; dfStep <= 360; dfStep += 4)
                         {
                             double dfLat = 0.0;
                             double dfLon = 0.0;
-                            OGR_GreatCircle_ExtendPosition(
-                                dfY, dfX, dfRadius, dfStep, &dfLat, &dfLon);
+                            OGR_GreatCircle_ExtendPosition(dfY, dfX, dfRadius,
+                                                           dfSemiMajor, dfStep,
+                                                           &dfLat, &dfLon);
                             poRing->addPoint(dfLon, dfLat);
                         }
                         OGRPolygon *poPoly = new OGRPolygon();
@@ -1740,9 +1746,7 @@ void OGRElasticLayer::BuildFeature(OGRFeature *poFeature, json_object *poSource,
 
             if (poGeom != nullptr)
             {
-                poGeom->assignSpatialReference(
-                    m_poFeatureDefn->GetGeomFieldDefn(oIter->second)
-                        ->GetSpatialRef());
+                poGeom->assignSpatialReference(poSRS);
                 poFeature->SetGeomFieldDirectly(oIter->second, poGeom);
             }
         }
diff --git a/ogr/test_geo_utils.cpp b/ogr/test_geo_utils.cpp
index a4d3468292d0..85f1f5a212f1 100644
--- a/ogr/test_geo_utils.cpp
+++ b/ogr/test_geo_utils.cpp
@@ -9,41 +9,55 @@ int main(int /* argc */, char * /* argv */[])
     const double lonB = 2.00001;
 
     double heading = OGR_GreatCircle_InitialHeading(latA, lonA, latB, lonB);
-    double distance = OGR_GreatCircle_Distance(latA, lonA, latB, lonB);
+    double distance = OGR_GreatCircle_Distance(latA, lonA, latB, lonB,
+                                               OGR_GREATCIRCLE_DEFAULT_RADIUS);
     double latC = 0.0;
     double lonC = 0.0;
-    OGR_GreatCircle_ExtendPosition(latA, lonA, distance, heading, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(latA, lonA, distance, heading,
+                                   OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC,
+                                   &lonC);
     printf("heading=%f, distance=%f\n", heading, distance);
     printf("%.15f=%.15f, %.15f=%.15f\n", latB, latC, lonB, lonC);
 
     heading = OGR_GreatCircle_InitialHeading(latB, lonB, latA, lonA);
-    distance = OGR_GreatCircle_Distance(latB, lonB, latA, lonA);
-    OGR_GreatCircle_ExtendPosition(latB, lonB, distance, heading, &latC, &lonC);
+    distance = OGR_GreatCircle_Distance(latB, lonB, latA, lonA,
+                                        OGR_GREATCIRCLE_DEFAULT_RADIUS);
+    OGR_GreatCircle_ExtendPosition(latB, lonB, distance, heading,
+                                   OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC,
+                                   &lonC);
     printf("heading=%f, distance=%f\n", heading, distance);
     printf("%.15f=%.15f, %.15f=%.15f\n", latA, latC, lonA, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 100, 100000, 0, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 100, 100000, 0, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 100, 100000, 90, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 100, 100000, 90, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 100, 100000, 180, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 100, 100000, 180, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 100, 100000, 270, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 100, 100000, 270, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 0, 100000, 0, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 0, 100000, 0, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 0, 100000, 90, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 0, 100000, 90, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 0, 100000, 180, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 0, 100000, 180, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
-    OGR_GreatCircle_ExtendPosition(0, 0, 100000, 270, &latC, &lonC);
+    OGR_GreatCircle_ExtendPosition(
+        0, 0, 100000, 270, OGR_GREATCIRCLE_DEFAULT_RADIUS, &latC, &lonC);
     printf("lat=%.15f, lon=%.15f\n", latC, lonC);
 
     return 0;

From bda2faeef076d3eae9378806f0bbcc90931d5452 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 15:39:35 +0200
Subject: [PATCH 33/94] Doc: document multidimensional API object lifetime

Fixes #10481
---
 .../user/multidim_raster_data_model.rst       | 114 ++++++++++++++++++
 gcore/gdal.h                                  |   2 +-
 2 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/doc/source/user/multidim_raster_data_model.rst b/doc/source/user/multidim_raster_data_model.rst
index 142409d35afb..b42bb3cd3cb6 100644
--- a/doc/source/user/multidim_raster_data_model.rst
+++ b/doc/source/user/multidim_raster_data_model.rst
@@ -108,12 +108,126 @@ a GDALExtendedDataType.
     GDALDataType does. So a driver may decide to expose a GDT\_Cxxxx datatype
     from a HDF5 Compound data type representing a complex value.
 
+Objects lifetime
+----------------
+
+Driver implementations of the multidimensional API are such that instances of
+GDALGroup, GDALMDArray, GDALAttribute and GDALDimension can be used independently
+of the objects from which they have been obtained from. So:
+
+- the GDALGroup instance returned by :cpp:func:`GDALDataset::GetRootGroup()` can
+  be used after the dataset has been closed.
+
+- Sub-groups obtained from :cpp:func:`GDALGroup::OpenGroup()`
+  or arrays obtained from :cpp:func:`GDALGroup::OpenMDArray()` can be used after
+  the owning group has been released.
+
+- Similarly for attributes or dimensions obtained from a group or an array.
+
+
+So the following is perfectly legal:
+
+.. code-block:: c++
+
+    #include "gdal_priv.h"
+
+    std::shared_ptr<GDALMDArray> GetArray()
+    {
+        auto poDataset = std::unique_ptr<GDALDataset>(
+            GDALDataset::Open( "in.nc", GDAL_OF_MULTIDIM_RASTER ));
+        if( !poDataset )
+        {
+            return nullptr:
+        }
+        auto poRootGroup = poDataset->GetRootGroup();
+        if( !poRootGroup )
+        {
+            return nullptr:
+        }
+        auto poVar = poRootGroup->OpenMDArray("temperature");
+        if( !poVar )
+        {
+            return nullptr:
+        }
+        return poVar;
+    }
+
+    int main()
+    {
+        GDALAllRegister();
+        auto poVar = GetArray();
+        if( !poVar )
+        {
+            exit(1);
+        }
+
+        // Do something with poVar
+
+        return 0;
+    }
+
+
+A potential point of attention is that, when creating / editing a dataset, all
+those objects keep alive the underlying file descriptors, so changes are only
+guaranteed to be serialized when all objects related to a dataset have been released.
+
+Example in C++:
+
+.. code-block:: c++
+
+    int main()
+    {
+        GDALAllRegister();
+
+        auto poDataset = std::unique_ptr<GDALDataset>(
+            GetGDALDriverManager()->GetDriverByName("netCDF")->
+                CreateMultiDimensional( "new.nc", nullptr, nullptr ));
+        auto poRootGroup = poDataset->GetRootGroup();
+
+        // Could be closed a bit later too
+        poDataset.reset();
+
+        auto poDim = poRootGroup->CreateDimension(
+            "my_dim", std::string(), std::string(), 10);
+        auto poArray = poRootGroup->CreateMDArray(
+            "my_var", {poDim}, GDALExtendedDataType::Create(GDT_Byte), nullptr);
+
+        // Can be closed in any order
+        poArray.reset();
+        poDim.reset();
+        poRootGroup.reset();
+
+        // new.nc is fully valid just now
+
+        return 0;
+    }
+
+
+Example in Python:
+
+.. code-block:: python
+
+    from osgeo import gdal
+
+    with gdal.GetDriverByName("netCDF").CreateMultiDimensional("new.nc") as ds:
+        rg = ds.GetRootGroup()
+        dim = rg.CreateDimension("my_dim", "", "", 10)
+        array = rg.CreateMDArray("my_var", [dim], gdal.ExtendedDataType.Create(gdal.GDT_Byte))
+
+        del array
+        del dim
+        del rg
+
+    # new.nc is fully valid just now
+
 Differences with the GDAL 2D raster data model
 ----------------------------------------------
 
 - The concept of GDALRasterBand is no longer used for multidimensional.
   This can be modelled as either different GDALMDArray, or using a compound
   data type.
+- There is not yet a standardized concept multi-resolution arrays/overviews in
+  the multidimensional API
 
 Bridges between GDAL 2D classic raster data model and multidimensional data model
 ---------------------------------------------------------------------------------
diff --git a/gcore/gdal.h b/gcore/gdal.h
index b2b1a0f680ec..17aa103df3ff 100644
--- a/gcore/gdal.h
+++ b/gcore/gdal.h
@@ -502,7 +502,7 @@ typedef struct GDALDimensionHS *GDALDimensionH;
  */
 #define GDAL_DCAP_CREATE "DCAP_CREATE"
 
-/** Capability set by a driver that implements the CreateMultidimensional() API.
+/** Capability set by a driver that implements the CreateMultiDimensional() API.
  *
  * @since GDAL 3.1
  */

From fade27c324b863e48535e2a1b63bf8b2704a0351 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 17:13:21 +0200
Subject: [PATCH 34/94] [Lint] ogr: use cpl::contains()

---
 ogr/ogr_srs_cf1.cpp | 5 ++---
 ogr/swq.cpp         | 3 +--
 ogr/swq_select.cpp  | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ogr/ogr_srs_cf1.cpp b/ogr/ogr_srs_cf1.cpp
index 8add4d7a6d3b..4572a9606a37 100644
--- a/ogr/ogr_srs_cf1.cpp
+++ b/ogr/ogr_srs_cf1.cpp
@@ -1305,8 +1305,7 @@ NCDFGetProjAttribs(const OGR_SRSNode *poPROJCS, const char *pszProjection)
                     // Default is to not write as it is not CF-1.
                     bWriteVal = false;
                     // Test if there is no standard_parallel1.
-                    if (oValMap.find(std::string(CF_PP_STD_PARALLEL_1)) ==
-                        oValMap.end())
+                    if (!cpl::contains(oValMap, CF_PP_STD_PARALLEL_1))
                     {
                         // If scale factor != 1.0, write value for GDAL, but
                         // this is not supported by CF-1.
@@ -1362,7 +1361,7 @@ NCDFGetProjAttribs(const OGR_SRSNode *poPROJCS, const char *pszProjection)
             const auto &osGDALAtt = oValIter.first;
             const double dfValue = oValIter.second;
 
-            const auto &oAttIter = oAttMap.find(osGDALAtt);
+            const auto oAttIter = oAttMap.find(osGDALAtt);
 
             if (oAttIter != oAttMap.end())
             {
diff --git a/ogr/swq.cpp b/ogr/swq.cpp
index 38d983d42489..daf03f65e18b 100644
--- a/ogr/swq.cpp
+++ b/ogr/swq.cpp
@@ -407,8 +407,7 @@ const char *swq_select_summarize(swq_select *select_info, int dest_column,
             pszValue = SZ_OGR_NULL;
         try
         {
-            if (summary.oSetDistinctValues.find(pszValue) ==
-                summary.oSetDistinctValues.end())
+            if (!cpl::contains(summary.oSetDistinctValues, pszValue))
             {
                 summary.oSetDistinctValues.insert(pszValue);
                 if (select_info->order_specs == 0)
diff --git a/ogr/swq_select.cpp b/ogr/swq_select.cpp
index 9e9d84cb8727..16aa51bfec14 100644
--- a/ogr/swq_select.cpp
+++ b/ogr/swq_select.cpp
@@ -1198,7 +1198,7 @@ CPLErr swq_select::parse(swq_field_list *field_list,
 bool swq_select::IsFieldExcluded(int src_index, const char *pszTableName,
                                  const char *pszFieldName)
 {
-    auto list_it = m_exclude_fields.find(src_index);
+    const auto list_it = m_exclude_fields.find(src_index);
 
     if (list_it == m_exclude_fields.end())
     {

From b78f1b82699f70f5ad996a960b68f62955d6c24e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 17:13:36 +0200
Subject: [PATCH 35/94] [Lint] arrow_common: use cpl::contains()

---
 ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp       |  5 ++---
 ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp b/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp
index 0ef2b1ec0a05..084a7273acea 100644
--- a/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp
+++ b/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp
@@ -5444,8 +5444,7 @@ OGRArrowLayer::GetArrowSchemaInternal(struct ArrowSchema *out_schema) const
                 out_schema->children[j] = out_schema->children[i];
                 ++j;
             }
-            else if (m_oSetBBoxArrowColumns.find(i) !=
-                     m_oSetBBoxArrowColumns.end())
+            else if (cpl::contains(m_oSetBBoxArrowColumns, i))
             {
                 // Remove bounding box columns from exported schema
                 out_schema->children[i]->release(out_schema->children[i]);
@@ -5621,7 +5620,7 @@ inline int OGRArrowLayer::GetNextArrowArray(struct ArrowArrayStream *stream,
             int j = 0;
             for (int i = 0; i < static_cast<int>(schema.n_children); ++i)
             {
-                if (oSetBBoxArrayIndex.find(i) != oSetBBoxArrayIndex.end() ||
+                if (cpl::contains(oSetBBoxArrayIndex, i) ||
                     IsSilentlyIgnoredFormatForGetArrowSchemaArray(
                         schema.children[i]->format))
                 {
diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp b/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp
index 20aed6fe967d..827babbc1d65 100644
--- a/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp
+++ b/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp
@@ -2305,8 +2305,8 @@ inline bool OGRArrowWriterLayer::WriteArrowBatchInternal(
     std::map<std::string, int> oMapSchemaChildrenNameToIdx;
     for (int i = 0; i < static_cast<int>(schema->n_children); ++i)
     {
-        if (oMapSchemaChildrenNameToIdx.find(schema->children[i]->name) !=
-            oMapSchemaChildrenNameToIdx.end())
+        if (cpl::contains(oMapSchemaChildrenNameToIdx,
+                          schema->children[i]->name))
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Several fields with same name '%s' found",
@@ -2319,7 +2319,7 @@ inline bool OGRArrowWriterLayer::WriteArrowBatchInternal(
         {
             const auto oMetadata =
                 OGRParseArrowMetadata(schema->children[i]->metadata);
-            auto oIter = oMetadata.find(ARROW_EXTENSION_NAME_KEY);
+            const auto oIter = oMetadata.find(ARROW_EXTENSION_NAME_KEY);
             if (oIter != oMetadata.end() &&
                 (oIter->second == EXTENSION_NAME_OGC_WKB ||
                  oIter->second == EXTENSION_NAME_GEOARROW_WKB))
@@ -2575,8 +2575,7 @@ inline bool OGRArrowWriterLayer::WriteArrowBatchInternal(
 
     for (int i = 0; i < static_cast<int>(schema->n_children); ++i)
     {
-        if (oSetReferencedFieldsInArraySchema.find(i) ==
-            oSetReferencedFieldsInArraySchema.end())
+        if (!cpl::contains(oSetReferencedFieldsInArraySchema, i))
         {
             if (m_osFIDColumn.empty() &&
                 strcmp(schema->children[i]->name, pszFIDName) == 0)
@@ -2842,7 +2841,7 @@ inline bool OGRArrowWriterLayer::WriteArrowBatchInternal(
         std::vector<std::shared_ptr<arrow::Array>> apoArrays;
         for (int i = 0; i < m_poSchema->num_fields(); ++i)
         {
-            auto oIter =
+            const auto oIter =
                 oMapGeomFieldNameToArray.find(m_poSchema->field(i)->name());
             if (oIter != oMapGeomFieldNameToArray.end())
                 apoArrays.emplace_back(oIter->second);

From 42452574368fc919ec25e7057b0d2be0c99327ba Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 17:13:49 +0200
Subject: [PATCH 36/94] [Lint] geojson: use cpl::contains()

---
 .../geojson/directedacyclicgraph.hpp          | 10 ++++----
 ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp  | 24 +++++++++----------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp b/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp
index eff9c15d6adf..4a42c2180271 100644
--- a/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp
+++ b/ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp
@@ -134,11 +134,11 @@ const char *DirectedAcyclicGraph<T, V>::addEdge(const T &i, const T &j)
         return "already inserted edge";
     }
 
-    if (nodes.find(i) == nodes.end())
+    if (!cpl::contains(nodes, i))
     {
         return "node i unknown";
     }
-    if (nodes.find(j) == nodes.end())
+    if (!cpl::contains(nodes, j))
     {
         return "node j unknown";
     }
@@ -195,7 +195,7 @@ bool DirectedAcyclicGraph<T, V>::isTherePathFromTo(const T &i, const T &j) const
         {
             for (const T &k : iter->second)
             {
-                if (plannedForVisit.find(k) == plannedForVisit.end())
+                if (!cpl::contains(plannedForVisit, k))
                 {
                     plannedForVisit.insert(k);
                     toVisit.push(k);
@@ -212,7 +212,7 @@ std::vector<T> DirectedAcyclicGraph<T, V>::findStartingNodes() const
     std::vector<T> ret;
     for (const auto &i : nodes)
     {
-        if (incomingNodes.find(i) == incomingNodes.end())
+        if (!cpl::contains(incomingNodes, i))
             ret.emplace_back(i);
     }
     return ret;
@@ -253,7 +253,7 @@ std::vector<T> DirectedAcyclicGraph<T, V>::getTopologicalOrdering()
                 const char *retRemoveEdge = removeEdge(n, m);
                 (void)retRemoveEdge;
                 assert(retRemoveEdge == nullptr);
-                if (incomingNodes.find(m) == incomingNodes.end())
+                if (!cpl::contains(incomingNodes, m))
                 {
                     S.insert(m);
                 }
diff --git a/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
index 6861de10d797..bd08345f2645 100644
--- a/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp
@@ -306,12 +306,12 @@ void OGRGeoJSONReaderStreamingParser::GotFeature(json_object *poObj,
             if (nFID == OGRNullFID)
             {
                 nFID = static_cast<GIntBig>(m_oSetUsedFIDs.size());
-                while (m_oSetUsedFIDs.find(nFID) != m_oSetUsedFIDs.end())
+                while (cpl::contains(m_oSetUsedFIDs, nFID))
                 {
                     ++nFID;
                 }
             }
-            else if (m_oSetUsedFIDs.find(nFID) != m_oSetUsedFIDs.end())
+            else if (cpl::contains(m_oSetUsedFIDs, nFID))
             {
                 if (!m_bOriginalIdModifiedEmitted)
                 {
@@ -324,7 +324,7 @@ void OGRGeoJSONReaderStreamingParser::GotFeature(json_object *poObj,
                     m_bOriginalIdModifiedEmitted = true;
                 }
                 nFID = static_cast<GIntBig>(m_oSetUsedFIDs.size());
-                while (m_oSetUsedFIDs.find(nFID) != m_oSetUsedFIDs.end())
+                while (cpl::contains(m_oSetUsedFIDs, nFID))
                 {
                     ++nFID;
                 }
@@ -786,8 +786,7 @@ OGRFeature *OGRGeoJSONReader::GetFeature(OGRGeoJSONLayer *poLayer, GIntBig nFID)
                     if (poFeat)
                     {
                         const GIntBig nThisFID = poFeat->GetFID();
-                        if (oMapFIDToOffsetSize_.find(nThisFID) ==
-                            oMapFIDToOffsetSize_.end())
+                        if (!cpl::contains(oMapFIDToOffsetSize_, nThisFID))
                         {
                             oMapFIDToOffsetSize_[nThisFID] =
                                 std::pair<vsi_l_offset, vsi_l_offset>(
@@ -806,7 +805,7 @@ OGRFeature *OGRGeoJSONReader::GetFeature(OGRGeoJSONLayer *poLayer, GIntBig nFID)
         bOriginalIdModifiedEmitted_ = oParser.GetOriginalIdModifiedEmitted();
     }
 
-    auto oIter = oMapFIDToOffsetSize_.find(nFID);
+    const auto oIter = oMapFIDToOffsetSize_.find(nFID);
     if (oIter == oMapFIDToOffsetSize_.end())
     {
         return nullptr;
@@ -1348,7 +1347,7 @@ void OGRGeoJSONReaderAddOrUpdateField(
         return;
     }
 
-    auto oMapFieldNameToIdxIter = oMapFieldNameToIdx.find(pszKey);
+    const auto oMapFieldNameToIdxIter = oMapFieldNameToIdx.find(pszKey);
     if (oMapFieldNameToIdxIter == oMapFieldNameToIdx.end())
     {
         OGRFieldSubType eSubType;
@@ -1385,8 +1384,7 @@ void OGRGeoJSONReaderAddOrUpdateField(
             GeoJSONPropertyToFieldType(poVal, eNewSubType, bArrayAsString);
         const bool bNewIsEmptyArray =
             (jType == json_type_array && json_object_array_length(poVal) == 0);
-        if (aoSetUndeterminedTypeFields.find(nIndex) !=
-            aoSetUndeterminedTypeFields.end())
+        if (cpl::contains(aoSetUndeterminedTypeFields, nIndex))
         {
             poFDefn->SetSubType(OFSTNone);
             poFDefn->SetType(eNewType);
@@ -1656,7 +1654,7 @@ void OGRGeoJSONGenerateFeatureDefnDealWithID(
     json_object *poObjId = OGRGeoJSONFindMemberByName(poObj, "id");
     if (poObjId)
     {
-        auto iterIdxId = oMapFieldNameToIdx.find("id");
+        const auto iterIdxId = oMapFieldNameToIdx.find("id");
         if (iterIdxId == oMapFieldNameToIdx.end())
         {
             if (json_object_get_type(poObjId) == json_type_int)
@@ -1813,7 +1811,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn(
         json_object_object_foreachC(poObjProps, it)
         {
             if (!bIsGeocouchSpatiallistFormat &&
-                oMapFieldNameToIdx.find(it.key) == oMapFieldNameToIdx.end())
+                !cpl::contains(oMapFieldNameToIdx, it.key))
             {
                 // Detect the special kind of GeoJSON output by a spatiallist of
                 // GeoCouch such as:
@@ -1844,7 +1842,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn(
                                 "GEOJSON_FLATTEN_GEOCOUCH", "TRUE"));
                     if (bFlattenGeocouchSpatiallistFormat)
                     {
-                        auto typeIter = oMapFieldNameToIdx.find("type");
+                        const auto typeIter = oMapFieldNameToIdx.find("type");
                         if (typeIter != oMapFieldNameToIdx.end())
                         {
                             const int nIdx = typeIter->second;
@@ -1901,7 +1899,7 @@ bool OGRGeoJSONBaseReader::GenerateFeatureDefn(
                 strcmp(it.key, "centroid") != 0 &&
                 strcmp(it.key, "bbox") != 0 && strcmp(it.key, "center") != 0)
             {
-                if (oMapFieldNameToIdx.find(it.key) == oMapFieldNameToIdx.end())
+                if (!cpl::contains(oMapFieldNameToIdx, it.key))
                 {
                     anCurFieldIndices.clear();
                     OGRGeoJSONReaderAddOrUpdateField(

From 01c0e8048dbdbefcc0d8b06b7c509f435b18cd22 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 17:14:05 +0200
Subject: [PATCH 37/94] [Lint] GPKG: use cpl::contains()

---
 .../gpkg/ogrgeopackagedatasource.cpp            |  8 +++-----
 .../gpkg/ogrgeopackagetablelayer.cpp            | 17 +++++++----------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index 8f5ca7c1edc9..fcb8ef577308 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -255,8 +255,7 @@ OGRSpatialReference *
 GDALGeoPackageDataset::GetSpatialRef(int iSrsId, bool bFallbackToEPSG,
                                      bool bEmitErrorIfNotFound)
 {
-    std::map<int, OGRSpatialReference *>::const_iterator oIter =
-        m_oMapSrsIdToSrs.find(iSrsId);
+    const auto oIter = m_oMapSrsIdToSrs.find(iSrsId);
     if (oIter != m_oMapSrsIdToSrs.end())
     {
         if (oIter->second == nullptr)
@@ -1807,8 +1806,7 @@ int GDALGeoPackageDataset::Open(GDALOpenInfo *poOpenInfo,
                     pszGeomColName ? std::string(pszTableName) + " (" +
                                          pszGeomColName + ')'
                                    : std::string(pszTableName);
-                if (oExistingLayers.find(osLayerNameWithGeomColName) !=
-                    oExistingLayers.end())
+                if (cpl::contains(oExistingLayers, osLayerNameWithGeomColName))
                     continue;
                 oExistingLayers.insert(osLayerNameWithGeomColName);
                 const std::string osLayerName = bTableHasSeveralGeomColumns
@@ -9235,7 +9233,7 @@ static void GPKG_GDAL_HasColorTable(sqlite3_context *pContext, int /*argc*/,
 GDALDataset *
 GDALGeoPackageDataset::GetRasterLayerDataset(const char *pszLayerName)
 {
-    auto oIter = m_oCachedRasterDS.find(pszLayerName);
+    const auto oIter = m_oCachedRasterDS.find(pszLayerName);
     if (oIter != m_oCachedRasterDS.end())
         return oIter->second.get();
 
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
index 074dcad5d3cd..a46f47c6765b 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -879,8 +879,8 @@ OGRErr OGRGeoPackageTableLayer::ReadTableDefinition()
             CPLSPrintf("trigger_delete_feature_count_%s", m_pszTableName));
         const std::map<CPLString, CPLString> &oMap =
             m_poDS->GetNameTypeMapFromSQliteMaster();
-        if (oMap.find(osTrigger1Name.toupper()) != oMap.end() &&
-            oMap.find(osTrigger2Name.toupper()) != oMap.end())
+        if (cpl::contains(oMap, osTrigger1Name.toupper()) &&
+            cpl::contains(oMap, osTrigger2Name.toupper()))
         {
             m_bOGRFeatureCountTriggersEnabled = true;
         }
@@ -941,7 +941,7 @@ OGRErr OGRGeoPackageTableLayer::ReadTableDefinition()
         /* Check that the table name is registered in gpkg_contents */
         const std::map<CPLString, GPKGContentsDesc> &oMapContents =
             m_poDS->GetContents();
-        std::map<CPLString, GPKGContentsDesc>::const_iterator oIterContents =
+        const auto oIterContents =
             oMapContents.find(CPLString(m_pszTableName).toupper());
         if (oIterContents == oMapContents.end())
         {
@@ -1268,8 +1268,7 @@ OGRErr OGRGeoPackageTableLayer::ReadTableDefinition()
                 if (bNotNull)
                     oField.SetNullable(FALSE);
 
-                if (uniqueFieldsUC.find(CPLString(pszName).toupper()) !=
-                    uniqueFieldsUC.end())
+                if (cpl::contains(uniqueFieldsUC, CPLString(pszName).toupper()))
                 {
                     oField.SetUnique(TRUE);
                 }
@@ -2126,8 +2125,7 @@ void OGRGeoPackageTableLayer::CheckGeometryType(const OGRFeature *poFeature)
             OGRwkbGeometryType eGeomType =
                 wkbFlatten(poGeom->getGeometryType());
             if (!OGR_GT_IsSubClassOf(eGeomType, eFlattenLayerGeomType) &&
-                m_eSetBadGeomTypeWarned.find(eGeomType) ==
-                    m_eSetBadGeomTypeWarned.end())
+                !cpl::contains(m_eSetBadGeomTypeWarned, eGeomType))
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "A geometry of type %s is inserted into layer %s "
@@ -4932,8 +4930,7 @@ void OGRGeoPackageTableLayer::CheckUnknownExtensions()
 {
     const std::map<CPLString, std::vector<GPKGExtensionDesc>> &oMap =
         m_poDS->GetUnknownExtensionsTableSpecific();
-    std::map<CPLString, std::vector<GPKGExtensionDesc>>::const_iterator oIter =
-        oMap.find(CPLString(m_pszTableName).toupper());
+    const auto oIter = oMap.find(CPLString(m_pszTableName).toupper());
     if (oIter != oMap.end())
     {
         for (size_t i = 0; i < oIter->second.size(); i++)
@@ -5091,7 +5088,7 @@ bool OGRGeoPackageTableLayer::HasSpatialIndex()
         CPLString("rtree_").append(pszT).append("_").append(pszC));
     const std::map<CPLString, CPLString> &oMap =
         m_poDS->GetNameTypeMapFromSQliteMaster();
-    if (oMap.find(CPLString(osRTreeName).toupper()) != oMap.end())
+    if (cpl::contains(oMap, CPLString(osRTreeName).toupper()))
     {
         m_bHasSpatialIndex = true;
         m_osRTreeName = osRTreeName;

From ec0296152690be7e81a6afbeedb228cc316a1c5e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 17:14:21 +0200
Subject: [PATCH 38/94] [Lint] OpenFileGDB: use cpl::contains()

---
 .../openfilegdb/filegdbtable_freelist.cpp           |  8 ++++----
 .../openfilegdb/ogropenfilegdbdatasource.cpp        | 13 +++++--------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_freelist.cpp b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_freelist.cpp
index 56768752d458..fc845c98383c 100644
--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable_freelist.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable_freelist.cpp
@@ -372,7 +372,7 @@ uint64_t FileGDBTable::GetOffsetOfFreeAreaFromFreeList(uint32_t nSize)
                 break;
             }
 
-            if (aSetReadPages.find(nPrevPage) != aSetReadPages.end())
+            if (cpl::contains(aSetReadPages, nPrevPage))
             {
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "Cyclic page refererencing in %s", osFilename.c_str());
@@ -585,7 +585,7 @@ bool FileGDBTable::CheckFreeListConsistency()
     uint32_t nFreePage = GetUInt32(abyTrailer.data() + sizeof(uint32_t), 0);
     while (nFreePage != MINUS_ONE)
     {
-        if (setVisitedPages.find(nFreePage) != setVisitedPages.end())
+        if (cpl::contains(setVisitedPages, nFreePage))
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Cyclic page refererencing in free pages");
@@ -629,7 +629,7 @@ bool FileGDBTable::CheckFreeListConsistency()
         uint32_t nActualCount = 0;
         while (nPageIdx != MINUS_ONE)
         {
-            if (setVisitedPages.find(nPageIdx) != setVisitedPages.end())
+            if (cpl::contains(setVisitedPages, nPageIdx))
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "Cyclic page refererencing or page referenced more "
@@ -706,7 +706,7 @@ bool FileGDBTable::CheckFreeListConsistency()
                     return false;
                 }
 
-                if (aSetOffsets.find(nOffset) != aSetOffsets.end())
+                if (cpl::contains(aSetOffsets, nOffset))
                 {
                     CPLError(CE_Failure, CPLE_AppDefined,
                              "Page %u contains free area that points to "
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
index 76202a3492a5..9b30d45eb46a 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdatasource.cpp
@@ -462,8 +462,7 @@ bool OGROpenFileGDBDataSource::Open(const GDALOpenInfo *poOpenInfo,
                 const int idx = oIter.second;
                 CPLString osFilename(CPLFormFilename(
                     m_osDirName, CPLSPrintf("a%08x", idx), "gdbtable"));
-                if (oSetIgnoredRasterLayerTableNum.find(idx) ==
-                        oSetIgnoredRasterLayerTableNum.end() &&
+                if (!cpl::contains(oSetIgnoredRasterLayerTableNum, idx) &&
                     FileExists(osFilename))
                 {
                     m_apoLayers.emplace_back(
@@ -528,14 +527,13 @@ OGRLayer *OGROpenFileGDBDataSource::AddLayer(
     const CPLString &osDocumentation, OGRwkbGeometryType eGeomType,
     const std::string &osParentDefinition)
 {
-    std::map<std::string, int>::const_iterator oIter =
-        m_osMapNameToIdx.find(osName);
+    const auto oIter = m_osMapNameToIdx.find(osName);
     int idx = 0;
     if (oIter != m_osMapNameToIdx.end())
         idx = oIter->second;
     if (idx > 0 && (nInterestTable <= 0 || nInterestTable == idx))
     {
-        m_osMapNameToIdx.erase(osName);
+        m_osMapNameToIdx.erase(oIter);
 
         CPLString osFilename =
             CPLFormFilename(m_osDirName, CPLSPrintf("a%08x", idx), "gdbtable");
@@ -1226,11 +1224,10 @@ std::unique_ptr<OGROpenFileGDBLayer>
 OGROpenFileGDBDataSource::BuildLayerFromName(const char *pszName)
 {
 
-    std::map<std::string, int>::const_iterator oIter =
-        m_osMapNameToIdx.find(pszName);
+    const auto oIter = m_osMapNameToIdx.find(pszName);
     if (oIter != m_osMapNameToIdx.end())
     {
-        int idx = oIter->second;
+        const int idx = oIter->second;
         CPLString osFilename(
             CPLFormFilename(m_osDirName, CPLSPrintf("a%08x", idx), "gdbtable"));
         if (FileExists(osFilename))

From 8d1007ea27a9e54e2005edde58e1c12267baf75e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 17:14:32 +0200
Subject: [PATCH 39/94] [Lint] SQLite: use cpl::contains()

---
 .../sqlite/ogrsqlitedatasource.cpp            | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
index f936fa05ebfb..1ba671121031 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
@@ -304,9 +304,8 @@ bool OGRSQLiteDataSource::AddRelationship(
     {
         const std::set<std::string> uniqueBaseFieldsUC =
             SQLGetUniqueFieldUCConstraints(GetDB(), osLeftTableName.c_str());
-        if (uniqueBaseFieldsUC.find(
-                CPLString(aosLeftTableFields[0]).toupper()) !=
-            uniqueBaseFieldsUC.end())
+        if (cpl::contains(uniqueBaseFieldsUC,
+                          CPLString(aosLeftTableFields[0]).toupper()))
         {
             bBaseKeyIsUnique = true;
         }
@@ -470,13 +469,12 @@ bool OGRSQLiteDataSource::ValidateRelationship(
     }
 
     // ensure relationship is different from existing relationships
-    for (auto it = m_osMapRelationships.begin();
-         it != m_osMapRelationships.end(); ++it)
+    for (const auto &kv : m_osMapRelationships)
     {
-        if (osLeftTableName == it->second->GetLeftTableName() &&
-            osRightTableName == it->second->GetRightTableName() &&
-            aosLeftTableFields == it->second->GetLeftTableFields() &&
-            aosRightTableFields == it->second->GetRightTableFields())
+        if (osLeftTableName == kv.second->GetLeftTableName() &&
+            osRightTableName == kv.second->GetRightTableName() &&
+            aosLeftTableFields == kv.second->GetLeftTableFields() &&
+            aosRightTableFields == kv.second->GetRightTableFields())
         {
             failureReason =
                 "A relationship between these tables and fields already exists";
@@ -760,7 +758,7 @@ void OGRSQLiteBaseDataSource::LoadRelationshipsFromForeignKeys(
             }
             const std::string osRelationName = stream.str();
 
-            auto it = m_osMapRelationships.find(osRelationName);
+            const auto it = m_osMapRelationships.find(osRelationName);
             if (it != m_osMapRelationships.end())
             {
                 // already have a relationship with this name -- that means that
@@ -814,10 +812,9 @@ std::vector<std::string> OGRSQLiteBaseDataSource::GetRelationshipNames(
 
     std::vector<std::string> oasNames;
     oasNames.reserve(m_osMapRelationships.size());
-    for (auto it = m_osMapRelationships.begin();
-         it != m_osMapRelationships.end(); ++it)
+    for (const auto &kv : m_osMapRelationships)
     {
-        oasNames.emplace_back(it->first);
+        oasNames.emplace_back(kv.first);
     }
     return oasNames;
 }
@@ -835,7 +832,7 @@ OGRSQLiteBaseDataSource::GetRelationship(const std::string &name) const
         LoadRelationships();
     }
 
-    auto it = m_osMapRelationships.find(name);
+    const auto it = m_osMapRelationships.find(name);
     if (it == m_osMapRelationships.end())
         return nullptr;
 
@@ -2649,8 +2646,8 @@ bool OGRSQLiteDataSource::Open(GDALOpenInfo *poOpenInfo)
 
             if (pszTableName == nullptr || pszGeomCol == nullptr)
                 continue;
-            if (!bListAllTables && aoSetTablesToIgnore.find(pszTableName) !=
-                                       aoSetTablesToIgnore.end())
+            if (!bListAllTables &&
+                cpl::contains(aoSetTablesToIgnore, pszTableName))
             {
                 continue;
             }
@@ -2666,8 +2663,8 @@ bool OGRSQLiteDataSource::Open(GDALOpenInfo *poOpenInfo)
 
             if (pszTableName == nullptr)
                 continue;
-            if (!bListAllTables && aoSetTablesToIgnore.find(pszTableName) !=
-                                       aoSetTablesToIgnore.end())
+            if (!bListAllTables &&
+                cpl::contains(aoSetTablesToIgnore, pszTableName))
             {
                 continue;
             }
@@ -4648,7 +4645,7 @@ OGRSpatialReference *OGRSQLiteDataSource::FetchSRS(int nId)
     /* -------------------------------------------------------------------- */
     /*      First, we look through our SRID cache, is it there?             */
     /* -------------------------------------------------------------------- */
-    auto oIter = m_oSRSCache.find(nId);
+    const auto oIter = m_oSRSCache.find(nId);
     if (oIter != m_oSRSCache.end())
     {
         return oIter->second.get();
@@ -4813,8 +4810,7 @@ void OGRSQLiteDataSource::SetName(const char *pszNameIn)
 const OGREnvelope *
 OGRSQLiteBaseDataSource::GetEnvelopeFromSQL(const CPLString &osSQL)
 {
-    std::map<CPLString, OGREnvelope>::iterator oIter =
-        oMapSQLEnvelope.find(osSQL);
+    const auto oIter = oMapSQLEnvelope.find(osSQL);
     if (oIter != oMapSQLEnvelope.end())
         return &oIter->second;
     else

From d8f6998c25cca254bf5a40fa39485abc39b37060 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 16:46:30 +0200
Subject: [PATCH 40/94] LIBKML writing: validate longitude, latitude to be in
 range

- For longitudes, accept in range [-540,540] and normalize to [-180,180].
  Error out beyond
- For latitudes, accept in range [-90,90]. Error out beyond

Fixes #10483
---
 autotest/ogr/ogr_libkml.py                   |  69 ++++++++
 ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp  |  11 +-
 ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp | 156 +++++++++++++------
 ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp    |   2 +
 4 files changed, 191 insertions(+), 47 deletions(-)

diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index cc32eb283013..d0ec30ae15ac 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -2095,3 +2095,72 @@ def test_ogr_libkml_read_external_style():
         lyr = ds.GetLayer(0)
         feat = lyr.GetNextFeature()
         assert feat.GetStyleString() == "LABEL(c:#FFFFFFFF,w:110.000000)"
+
+
+###############################################################################
+
+
+@pytest.mark.parametrize(
+    "input_wkt,expected_wkt",
+    [
+        ("POINT (2 90)", "POINT Z (2 90 0)"),
+        ("POINT (2 90.000000001)", "POINT Z (2 90 0)"),
+        ("POINT (2 -90.000000001)", "POINT Z (2 -90 0)"),
+        ("POINT (181 -90)", "POINT Z (-179 -90 0)"),
+        ("POINT (-181 49)", "POINT Z (179 49 0)"),
+        ("POINT (540 49)", "POINT Z (180 49 0)"),
+        ("POINT (-540 49)", "POINT Z (-180 49 0)"),
+        ("POINT (541 49)", None),
+        ("POINT (-541 49)", None),
+        ("POINT (2 91)", None),
+        ("POINT (2 -91)", None),
+        ("POINT Z (2 49 10)", "POINT Z (2 49 10)"),
+        ("POINT Z (2 91 10)", None),
+        ("LINESTRING (2 -90, 3 90)", "LINESTRING Z (2 -90 0,3 90 0)"),
+        ("LINESTRING (2 -90, 3 91)", None),
+        ("LINESTRING Z (2 -90 10, 3 90 10)", "LINESTRING Z (2 -90 10,3 90 10)"),
+        ("LINESTRING Z (2 -90 10, 3 91 10)", None),
+        (
+            "POLYGON ((-180 -90,180 -90,180 90,-180 90,-180 -90),(0 0,0 1,1 1,0 0))",
+            "POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 90 0,-180 -90 0),(0 0 0,0 1 0,1 1 0,0 0 0))",
+        ),
+        ("POLYGON ((-180 -90,180 -90,180 90,-180 91,-180 -90))", None),
+        (
+            "POLYGON ((-180 -90,180 -90,180 90,-180 90,-180 -90),(0 91,1 90,0 90,0 91))",
+            None,
+        ),
+        (
+            "POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 90 0,-180 -90 0),(0 0 0,0 1 0,1 1 0,0 0 0))",
+            "POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 90 0,-180 -90 0),(0 0 0,0 1 0,1 1 0,0 0 0))",
+        ),
+        ("POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 91 0,-180 -90 0))", None),
+        (
+            "POLYGON Z ((-180 -90 0,180 -90 0,180 90 0,-180 90 0,-180 -90 0),(0 91 0,1 90 0,0 90 0,0 91 0))",
+            None,
+        ),
+        ("MULTIPOINT ((2 90))", "POINT Z (2 90 0)"),
+        ("MULTIPOINT ((2 91))", None),
+        ("MULTIPOINT ((2 90),(2 -90))", "MULTIPOINT Z ((2 90 0),(2 -90 0))"),
+        ("MULTIPOINT ((2 90),(2 91))", None),
+    ],
+)
+def test_ogr_libkml_write_geometries(input_wkt, expected_wkt, tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.kml")
+    with ogr.GetDriverByName("LIBKML").CreateDataSource(filename) as ds:
+        lyr = ds.CreateLayer("test")
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f.SetGeometry(ogr.CreateGeometryFromWkt(input_wkt))
+        if expected_wkt:
+            lyr.CreateFeature(f)
+        else:
+            with pytest.raises(Exception):
+                lyr.CreateFeature(f)
+
+    with ogr.Open(filename) as ds:
+        lyr = ds.GetLayer(0)
+        f = lyr.GetNextFeature()
+        if expected_wkt:
+            assert f.GetGeometryRef().ExportToIsoWkt() == expected_wkt
+        else:
+            assert f is None
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp
index ac0071e62ee7..17c0ff7c96e5 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlfeature.cpp
@@ -456,6 +456,8 @@ FeaturePtr feat2kml(OGRLIBKMLDataSource *poOgrDS, OGRLIBKMLLayer *poOgrLayer,
             }
 
             ElementPtr poKmlElement = geom2kml(poOgrGeom, -1, poKmlFactory);
+            if (!poKmlElement)
+                return nullptr;
 
             poKmlPhotoOverlay->set_point(AsPoint(std::move(poKmlElement)));
         }
@@ -809,9 +811,14 @@ FeaturePtr feat2kml(OGRLIBKMLDataSource *poOgrDS, OGRLIBKMLLayer *poOgrLayer,
         const PlacemarkPtr poKmlPlacemark = poKmlFactory->CreatePlacemark();
         poKmlFeature = poKmlPlacemark;
 
-        ElementPtr poKmlElement = geom2kml(poOgrGeom, -1, poKmlFactory);
+        if (poOgrGeom)
+        {
+            ElementPtr poKmlElement = geom2kml(poOgrGeom, -1, poKmlFactory);
+            if (!poKmlElement)
+                return nullptr;
 
-        poKmlPlacemark->set_geometry(AsGeometry(std::move(poKmlElement)));
+            poKmlPlacemark->set_geometry(AsGeometry(std::move(poKmlElement)));
+        }
     }
 
     if (!camera)
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp
index 3c8c94b9e640..7e083ea0dadc 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp
@@ -50,6 +50,51 @@ using kmldom::OuterBoundaryIsPtr;
 using kmldom::PointPtr;
 using kmldom::PolygonPtr;
 
+static bool NormalizeLongLat(double &x, double &y)
+{
+    if (x >= -180 && x <= 180)
+    {
+        // nominal
+    }
+    else if (x > 180 && x <= 180 + 360)
+        x -= 360;
+    else if (x < -180 && x >= -180 - 360)
+        x += 360;
+    else
+    {
+        const bool bStrictCompliance =
+            CPLTestBool(CPLGetConfigOption("LIBKML_STRICT_COMPLIANCE", "TRUE"));
+        CPLError(bStrictCompliance ? CE_Failure : CE_Warning, CPLE_AppDefined,
+                 "Invalid longitude %g", x);
+        if (bStrictCompliance)
+            return false;
+    }
+
+    constexpr double EPSILON = 1e-8;
+    if (y >= -90 && y <= 90)
+    {
+        // nominal
+    }
+    else if (y > 90 && y < 90 + EPSILON)
+    {
+        y = 90;
+    }
+    else if (y < -90 && y > -90 - EPSILON)
+    {
+        y = -90;
+    }
+    else
+    {
+        const bool bStrictCompliance =
+            CPLTestBool(CPLGetConfigOption("LIBKML_STRICT_COMPLIANCE", "TRUE"));
+        CPLError(bStrictCompliance ? CE_Failure : CE_Warning, CPLE_AppDefined,
+                 "Invalid latitude %g", y);
+        if (bStrictCompliance)
+            return false;
+    }
+    return true;
+}
+
 /******************************************************************************
  Function to write out a ogr geometry to kml.
 
@@ -70,10 +115,6 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         return nullptr;
     }
 
-    /***** ogr geom vars *****/
-    OGRPoint *poOgrPoint = nullptr;
-    OGRLineString *poOgrLineString = nullptr;
-
     /***** libkml geom vars *****/
     CoordinatesPtr coordinates = nullptr;
 
@@ -88,7 +129,7 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
     {
         case wkbPoint:
         {
-            poOgrPoint = (OGRPoint *)poOgrGeom;
+            const OGRPoint *poOgrPoint = poOgrGeom->toPoint();
             PointPtr poKmlPoint = nullptr;
             if (poOgrPoint->getCoordinateDimension() == 0)
             {
@@ -98,10 +139,10 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             else
             {
                 double x = poOgrPoint->getX();
-                const double y = poOgrPoint->getY();
+                double y = poOgrPoint->getY();
 
-                if (x > 180)
-                    x -= 360;
+                if (!NormalizeLongLat(x, y))
+                    return nullptr;
 
                 coordinates = poKmlFactory->CreateCoordinates();
                 coordinates->add_latlng(y, x);
@@ -114,14 +155,14 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         }
         case wkbPoint25D:
         {
-            poOgrPoint = (OGRPoint *)poOgrGeom;
+            const OGRPoint *poOgrPoint = poOgrGeom->toPoint();
 
             double x = poOgrPoint->getX();
-            const double y = poOgrPoint->getY();
+            double y = poOgrPoint->getY();
             const double z = poOgrPoint->getZ();
 
-            if (x > 180)
-                x -= 360;
+            if (!NormalizeLongLat(x, y))
+                return nullptr;
 
             coordinates = poKmlFactory->CreateCoordinates();
             coordinates->add_latlngalt(y, x, z);
@@ -132,11 +173,12 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             break;
         }
         case wkbLineString:
-            poOgrLineString = (OGRLineString *)poOgrGeom;
+        {
+            OGRLineString *poOgrLineString = poOgrGeom->toLineString();
 
             if (extra >= 0)
             {
-                ((OGRLinearRing *)poOgrGeom)->closeRings();
+                poOgrGeom->toLinearRing()->closeRings();
             }
 
             numpoints = poOgrLineString->getNumPoints();
@@ -163,21 +205,20 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
 
             coordinates = poKmlFactory->CreateCoordinates();
 
-            poOgrPoint = new OGRPoint();
+            OGRPoint point;
 
             for (int i = 0; i < numpoints; i++)
             {
-                poOgrLineString->getPoint(i, poOgrPoint);
+                poOgrLineString->getPoint(i, &point);
 
-                double x = poOgrPoint->getX();
-                const double y = poOgrPoint->getY();
+                double x = point.getX();
+                double y = point.getY();
 
-                if (x > 180)
-                    x -= 360;
+                if (!NormalizeLongLat(x, y))
+                    return nullptr;
 
                 coordinates->add_latlng(y, x);
             }
-            delete poOgrPoint;
 
             /***** Check if its a wkbLinearRing *****/
             if (extra < 0)
@@ -190,7 +231,7 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
                 break;
             }
             [[fallthrough]];
-
+        }
             /***** fallthrough *****/
 
         case wkbLinearRing:  // This case is for readability only.
@@ -217,11 +258,11 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         }
         case wkbLineString25D:
         {
-            poOgrLineString = (OGRLineString *)poOgrGeom;
+            const OGRLineString *poOgrLineString = poOgrGeom->toLineString();
 
             if (extra >= 0)
             {
-                ((OGRLinearRing *)poOgrGeom)->closeRings();
+                poOgrGeom->toLinearRing()->closeRings();
             }
 
             numpoints = poOgrLineString->getNumPoints();
@@ -247,22 +288,21 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             }
 
             coordinates = poKmlFactory->CreateCoordinates();
-            poOgrPoint = new OGRPoint();
+            OGRPoint point;
 
             for (int i = 0; i < numpoints; i++)
             {
-                poOgrLineString->getPoint(i, poOgrPoint);
+                poOgrLineString->getPoint(i, &point);
 
-                double x = poOgrPoint->getX();
-                const double y = poOgrPoint->getY();
-                const double z = poOgrPoint->getZ();
+                double x = point.getX();
+                double y = point.getY();
+                const double z = point.getZ();
 
-                if (x > 180)
-                    x -= 360;
+                if (!NormalizeLongLat(x, y))
+                    return nullptr;
 
                 coordinates->add_latlngalt(y, x, z);
             }
-            delete poOgrPoint;
 
             /***** Check if its a wkbLinearRing *****/
             if (extra < 0)
@@ -300,22 +340,31 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         }
         case wkbPolygon:
         {
-            CPLErrorReset();
             if (CPLTestBool(
                     CPLGetConfigOption("LIBKML_STRICT_COMPLIANCE", "TRUE")) &&
-                OGRGeometryFactory::haveGEOS() &&
-                (!poOgrGeom->IsValid() || CPLGetLastErrorType() != CE_None))
+                OGRGeometryFactory::haveGEOS())
             {
-                CPLError(CE_Failure, CPLE_NotSupported, "Invalid polygon");
-                return nullptr;
+                bool bError;
+                {
+                    CPLErrorStateBackuper oErrorStateBackuper;
+                    bError = !poOgrGeom->IsValid() ||
+                             CPLGetLastErrorType() != CE_None;
+                }
+                if (bError)
+                {
+                    CPLError(CE_Failure, CPLE_NotSupported, "Invalid polygon");
+                    return nullptr;
+                }
             }
 
             PolygonPtr poKmlPolygon = poKmlFactory->CreatePolygon();
             poKmlGeometry = poKmlPolygon;
 
-            OGRPolygon *poOgrPolygon = (OGRPolygon *)poOgrGeom;
+            OGRPolygon *poOgrPolygon = poOgrGeom->toPolygon();
             ElementPtr poKmlTmpGeometry =
                 geom2kml(poOgrPolygon->getExteriorRing(), 0, poKmlFactory);
+            if (!poKmlTmpGeometry)
+                return nullptr;
             poKmlPolygon->set_outerboundaryis(
                 AsOuterBoundaryIs(poKmlTmpGeometry));
 
@@ -324,6 +373,8 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             {
                 poKmlTmpGeometry = geom2kml(poOgrPolygon->getInteriorRing(i),
                                             i + 1, poKmlFactory);
+                if (!poKmlTmpGeometry)
+                    return nullptr;
                 poKmlPolygon->add_innerboundaryis(
                     AsInnerBoundaryIs(poKmlTmpGeometry));
             }
@@ -332,22 +383,31 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         }
         case wkbPolygon25D:
         {
-            CPLErrorReset();
             if (CPLTestBool(
                     CPLGetConfigOption("LIBKML_STRICT_COMPLIANCE", "TRUE")) &&
-                OGRGeometryFactory::haveGEOS() &&
-                (!poOgrGeom->IsValid() || CPLGetLastErrorType() != CE_None))
+                OGRGeometryFactory::haveGEOS())
             {
-                CPLError(CE_Failure, CPLE_NotSupported, "Invalid polygon");
-                return nullptr;
+                bool bError;
+                {
+                    CPLErrorStateBackuper oErrorStateBackuper;
+                    bError = !poOgrGeom->IsValid() ||
+                             CPLGetLastErrorType() != CE_None;
+                }
+                if (bError)
+                {
+                    CPLError(CE_Failure, CPLE_NotSupported, "Invalid polygon");
+                    return nullptr;
+                }
             }
 
             PolygonPtr poKmlPolygon = poKmlFactory->CreatePolygon();
             poKmlGeometry = poKmlPolygon;
 
-            OGRPolygon *poOgrPolygon = (OGRPolygon *)poOgrGeom;
+            OGRPolygon *poOgrPolygon = poOgrGeom->toPolygon();
             ElementPtr poKmlTmpGeometry =
                 geom2kml(poOgrPolygon->getExteriorRing(), 0, poKmlFactory);
+            if (!poKmlTmpGeometry)
+                return nullptr;
             poKmlPolygon->set_outerboundaryis(
                 AsOuterBoundaryIs(poKmlTmpGeometry));
 
@@ -356,6 +416,8 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
             {
                 poKmlTmpGeometry = geom2kml(poOgrPolygon->getInteriorRing(i),
                                             i + 1, poKmlFactory);
+                if (!poKmlTmpGeometry)
+                    return nullptr;
                 poKmlPolygon->add_innerboundaryis(
                     AsInnerBoundaryIs(poKmlTmpGeometry));
             }
@@ -372,7 +434,7 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
         case wkbGeometryCollection25D:
         {
             OGRGeometryCollection *poOgrMultiGeom =
-                (OGRGeometryCollection *)poOgrGeom;
+                poOgrGeom->toGeometryCollection();
 
             const int nGeom = poOgrMultiGeom->getNumGeometries();
 
@@ -383,6 +445,8 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
                          "Turning multiple geometry into single geometry");
                 poKmlGeometry = geom2kml(poOgrMultiGeom->getGeometryRef(0), -1,
                                          poKmlFactory);
+                if (!poKmlGeometry)
+                    return nullptr;
             }
             else
             {
@@ -401,6 +465,8 @@ ElementPtr geom2kml(OGRGeometry *poOgrGeom, int extra, KmlFactory *poKmlFactory)
                 {
                     ElementPtr poKmlTmpGeometry = geom2kml(
                         poOgrMultiGeom->getGeometryRef(i), -1, poKmlFactory);
+                    if (!poKmlTmpGeometry)
+                        return nullptr;
                     poKmlMultiGeometry->add_geometry(
                         AsGeometry(std::move(poKmlTmpGeometry)));
                 }
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
index 4084cb0f497a..0e455726e11b 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
@@ -509,6 +509,8 @@ OGRErr OGRLIBKMLLayer::ICreateFeature(OGRFeature *poOgrFeat)
     FeaturePtr poKmlFeature =
         feat2kml(m_poOgrDS, this, poOgrFeat, m_poOgrDS->GetKmlFactory(),
                  m_bUseSimpleField);
+    if (!poKmlFeature)
+        return OGRERR_FAILURE;
 
     if (poGeomBackup)
         poOgrFeat->SetGeometryDirectly(poGeomBackup);

From 9ef063c6325b3700eb4d759145a1355ac53b0495 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 20:20:37 +0200
Subject: [PATCH 41/94] Parquet: detect bbox geometry column when opening
 current Overture Maps in dataset mode

---
 autotest/ogr/ogr_parquet.py                   | 21 ++++--
 .../parquet/ogrparquetdatasetlayer.cpp        | 73 +++++++++++++++++++
 2 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/autotest/ogr/ogr_parquet.py b/autotest/ogr/ogr_parquet.py
index 0d3d268cc2a7..2f57071816e2 100755
--- a/autotest/ogr/ogr_parquet.py
+++ b/autotest/ogr/ogr_parquet.py
@@ -3317,13 +3317,22 @@ def test_ogr_parquet_bbox_double():
 
 
 @pytest.mark.require_geos
-def test_ogr_parquet_bbox_float32_but_no_covering_in_metadata():
+@pytest.mark.parametrize("use_dataset", [True, False])
+def test_ogr_parquet_bbox_float32_but_no_covering_in_metadata(use_dataset):
 
-    ds = ogr.Open("data/parquet/bbox_similar_to_overturemaps_2024-04-16-beta.0.parquet")
+    if use_dataset and not _has_arrow_dataset():
+        pytest.skip("Test requires build with ArrowDataset")
+
+    prefix = "PARQUET:" if use_dataset else ""
+
+    ds = ogr.Open(
+        prefix + "data/parquet/bbox_similar_to_overturemaps_2024-04-16-beta.0.parquet"
+    )
     lyr = ds.GetLayer(0)
     assert lyr.GetGeometryColumn() == "geometry"
     assert lyr.GetLayerDefn().GetFieldIndex("bbox.xmin") < 0
-    assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1
+    if not use_dataset:
+        assert lyr.TestCapability(ogr.OLCFastGetExtent) == 1
     minx, maxx, miny, maxy = lyr.GetExtent()
     assert (minx, miny, maxx, maxy) == pytest.approx(
         (478315.53125, 4762880.5, 481645.3125, 4765610.5)
@@ -3337,14 +3346,16 @@ def test_ogr_parquet_bbox_float32_but_no_covering_in_metadata():
         maxy - (maxy - miny) / 2,
     ):
         f = lyr.GetNextFeature()
-        assert f.GetFID() == 8
+        if not use_dataset:
+            assert f.GetFID() == 8
         assert lyr.GetNextFeature() is None
 
     ds = None
 
     with gdaltest.config_option("OGR_PARQUET_USE_BBOX", "NO"):
         ds = ogr.Open(
-            "data/parquet/bbox_similar_to_overturemaps_2024-04-16-beta.0.parquet"
+            prefix
+            + "data/parquet/bbox_similar_to_overturemaps_2024-04-16-beta.0.parquet"
         )
         lyr = ds.GetLayer(0)
         assert lyr.GetGeometryColumn() == "geometry"
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetdatasetlayer.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetdatasetlayer.cpp
index 5f6271783f80..0351be6693dd 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetdatasetlayer.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetdatasetlayer.cpp
@@ -163,6 +163,79 @@ void OGRParquetDatasetLayer::EstablishFeatureDefn()
     }
 
     const auto &fields = m_poSchema->fields();
+
+    // Overture Maps 2024-04-16-beta.0 almost follows GeoParquet 1.1, except
+    // they don't declare the "covering" element in the GeoParquet JSON metadata
+    if (m_oMapGeometryColumns.find("geometry") != m_oMapGeometryColumns.end() &&
+        bUseBBOX &&
+        !m_oMapGeometryColumns["geometry"].GetObj("covering").IsValid() &&
+        m_oMapGeometryColumns["geometry"].GetString("encoding") == "WKB")
+    {
+        for (int i = 0; i < m_poSchema->num_fields(); ++i)
+        {
+            const auto &field = fields[i];
+            if (field->name() == "bbox" &&
+                field->type()->id() == arrow::Type::STRUCT)
+            {
+                bool bXMin = false;
+                bool bXMax = false;
+                bool bYMin = false;
+                bool bYMax = false;
+                const auto subfields = field->Flatten();
+                if (subfields.size() == 4)
+                {
+                    for (int j = 0; j < static_cast<int>(subfields.size()); j++)
+                    {
+                        const auto &subfield = subfields[j];
+                        if (subfield->name() == "bbox.xmin")
+                            bXMin = true;
+                        else if (subfield->name() == "bbox.xmax")
+                            bXMax = true;
+                        else if (subfield->name() == "bbox.ymin")
+                            bYMin = true;
+                        else if (subfield->name() == "bbox.ymax")
+                            bYMax = true;
+                    }
+                }
+                if (bXMin && bXMax && bYMin && bYMax)
+                {
+                    CPLJSONObject oDef = m_oMapGeometryColumns["geometry"];
+                    CPLJSONObject oCovering;
+                    oDef.Add("covering", oCovering);
+                    CPLJSONObject oBBOX;
+                    oCovering.Add("bbox", oBBOX);
+                    {
+                        CPLJSONArray oArray;
+                        oArray.Add("bbox");
+                        oArray.Add("xmin");
+                        oBBOX.Add("xmin", oArray);
+                    }
+                    {
+                        CPLJSONArray oArray;
+                        oArray.Add("bbox");
+                        oArray.Add("ymin");
+                        oBBOX.Add("ymin", oArray);
+                    }
+                    {
+                        CPLJSONArray oArray;
+                        oArray.Add("bbox");
+                        oArray.Add("xmax");
+                        oBBOX.Add("xmax", oArray);
+                    }
+                    {
+                        CPLJSONArray oArray;
+                        oArray.Add("bbox");
+                        oArray.Add("ymax");
+                        oBBOX.Add("ymax", oArray);
+                    }
+                    oSetBBOXColumns.insert("bbox");
+                    m_oMapGeometryColumns["geometry"] = std::move(oDef);
+                }
+                break;
+            }
+        }
+    }
+
     for (int i = 0; i < m_poSchema->num_fields(); ++i)
     {
         const auto &field = fields[i];

From 83dc7fc3ebb521c2709aeebca2e8ff8393822c66 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 24 Jul 2024 22:41:16 +0200
Subject: [PATCH 42/94] CPLFormFilename()/CPLGetDirname()/CPLGetPath(): make it
 work with 'vsicurl/http://example.com?foo' type of filename, to fix Zarr
 driver

Fixes https://github.com/OSGeo/gdal/issues/9749#issuecomment-2230935288
---
 autotest/cpp/test_cpl.cpp | 19 ++++++++++
 gcore/gdalmultidim.cpp    | 11 ++++++
 port/cpl_path.cpp         | 76 +++++++++++++++++++++++++++++++++------
 3 files changed, 95 insertions(+), 11 deletions(-)

diff --git a/autotest/cpp/test_cpl.cpp b/autotest/cpp/test_cpl.cpp
index 98117591073a..d2ea0ed7da1c 100644
--- a/autotest/cpp/test_cpl.cpp
+++ b/autotest/cpp/test_cpl.cpp
@@ -1062,6 +1062,25 @@ TEST_F(test_cpl, CPLFormFilename)
     EXPECT_TRUE(
         EQUAL(CPLFormFilename("\\\\$\\c:", "..", nullptr), "\\\\$\\c:/..") ||
         EQUAL(CPLFormFilename("\\\\$\\c:", "..", nullptr), "\\\\$\\c:\\.."));
+    EXPECT_STREQ(
+        CPLFormFilename("/vsicurl/http://example.com?foo", "bar", nullptr),
+        "/vsicurl/http://example.com/bar?foo");
+}
+
+TEST_F(test_cpl, CPLGetPath)
+{
+    EXPECT_STREQ(CPLGetPath("/foo/bar/"), "/foo/bar");
+    EXPECT_STREQ(CPLGetPath("/foo/bar"), "/foo");
+    EXPECT_STREQ(CPLGetPath("/vsicurl/http://example.com/foo/bar?suffix"),
+                 "/vsicurl/http://example.com/foo?suffix");
+}
+
+TEST_F(test_cpl, CPLGetDirname)
+{
+    EXPECT_STREQ(CPLGetDirname("/foo/bar/"), "/foo/bar");
+    EXPECT_STREQ(CPLGetDirname("/foo/bar"), "/foo");
+    EXPECT_STREQ(CPLGetDirname("/vsicurl/http://example.com/foo/bar?suffix"),
+                 "/vsicurl/http://example.com/foo?suffix");
 }
 
 TEST_F(test_cpl, VSIGetDiskFreeSpace)
diff --git a/gcore/gdalmultidim.cpp b/gcore/gdalmultidim.cpp
index 641a5c3211e6..8c760b814b69 100644
--- a/gcore/gdalmultidim.cpp
+++ b/gcore/gdalmultidim.cpp
@@ -4243,6 +4243,17 @@ GDALMDArray::GetCacheRootGroup(bool bCanCreate,
     }
 
     osCacheFilenameOut = osFilename + ".gmac";
+    if (STARTS_WITH(osFilename.c_str(), "/vsicurl/http"))
+    {
+        const auto nPosQuestionMark = osFilename.find('?');
+        if (nPosQuestionMark != std::string::npos)
+        {
+            osCacheFilenameOut =
+                osFilename.substr(0, nPosQuestionMark)
+                    .append(".gmac")
+                    .append(osFilename.substr(nPosQuestionMark));
+        }
+    }
     const char *pszProxy = PamGetProxy(osCacheFilenameOut.c_str());
     if (pszProxy != nullptr)
         osCacheFilenameOut = pszProxy;
diff --git a/port/cpl_path.cpp b/port/cpl_path.cpp
index f78c77453bef..06088ea2cfb6 100644
--- a/port/cpl_path.cpp
+++ b/port/cpl_path.cpp
@@ -101,10 +101,10 @@ static char *CPLGetStaticResult()
 /*                        CPLFindFilenameStart()                        */
 /************************************************************************/
 
-static int CPLFindFilenameStart(const char *pszFilename)
+static int CPLFindFilenameStart(const char *pszFilename, size_t nStart = 0)
 
 {
-    size_t iFileStart = strlen(pszFilename);
+    size_t iFileStart = nStart ? nStart : strlen(pszFilename);
 
     for (; iFileStart > 0 && pszFilename[iFileStart - 1] != '/' &&
            pszFilename[iFileStart - 1] != '\\';
@@ -144,7 +144,15 @@ static int CPLFindFilenameStart(const char *pszFilename)
 const char *CPLGetPath(const char *pszFilename)
 
 {
-    const int iFileStart = CPLFindFilenameStart(pszFilename);
+    size_t nSuffixPos = 0;
+    if (STARTS_WITH(pszFilename, "/vsicurl/http"))
+    {
+        const char *pszQuestionMark = strchr(pszFilename, '?');
+        if (pszQuestionMark)
+            nSuffixPos = static_cast<size_t>(pszQuestionMark - pszFilename);
+    }
+
+    const int iFileStart = CPLFindFilenameStart(pszFilename, nSuffixPos);
     char *pszStaticResult = CPLGetStaticResult();
 
     if (pszStaticResult == nullptr || iFileStart >= CPL_PATH_BUF_SIZE)
@@ -166,6 +174,13 @@ const char *CPLGetPath(const char *pszFilename)
                            pszStaticResult[iFileStart - 1] == '\\'))
         pszStaticResult[iFileStart - 1] = '\0';
 
+    if (nSuffixPos)
+    {
+        if (CPLStrlcat(pszStaticResult, pszFilename + nSuffixPos,
+                       CPL_PATH_BUF_SIZE) >= CPL_PATH_BUF_SIZE)
+            return CPLStaticBufferTooSmall(pszStaticResult);
+    }
+
     return pszStaticResult;
 }
 
@@ -198,7 +213,15 @@ const char *CPLGetPath(const char *pszFilename)
 const char *CPLGetDirname(const char *pszFilename)
 
 {
-    const int iFileStart = CPLFindFilenameStart(pszFilename);
+    size_t nSuffixPos = 0;
+    if (STARTS_WITH(pszFilename, "/vsicurl/http"))
+    {
+        const char *pszQuestionMark = strchr(pszFilename, '?');
+        if (pszQuestionMark)
+            nSuffixPos = static_cast<size_t>(pszQuestionMark - pszFilename);
+    }
+
+    const int iFileStart = CPLFindFilenameStart(pszFilename, nSuffixPos);
     char *pszStaticResult = CPLGetStaticResult();
 
     if (pszStaticResult == nullptr || iFileStart >= CPL_PATH_BUF_SIZE)
@@ -220,6 +243,13 @@ const char *CPLGetDirname(const char *pszFilename)
                            pszStaticResult[iFileStart - 1] == '\\'))
         pszStaticResult[iFileStart - 1] = '\0';
 
+    if (nSuffixPos)
+    {
+        if (CPLStrlcat(pszStaticResult, pszFilename + nSuffixPos,
+                       CPL_PATH_BUF_SIZE) >= CPL_PATH_BUF_SIZE)
+            return CPLStaticBufferTooSmall(pszStaticResult);
+    }
+
     return pszStaticResult;
 }
 
@@ -535,6 +565,19 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename,
     if (pszPath == nullptr)
         pszPath = "";
     size_t nLenPath = strlen(pszPath);
+
+    size_t nSuffixPos = 0;
+    if (STARTS_WITH_CI(pszPath, "/vsicurl/http"))
+    {
+        const char *pszQuestionMark = strchr(pszPath, '?');
+        if (pszQuestionMark)
+        {
+            nSuffixPos = static_cast<size_t>(pszQuestionMark - pszPath);
+            nLenPath = nSuffixPos;
+        }
+        pszAddedPathSep = "/";
+    }
+
     if (!CPLIsFilenameRelative(pszPath) && strcmp(pszBasename, "..") == 0)
     {
         // /a/b + .. --> /a
@@ -560,13 +603,15 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename,
         else
         {
             nLenPath = nLenPathOri;
-            pszAddedPathSep = VSIGetDirectorySeparator(pszPath);
+            if (pszAddedPathSep[0] == 0)
+                pszAddedPathSep = VSIGetDirectorySeparator(pszPath);
         }
     }
     else if (nLenPath > 0 && pszPath[nLenPath - 1] != '/' &&
              pszPath[nLenPath - 1] != '\\')
     {
-        pszAddedPathSep = VSIGetDirectorySeparator(pszPath);
+        if (pszAddedPathSep[0] == 0)
+            pszAddedPathSep = VSIGetDirectorySeparator(pszPath);
     }
 
     if (pszExtension == nullptr)
@@ -574,11 +619,13 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename,
     else if (pszExtension[0] != '.' && strlen(pszExtension) > 0)
         pszAddedExtSep = ".";
 
-    if (CPLStrlcpy(
-            pszStaticResult, pszPath,
-            std::min(nLenPath + 1, static_cast<size_t>(CPL_PATH_BUF_SIZE))) >=
-            static_cast<size_t>(CPL_PATH_BUF_SIZE) ||
-        CPLStrlcat(pszStaticResult, pszAddedPathSep, CPL_PATH_BUF_SIZE) >=
+    if (nLenPath >= static_cast<size_t>(CPL_PATH_BUF_SIZE))
+        return CPLStaticBufferTooSmall(pszStaticResult);
+
+    memcpy(pszStaticResult, pszPath, nLenPath);
+    pszStaticResult[nLenPath] = 0;
+
+    if (CPLStrlcat(pszStaticResult, pszAddedPathSep, CPL_PATH_BUF_SIZE) >=
             static_cast<size_t>(CPL_PATH_BUF_SIZE) ||
         CPLStrlcat(pszStaticResult, pszBasename, CPL_PATH_BUF_SIZE) >=
             static_cast<size_t>(CPL_PATH_BUF_SIZE) ||
@@ -590,6 +637,13 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename,
         return CPLStaticBufferTooSmall(pszStaticResult);
     }
 
+    if (nSuffixPos &&
+        CPLStrlcat(pszStaticResult, pszPath + nSuffixPos, CPL_PATH_BUF_SIZE) >=
+            static_cast<size_t>(CPL_PATH_BUF_SIZE))
+    {
+        return CPLStaticBufferTooSmall(pszStaticResult);
+    }
+
     return pszStaticResult;
 }
 

From b96bdfbe3e7f6181c13fa7169261206374d995cd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 25 Jul 2024 01:15:53 +0200
Subject: [PATCH 43/94] CSV: emit warning when reading invalid WKT

Fixes #10496
---
 autotest/ogr/ogr_csv.py             | 26 +++++++++++++
 ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp | 60 ++++++++++++++++++++---------
 2 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/autotest/ogr/ogr_csv.py b/autotest/ogr/ogr_csv.py
index 2c315d484bf5..6b8924722eee 100755
--- a/autotest/ogr/ogr_csv.py
+++ b/autotest/ogr/ogr_csv.py
@@ -3154,6 +3154,32 @@ def test_ogr_csv_inf_nan():
     assert math.isnan(f["v"])
 
 
+###############################################################################
+# Test reading invalid WKT
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_csv_invalid_wkt(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.csv")
+
+    with gdaltest.vsi_open(filename, "wb") as fdest:
+        fdest.write(b"id,WKT\n")
+        fdest.write(b'1,"POINT (1"\n')
+        fdest.write(b'1,"POINT (1 2)"\n')
+
+    ds = ogr.Open(filename)
+    lyr = ds.GetLayer(0)
+    gdal.ErrorReset()
+    with gdal.quiet_errors():
+        f = lyr.GetNextFeature()
+    assert gdal.GetLastErrorMsg() == "Ignoring invalid WKT: POINT (1"
+    assert f.GetGeometryRef() is None
+    f = lyr.GetNextFeature()
+    assert gdal.GetLastErrorMsg() == ""
+    assert f.GetGeometryRef().ExportToWkt() == "POINT (1 2)"
+
+
 ###############################################################################
 
 
diff --git a/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp b/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp
index 14e76fae890a..3e979ce2cbb4 100644
--- a/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp
+++ b/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp
@@ -1393,40 +1393,62 @@ OGRFeature *OGRCSVLayer::GetNextUnfilteredFeature()
         }
         if (iGeom >= 0)
         {
+            const OGRGeomFieldDefn *poGeomFieldDefn =
+                poFeatureDefn->GetGeomFieldDefn(iGeom);
             if (papszTokens[iAttr][0] != '\0' &&
-                !(poFeatureDefn->GetGeomFieldDefn(iGeom)->IsIgnored()))
+                !(poGeomFieldDefn->IsIgnored()))
             {
                 const char *pszStr = papszTokens[iAttr];
                 while (*pszStr == ' ')
                     pszStr++;
                 OGRGeometry *poGeom = nullptr;
 
-                CPLPushErrorHandler(CPLQuietErrorHandler);
-                if (OGRGeometryFactory::createFromWkt(pszStr, nullptr,
-                                                      &poGeom) == OGRERR_NONE)
+                if (EQUAL(poGeomFieldDefn->GetNameRef(), ""))
                 {
-                    poGeom->assignSpatialReference(
-                        poFeatureDefn->GetGeomFieldDefn(iGeom)
-                            ->GetSpatialRef());
-                    poFeature->SetGeomFieldDirectly(iGeom, poGeom);
+                    if (OGRGeometryFactory::createFromWkt(
+                            pszStr, nullptr, &poGeom) != OGRERR_NONE)
+                    {
+                        CPLError(CE_Warning, CPLE_AppDefined,
+                                 "Ignoring invalid WKT: %s", pszStr);
+                        delete poGeom;
+                        poGeom = nullptr;
+                    }
                 }
-                else if (*pszStr == '{' &&
-                         (poGeom = OGRGeometry::FromHandle(
-                              OGR_G_CreateGeometryFromJson(pszStr))) != nullptr)
+                else
                 {
-                    poFeature->SetGeomFieldDirectly(iGeom, poGeom);
+                    CPLErrorHandlerPusher oErrorHandler(CPLQuietErrorHandler);
+
+                    if (OGRGeometryFactory::createFromWkt(
+                            pszStr, nullptr, &poGeom) != OGRERR_NONE)
+                    {
+                        delete poGeom;
+                        poGeom = nullptr;
+                    }
+
+                    if (!poGeom && *pszStr == '{')
+                    {
+                        poGeom = OGRGeometry::FromHandle(
+                            OGR_G_CreateGeometryFromJson(pszStr));
+                    }
+                    else if (!poGeom && ((*pszStr >= '0' && *pszStr <= '9') ||
+                                         (*pszStr >= 'a' && *pszStr <= 'z') ||
+                                         (*pszStr >= 'A' && *pszStr <= 'Z')))
+                    {
+                        poGeom = OGRGeometryFromHexEWKB(pszStr, nullptr, FALSE);
+                    }
                 }
-                else if (((*pszStr >= '0' && *pszStr <= '9') ||
-                          (*pszStr >= 'a' && *pszStr <= 'z') ||
-                          (*pszStr >= 'A' && *pszStr <= 'Z')) &&
-                         (poGeom = OGRGeometryFromHexEWKB(pszStr, nullptr,
-                                                          FALSE)) != nullptr)
+
+                if (poGeom)
                 {
+                    poGeom->assignSpatialReference(
+                        poGeomFieldDefn->GetSpatialRef());
                     poFeature->SetGeomFieldDirectly(iGeom, poGeom);
                 }
-                CPLPopErrorHandler();
             }
-            if (!bKeepGeomColumns || (iAttr == 0 && bHiddenWKTColumn))
+
+            const bool bHasAttributeField =
+                bKeepGeomColumns && !(iAttr == 0 && bHiddenWKTColumn);
+            if (!bHasAttributeField)
                 continue;
         }
 

From c3e55374f44dfa020436f03d087bd19110ab4522 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 27 Jul 2024 22:27:52 +0200
Subject: [PATCH 44/94] SQLite: run deferred table creation before
 StartTransaction

Refs https://github.com/airbusgeo/godal/pull/132#issuecomment-2250515567
---
 autotest/ogr/ogr_sqlite.py                     | 15 +++++++++++++++
 ogr/ogrsf_frmts/sqlite/ogr_sqlite.h            |  1 +
 ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp | 15 +++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/autotest/ogr/ogr_sqlite.py b/autotest/ogr/ogr_sqlite.py
index 0cd69866f057..621e5c990fe9 100755
--- a/autotest/ogr/ogr_sqlite.py
+++ b/autotest/ogr/ogr_sqlite.py
@@ -4104,3 +4104,18 @@ def test_ogr_sqlite_stddev():
         f = sql_lyr.GetNextFeature()
         assert f.GetField(0) == pytest.approx(0.5, rel=1e-15)
         assert f.GetField(1) == pytest.approx(0.5**0.5, rel=1e-15)
+
+
+def test_ogr_sqlite_run_deferred_actions_before_start_transaction():
+
+    ds = ogr.Open(":memory:", update=1)
+    lyr = ds.CreateLayer("test")
+    ds.StartTransaction()
+    ds.ExecuteSQL("INSERT INTO test VALUES (1, NULL)")
+    ds.RollbackTransaction()
+    ds.StartTransaction()
+    ds.ExecuteSQL("INSERT INTO test VALUES (1, NULL)")
+    ds.CommitTransaction()
+    lyr.ResetReading()
+    f = lyr.GetNextFeature()
+    assert f.GetFID() == 1
diff --git a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
index 3e869119a66e..63e8a3864b98 100644
--- a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
+++ b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
@@ -784,6 +784,7 @@ class OGRSQLiteDataSource final : public OGRSQLiteBaseDataSource
 
     virtual CPLErr FlushCache(bool bAtClosing) override;
 
+    virtual OGRErr StartTransaction(int bForce = FALSE) override;
     virtual OGRErr CommitTransaction() override;
     virtual OGRErr RollbackTransaction() override;
 
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
index f936fa05ebfb..bcc5e881c2f9 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
@@ -3913,6 +3913,21 @@ OGRErr OGRSQLiteBaseDataSource::StartTransaction(CPL_UNUSED int bForce)
     return OGRERR_NONE;
 }
 
+OGRErr OGRSQLiteDataSource::StartTransaction(int bForce)
+{
+    for (int iLayer = 0; iLayer < m_nLayers; iLayer++)
+    {
+        if (m_papoLayers[iLayer]->IsTableLayer())
+        {
+            OGRSQLiteTableLayer *poLayer =
+                (OGRSQLiteTableLayer *)m_papoLayers[iLayer];
+            poLayer->RunDeferredCreationIfNecessary();
+        }
+    }
+
+    return OGRSQLiteBaseDataSource::StartTransaction(bForce);
+}
+
 /************************************************************************/
 /*                         CommitTransaction()                          */
 /*                                                                      */

From f0ee82e1e1fc2916e1c7d4d257cabb094e797d66 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Jul 2024 16:26:43 +0200
Subject: [PATCH 45/94] gdallocationinfo.cpp: use GDALRasterIOGetResampleAlg()

---
 apps/gdallocationinfo.cpp | 25 +++++++------------------
 gcore/gdal_priv.h         |  3 ++-
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/apps/gdallocationinfo.cpp b/apps/gdallocationinfo.cpp
index 15a7b806b286..a6e14a75624d 100644
--- a/apps/gdallocationinfo.cpp
+++ b/apps/gdallocationinfo.cpp
@@ -31,6 +31,7 @@
 #include "cpl_minixml.h"
 #include "gdal_version.h"
 #include "gdal.h"
+#include "gdal_priv.h"
 #include "commonutils.h"
 #include "ogr_spatialref.h"
 #include "gdalargumentparser.h"
@@ -251,24 +252,12 @@ MAIN_START(argc, argv)
         exit(1);
     }
 
-    GDALRIOResampleAlg eInterpolation{GRIORA_NearestNeighbour};
-    if (osResampling.empty() || STARTS_WITH_CI(osResampling.c_str(), "NEAR"))
-    {
-        eInterpolation = GRIORA_NearestNeighbour;
-    }
-    else if (EQUAL(osResampling.c_str(), "BILINEAR"))
-    {
-        eInterpolation = GRIORA_Bilinear;
-    }
-    else if (EQUAL(osResampling.c_str(), "CUBICSPLINE"))
-    {
-        eInterpolation = GRIORA_CubicSpline;
-    }
-    else if (EQUAL(osResampling.c_str(), "CUBIC"))
-    {
-        eInterpolation = GRIORA_Cubic;
-    }
-    else
+    const GDALRIOResampleAlg eInterpolation =
+        osResampling.empty() ? GRIORA_NearestNeighbour
+                             : GDALRasterIOGetResampleAlg(osResampling.c_str());
+    if (eInterpolation != GRIORA_NearestNeighbour &&
+        eInterpolation != GRIORA_Bilinear && eInterpolation != GRIORA_Cubic &&
+        eInterpolation != GRIORA_CubicSpline)
     {
         fprintf(stderr, "-r can only be used with values nearest, bilinear, "
                         "cubic and cubicspline\n");
diff --git a/gcore/gdal_priv.h b/gcore/gdal_priv.h
index be27a8645519..d2ed50824d44 100644
--- a/gcore/gdal_priv.h
+++ b/gcore/gdal_priv.h
@@ -4382,7 +4382,8 @@ int GDALValidateOptions(const char *pszOptionList,
                         const char *pszErrorMessageOptionType,
                         const char *pszErrorMessageContainerName);
 
-GDALRIOResampleAlg GDALRasterIOGetResampleAlg(const char *pszResampling);
+GDALRIOResampleAlg CPL_DLL
+GDALRasterIOGetResampleAlg(const char *pszResampling);
 const char *GDALRasterIOGetResampleAlg(GDALRIOResampleAlg eResampleAlg);
 
 void GDALRasterIOExtraArgSetResampleAlg(GDALRasterIOExtraArg *psExtraArg,

From 6c6ce766fe1a0ad068509bc87f36866c52d4daf1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 23 Jul 2024 16:27:26 +0200
Subject: [PATCH 46/94] GPKG/SQLITE SQL: extend
 gdal_get_pixel_value()/gdal_get_layer_pixel_value() to support an
 interpolation method

---
 autotest/gdrivers/gpkg.py                     |  12 ++
 autotest/ogr/ogr_gpkg.py                      |  49 +++++++
 doc/source/drivers/raster/gpkg.rst            |   4 +-
 doc/source/user/sql_sqlite_dialect.rst        |   4 +-
 .../gpkg/ogrgeopackagedatasource.cpp          |  90 ++-----------
 .../sqlite/ogrsqlitesqlfunctionscommon.cpp    |  90 +------------
 ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp   | 125 ++++++++++++++++++
 ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h     |   7 +
 8 files changed, 215 insertions(+), 166 deletions(-)

diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index a0986fc5c85b..1b628719cbe2 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -4206,6 +4206,18 @@ def test_gpkg_sql_gdal_get_layer_pixel_value():
     ds.ReleaseResultSet(sql_lyr)
     assert f[0] == 156
 
+    with ds.ExecuteSQL(
+        "select gdal_get_layer_pixel_value('byte', 1, 'georef', 440780 + 30, 3751080 - 30)"
+    ) as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] == 156
+
+    with ds.ExecuteSQL(
+        "select gdal_get_layer_pixel_value('byte', 1, 'georef', 440780 + 30, 3751080 - 30, 'cubicspline')"
+    ) as sql_lyr:
+        f = sql_lyr.GetNextFeature()
+        assert f[0] == pytest.approx(150.1388888888889)
+
     sql_lyr = ds.ExecuteSQL(
         "select gdal_get_layer_pixel_value('float32', 1, 'pixel', 0, 1)"
     )
diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 133caca0d42f..0b80cf0772cd 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -9251,6 +9251,20 @@ def test_ogr_gpkg_sql_gdal_get_pixel_value(tmp_vsimem):
     ds.ReleaseResultSet(sql_lyr)
     assert f[0] == 156
 
+    with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
+        with ds.ExecuteSQL(
+            "select gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'georef', 440780 + 30, 3751080 - 30)"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == 156
+
+    with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
+        with ds.ExecuteSQL(
+            "select gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'georef', 440780 + 30, 3751080 - 30, 'cubicspline')"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == pytest.approx(150.1388888888889)
+
     with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
         sql_lyr = ds.ExecuteSQL(
             "select gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'pixel', 1, 4)"
@@ -9355,6 +9369,41 @@ def test_ogr_gpkg_sql_gdal_get_pixel_value(tmp_vsimem):
         ds.ReleaseResultSet(sql_lyr)
         assert f[0] is None
 
+    # Test Int64
+    tmp_filename = str(tmp_vsimem / "tmp_int64.tif")
+    tmp_ds = gdal.GetDriverByName("GTiff").Create(tmp_filename, 1, 1, 1, gdal.GDT_Int64)
+    tmp_ds.WriteRaster(0, 0, 1, 1, struct.pack("q", (1 << 63) - 1))
+    tmp_ds.Close()
+
+    with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
+        with ds.ExecuteSQL(
+            f"select gdal_get_pixel_value('{tmp_filename}', 1, 'pixel', 0, 0)"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == (1 << 63) - 1
+
+    # Test UInt64
+    tmp_filename = str(tmp_vsimem / "tmp_uint64.tif")
+    tmp_ds = gdal.GetDriverByName("GTiff").Create(
+        tmp_filename, 2, 1, 1, gdal.GDT_UInt64
+    )
+    tmp_ds.WriteRaster(0, 0, 1, 1, struct.pack("Q", (1 << 63) - 1))
+    tmp_ds.WriteRaster(1, 0, 1, 1, struct.pack("Q", (1 << 64) - 1))
+    tmp_ds.Close()
+
+    with gdaltest.config_option("OGR_SQLITE_ALLOW_EXTERNAL_ACCESS", "YES"):
+        with ds.ExecuteSQL(
+            f"select gdal_get_pixel_value('{tmp_filename}', 1, 'pixel', 0, 0)"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == (1 << 63) - 1
+
+        with ds.ExecuteSQL(
+            f"select gdal_get_pixel_value('{tmp_filename}', 1, 'pixel', 1, 0)"
+        ) as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f[0] == float((1 << 64) - 1)
+
 
 ###############################################################################
 # Test SOZip writing and reading
diff --git a/doc/source/drivers/raster/gpkg.rst b/doc/source/drivers/raster/gpkg.rst
index e380d7fca5e4..e85fd7e42b22 100644
--- a/doc/source/drivers/raster/gpkg.rst
+++ b/doc/source/drivers/raster/gpkg.rst
@@ -796,7 +796,7 @@ The ``gdal_get_layer_pixel_value()`` function (added in GDAL 3.7), variant of th
 generic ``gdal_get_pixel_value()``, can be used to extract the value of a pixel
 in a raster layer of the current dataset.
 
-It takes 5 arguments:
+It takes 5 or 6 arguments:
 
 * a string with the layer/table name
 * a band number (numbering starting at 1)
@@ -805,11 +805,13 @@ It takes 5 arguments:
   pixel space
 * georeferenced X value or column number
 * georeferenced Y value or line number
+* resampling method among ``nearest`` (default), ``bilinear``, ``cubic``, ``cubicspline``. Optional, added in GDAL 3.10
 
 .. code-block::
 
     SELECT gdal_get_layer_pixel_value('my_raster_table', 1, 'georef', 440720, 3751320)
     SELECT gdal_get_layer_pixel_value('my_raster_table', 1, 'pixel', 0, 0)
+    SELECT gdal_get_pixel_value('my_raster_table', 1, 'pixel', 0.5, 0.5, 'bilinear')  -- GDAL >= 3.10
 
 See Also
 --------
diff --git a/doc/source/user/sql_sqlite_dialect.rst b/doc/source/user/sql_sqlite_dialect.rst
index 042cc0c5425a..4ccc212b115e 100644
--- a/doc/source/user/sql_sqlite_dialect.rst
+++ b/doc/source/user/sql_sqlite_dialect.rst
@@ -315,7 +315,7 @@ The ``gdal_get_pixel_value()`` function (added in GDAL 3.7) can be used to extra
 of a pixel in a GDAL dataset. It requires the configuration option OGR_SQLITE_ALLOW_EXTERNAL_ACCESS
 to be set to YES (for security reasons).
 
-It takes 5 arguments:
+It takes 5 or 6 arguments:
 
 * a string with the dataset name
 * a band number (numbering starting at 1)
@@ -324,11 +324,13 @@ It takes 5 arguments:
   pixel space
 * georeferenced X value or column number
 * georeferenced Y value or line number
+* resampling method among ``nearest`` (default), ``bilinear``, ``cubic``, ``cubicspline``. Optional, added in GDAL 3.10
 
 .. code-block::
 
     SELECT gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'georef', 440720, 3751320)
     SELECT gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'pixel', 0, 0)
+    SELECT gdal_get_pixel_value('../gcore/data/byte.tif', 1, 'pixel', 0.5, 0.5, 'bilinear')  -- GDAL >= 3.10
 
 
 OGR geocoding functions
diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index 8f5ca7c1edc9..0abca6fa3f1c 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -9254,17 +9254,12 @@ GDALGeoPackageDataset::GetRasterLayerDataset(const char *pszLayerName)
 /*                   GPKG_gdal_get_layer_pixel_value()                  */
 /************************************************************************/
 
-static void GPKG_gdal_get_layer_pixel_value(sqlite3_context *pContext,
-                                            CPL_UNUSED int argc,
+// NOTE: keep in sync implementations in ogrsqlitesqlfunctionscommon.cpp
+// and ogrgeopackagedatasource.cpp
+static void GPKG_gdal_get_layer_pixel_value(sqlite3_context *pContext, int argc,
                                             sqlite3_value **argv)
 {
-    if (sqlite3_value_type(argv[0]) != SQLITE_TEXT ||
-        sqlite3_value_type(argv[1]) != SQLITE_INTEGER ||
-        sqlite3_value_type(argv[2]) != SQLITE_TEXT ||
-        (sqlite3_value_type(argv[3]) != SQLITE_INTEGER &&
-         sqlite3_value_type(argv[3]) != SQLITE_FLOAT) ||
-        (sqlite3_value_type(argv[4]) != SQLITE_INTEGER &&
-         sqlite3_value_type(argv[4]) != SQLITE_FLOAT))
+    if (sqlite3_value_type(argv[0]) != SQLITE_TEXT)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Invalid arguments to gdal_get_layer_pixel_value()");
@@ -9284,78 +9279,8 @@ static void GPKG_gdal_get_layer_pixel_value(sqlite3_context *pContext,
         return;
     }
 
-    const int nBand = sqlite3_value_int(argv[1]);
-    auto poBand = poDS->GetRasterBand(nBand);
-    if (!poBand)
-    {
-        sqlite3_result_null(pContext);
-        return;
-    }
-
-    const char *pszCoordType =
-        reinterpret_cast<const char *>(sqlite3_value_text(argv[2]));
-    int x, y;
-    if (EQUAL(pszCoordType, "georef"))
-    {
-        const double X = sqlite3_value_double(argv[3]);
-        const double Y = sqlite3_value_double(argv[4]);
-        double adfGeoTransform[6];
-        if (poDS->GetGeoTransform(adfGeoTransform) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        double adfInvGT[6];
-        if (!GDALInvGeoTransform(adfGeoTransform, adfInvGT))
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        x = static_cast<int>(adfInvGT[0] + X * adfInvGT[1] + Y * adfInvGT[2]);
-        y = static_cast<int>(adfInvGT[3] + X * adfInvGT[4] + Y * adfInvGT[5]);
-    }
-    else if (EQUAL(pszCoordType, "pixel"))
-    {
-        x = sqlite3_value_int(argv[3]);
-        y = sqlite3_value_int(argv[4]);
-    }
-    else
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid value for 3rd argument of gdal_get_pixel_value(): "
-                 "only 'georef' or 'pixel' are supported");
-        sqlite3_result_null(pContext);
-        return;
-    }
-    if (x < 0 || x >= poDS->GetRasterXSize() || y < 0 ||
-        y >= poDS->GetRasterYSize())
-    {
-        sqlite3_result_null(pContext);
-        return;
-    }
-    const auto eDT = poBand->GetRasterDataType();
-    if (eDT != GDT_UInt64 && GDALDataTypeIsInteger(eDT))
-    {
-        int64_t nValue = 0;
-        if (poBand->RasterIO(GF_Read, x, y, 1, 1, &nValue, 1, 1, GDT_Int64, 0,
-                             0, nullptr) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        return sqlite3_result_int64(pContext, nValue);
-    }
-    else
-    {
-        double dfValue = 0;
-        if (poBand->RasterIO(GF_Read, x, y, 1, 1, &dfValue, 1, 1, GDT_Float64,
-                             0, 0, nullptr) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        return sqlite3_result_double(pContext, dfValue);
-    }
+    OGRSQLite_gdal_get_pixel_value_common("gdal_get_layer_pixel_value",
+                                          pContext, argc, argv, poDS);
 }
 
 /************************************************************************/
@@ -9550,6 +9475,9 @@ void GDALGeoPackageDataset::InstallSQLFunctions()
     sqlite3_create_function(hDB, "gdal_get_layer_pixel_value", 5, SQLITE_UTF8,
                             this, GPKG_gdal_get_layer_pixel_value, nullptr,
                             nullptr);
+    sqlite3_create_function(hDB, "gdal_get_layer_pixel_value", 6, SQLITE_UTF8,
+                            this, GPKG_gdal_get_layer_pixel_value, nullptr,
+                            nullptr);
 
     // Function from VirtualOGR
     sqlite3_create_function(hDB, "ogr_layer_Extent", 1, SQLITE_UTF8, this,
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctionscommon.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctionscommon.cpp
index fd886800542c..da3f35fd4b51 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctionscommon.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctionscommon.cpp
@@ -181,8 +181,7 @@ GDALDataset *OGRSQLiteExtensionData::GetDataset(const char *pszDSName)
 /*                    OGRSQLITE_gdal_get_pixel_value()                  */
 /************************************************************************/
 
-static void OGRSQLITE_gdal_get_pixel_value(sqlite3_context *pContext,
-                                           CPL_UNUSED int argc,
+static void OGRSQLITE_gdal_get_pixel_value(sqlite3_context *pContext, int argc,
                                            sqlite3_value **argv)
 {
     if (!CPLTestBool(
@@ -196,20 +195,13 @@ static void OGRSQLITE_gdal_get_pixel_value(sqlite3_context *pContext,
         return;
     }
 
-    if (sqlite3_value_type(argv[0]) != SQLITE_TEXT ||
-        sqlite3_value_type(argv[1]) != SQLITE_INTEGER ||
-        sqlite3_value_type(argv[2]) != SQLITE_TEXT ||
-        (sqlite3_value_type(argv[3]) != SQLITE_INTEGER &&
-         sqlite3_value_type(argv[3]) != SQLITE_FLOAT) ||
-        (sqlite3_value_type(argv[4]) != SQLITE_INTEGER &&
-         sqlite3_value_type(argv[4]) != SQLITE_FLOAT))
+    if (sqlite3_value_type(argv[0]) != SQLITE_TEXT)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid arguments to gdal_get_pixel_value()");
+                 "Invalid arguments to gdal_get_layer_pixel_value()");
         sqlite3_result_null(pContext);
         return;
     }
-
     const char *pszDSName =
         reinterpret_cast<const char *>(sqlite3_value_text(argv[0]));
 
@@ -222,78 +214,8 @@ static void OGRSQLITE_gdal_get_pixel_value(sqlite3_context *pContext,
         return;
     }
 
-    const int nBand = sqlite3_value_int(argv[1]);
-    auto poBand = poDS->GetRasterBand(nBand);
-    if (!poBand)
-    {
-        sqlite3_result_null(pContext);
-        return;
-    }
-
-    const char *pszCoordType =
-        reinterpret_cast<const char *>(sqlite3_value_text(argv[2]));
-    int x, y;
-    if (EQUAL(pszCoordType, "georef"))
-    {
-        const double X = sqlite3_value_double(argv[3]);
-        const double Y = sqlite3_value_double(argv[4]);
-        double adfGeoTransform[6];
-        if (poDS->GetGeoTransform(adfGeoTransform) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        double adfInvGT[6];
-        if (!GDALInvGeoTransform(adfGeoTransform, adfInvGT))
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        x = static_cast<int>(adfInvGT[0] + X * adfInvGT[1] + Y * adfInvGT[2]);
-        y = static_cast<int>(adfInvGT[3] + X * adfInvGT[4] + Y * adfInvGT[5]);
-    }
-    else if (EQUAL(pszCoordType, "pixel"))
-    {
-        x = sqlite3_value_int(argv[3]);
-        y = sqlite3_value_int(argv[4]);
-    }
-    else
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Invalid value for 3rd argument of gdal_get_pixel_value(): "
-                 "only 'georef' or 'pixel' are supported");
-        sqlite3_result_null(pContext);
-        return;
-    }
-    if (x < 0 || x >= poDS->GetRasterXSize() || y < 0 ||
-        y >= poDS->GetRasterYSize())
-    {
-        sqlite3_result_null(pContext);
-        return;
-    }
-    const auto eDT = poBand->GetRasterDataType();
-    if (eDT != GDT_UInt64 && GDALDataTypeIsInteger(eDT))
-    {
-        int64_t nValue = 0;
-        if (poBand->RasterIO(GF_Read, x, y, 1, 1, &nValue, 1, 1, GDT_Int64, 0,
-                             0, nullptr) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        return sqlite3_result_int64(pContext, nValue);
-    }
-    else
-    {
-        double dfValue = 0;
-        if (poBand->RasterIO(GF_Read, x, y, 1, 1, &dfValue, 1, 1, GDT_Float64,
-                             0, 0, nullptr) != CE_None)
-        {
-            sqlite3_result_null(pContext);
-            return;
-        }
-        return sqlite3_result_double(pContext, dfValue);
-    }
+    OGRSQLite_gdal_get_pixel_value_common("gdal_get_layer_pixel_value",
+                                          pContext, argc, argv, poDS);
 }
 
 /************************************************************************/
@@ -419,6 +341,8 @@ static OGRSQLiteExtensionData *OGRSQLiteRegisterSQLFunctionsCommon(sqlite3 *hDB)
 
     sqlite3_create_function(hDB, "gdal_get_pixel_value", 5, SQLITE_UTF8, pData,
                             OGRSQLITE_gdal_get_pixel_value, nullptr, nullptr);
+    sqlite3_create_function(hDB, "gdal_get_pixel_value", 6, SQLITE_UTF8, pData,
+                            OGRSQLITE_gdal_get_pixel_value, nullptr, nullptr);
 
     if (CPLTestBool(CPLGetConfigOption("OGR_SQLITE_USE_CUSTOM_LIKE", "YES")))
     {
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp
index 7e3466e56ad1..34213ed30732 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp
@@ -37,6 +37,7 @@
 
 #include "cpl_error.h"
 #include "ogr_p.h"
+#include "gdal_priv.h"
 
 SQLResult::SQLResult(char **result, int nRow, int nCol)
     : papszResult(result), nRowCount(nRow), nColCount(nCol)
@@ -848,3 +849,127 @@ double SQLResult::GetValueAsDouble(int iColNum, int iRowNum) const
 
     return CPLStrtod(pszValue, nullptr);
 }
+
+/************************************************************************/
+/*                  OGRSQLite_gdal_get_pixel_value_common()             */
+/************************************************************************/
+
+void OGRSQLite_gdal_get_pixel_value_common(const char *pszFunctionName,
+                                           sqlite3_context *pContext, int argc,
+                                           sqlite3_value **argv,
+                                           GDALDataset *poDS)
+{
+    if (sqlite3_value_type(argv[1]) != SQLITE_INTEGER ||
+        sqlite3_value_type(argv[2]) != SQLITE_TEXT ||
+        (sqlite3_value_type(argv[3]) != SQLITE_INTEGER &&
+         sqlite3_value_type(argv[3]) != SQLITE_FLOAT) ||
+        (sqlite3_value_type(argv[4]) != SQLITE_INTEGER &&
+         sqlite3_value_type(argv[4]) != SQLITE_FLOAT) ||
+        (argc == 6 && sqlite3_value_type(argv[5]) != SQLITE_TEXT))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid arguments to %s()",
+                 pszFunctionName);
+        sqlite3_result_null(pContext);
+        return;
+    }
+
+    const int nBand = sqlite3_value_int(argv[1]);
+    auto poBand = poDS->GetRasterBand(nBand);
+    if (!poBand)
+    {
+        sqlite3_result_null(pContext);
+        return;
+    }
+
+    const char *pszCoordType =
+        reinterpret_cast<const char *>(sqlite3_value_text(argv[2]));
+    double x, y;
+    if (EQUAL(pszCoordType, "georef"))
+    {
+        const double X = sqlite3_value_double(argv[3]);
+        const double Y = sqlite3_value_double(argv[4]);
+        double adfGeoTransform[6];
+        if (poDS->GetGeoTransform(adfGeoTransform) != CE_None)
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        double adfInvGT[6];
+        if (!GDALInvGeoTransform(adfGeoTransform, adfInvGT))
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        x = adfInvGT[0] + X * adfInvGT[1] + Y * adfInvGT[2];
+        y = adfInvGT[3] + X * adfInvGT[4] + Y * adfInvGT[5];
+    }
+    else if (EQUAL(pszCoordType, "pixel"))
+    {
+        x = sqlite3_value_int(argv[3]);
+        y = sqlite3_value_int(argv[4]);
+    }
+    else
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "Invalid value for 3rd argument of gdal_get_pixel_value(): "
+                 "only 'georef' or 'pixel' are supported");
+        sqlite3_result_null(pContext);
+        return;
+    }
+    if (x < 0 || x >= poDS->GetRasterXSize() || y < 0 ||
+        y >= poDS->GetRasterYSize())
+    {
+        sqlite3_result_null(pContext);
+        return;
+    }
+
+    const auto eInterpolation =
+        argc == 6 ? GDALRasterIOGetResampleAlg(reinterpret_cast<const char *>(
+                        sqlite3_value_text(argv[5])))
+                  : GRIORA_NearestNeighbour;
+
+    const auto eDT = poBand->GetRasterDataType();
+    if (eDT == GDT_Int64 && eInterpolation == GRIORA_NearestNeighbour)
+    {
+        int64_t nValue = 0;
+        if (poBand->RasterIO(GF_Read, static_cast<int>(x), static_cast<int>(y),
+                             1, 1, &nValue, 1, 1, GDT_Int64, 0, 0,
+                             nullptr) != CE_None)
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        return sqlite3_result_int64(pContext, nValue);
+    }
+    else if (eDT == GDT_UInt64 && eInterpolation == GRIORA_NearestNeighbour)
+    {
+        uint64_t nValue = 0;
+        if (poBand->RasterIO(GF_Read, static_cast<int>(x), static_cast<int>(y),
+                             1, 1, &nValue, 1, 1, GDT_UInt64, 0, 0,
+                             nullptr) != CE_None)
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        if (nValue > static_cast<uint64_t>(INT64_MAX))
+        {
+            // Not ideal
+            return sqlite3_result_double(pContext, static_cast<double>(nValue));
+        }
+        else
+        {
+            return sqlite3_result_int64(pContext, static_cast<int64_t>(nValue));
+        }
+    }
+    else
+    {
+        double dfValue = 0;
+        if (poBand->InterpolateAtPoint(x, y, eInterpolation, &dfValue,
+                                       nullptr) != CE_None)
+        {
+            sqlite3_result_null(pContext);
+            return;
+        }
+        return sqlite3_result_double(pContext, dfValue);
+    }
+}
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h
index bf753bf22a27..a2c58c815c4e 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h
@@ -105,4 +105,11 @@ bool OGRSQLiteRTreeRequiresTrustedSchemaOn();
 
 bool OGRSQLiteIsSpatialFunctionReturningGeometry(const char *pszName);
 
+class GDALDataset;
+
+void OGRSQLite_gdal_get_pixel_value_common(const char *pszFunctionName,
+                                           sqlite3_context *pContext, int argc,
+                                           sqlite3_value **argv,
+                                           GDALDataset *poDS);
+
 #endif  // OGR_SQLITEUTILITY_H_INCLUDED

From 5ae94495773ca706c241d004afea7fea7e75d342 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 29 Jul 2024 19:36:09 +0200
Subject: [PATCH 47/94] EPSGTreatsAsNorthingEasting(): make it work correctly
 with compound CRS

---
 autotest/osr/osr_epsg.py    | 2 ++
 ogr/ogrspatialreference.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/autotest/osr/osr_epsg.py b/autotest/osr/osr_epsg.py
index 7356a19fd995..e88e3ebb7e5a 100755
--- a/autotest/osr/osr_epsg.py
+++ b/autotest/osr/osr_epsg.py
@@ -124,6 +124,8 @@ def test_osr_epsg_6():
         (5042, False),  # WGS 84 / UPS South (E,N)
         (3031, False),  # WGS 84 / Antarctic Polar Stereographic
         (5482, True),  # RSRGD2000 / RSPS2000
+        (3903, True),  # ETRS89 / TM35FIN(N,E) + N2000 height
+        (5698, False),  # RGF93 v1 / Lambert-93 + NGF-IGN69 height
     ],
 )
 def test_osr_epsg_treats_as_northing_easting(epsg_code, is_northing_easting):
diff --git a/ogr/ogrspatialreference.cpp b/ogr/ogrspatialreference.cpp
index 2f8d04cbf1f5..ef664419206e 100644
--- a/ogr/ogrspatialreference.cpp
+++ b/ogr/ogrspatialreference.cpp
@@ -11986,7 +11986,7 @@ int OGRSpatialReference::EPSGTreatsAsNorthingEasting() const
     const auto ctxt = d->getPROJContext();
     if (d->m_pjType == PJ_TYPE_COMPOUND_CRS)
     {
-        projCRS = proj_crs_get_sub_crs(ctxt, d->m_pj_crs, 1);
+        projCRS = proj_crs_get_sub_crs(ctxt, d->m_pj_crs, 0);
         if (!projCRS || proj_get_type(projCRS) != PJ_TYPE_PROJECTED_CRS)
         {
             d->undoDemoteFromBoundCRS();

From e94513f24fbef050df30f7dfa66f9a1b69af3777 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 31 Jul 2024 17:14:18 +0200
Subject: [PATCH 48/94] CI: explicitly install setuptools for Conda based
 builds

---
 .github/workflows/cmake_builds.yml |  4 ++--
 ci/travis/conda/meta.yaml.patch    | 28 ++++++++++++++++++++++++++++
 ci/travis/conda/setup.sh           |  2 ++
 ci/travis/osx/before_install.sh    |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 ci/travis/conda/meta.yaml.patch

diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
index 7dd430062a70..abe744ca77c9 100644
--- a/.github/workflows/cmake_builds.yml
+++ b/.github/workflows/cmake_builds.yml
@@ -422,7 +422,7 @@ jobs:
     - name: Install dependency
       shell: bash -l {0}
       run: |
-        conda install --yes --quiet curl libiconv icu python=3.10 swig numpy pytest pytest-env pytest-benchmark filelock zlib lxml jsonschema
+        conda install --yes --quiet curl libiconv icu python=3.10 swig numpy pytest pytest-env pytest-benchmark filelock zlib lxml jsonschema setuptools
         # FIXME: remove libnetcdf=4.9.2=nompi_h5902ca5_107 pinning as soon as https://github.com/conda-forge/libnetcdf-feedstock/issues/182 is resolved
         conda install --yes --quiet proj geos hdf4 hdf5 kealib \
             libnetcdf=4.9.2=nompi_h5902ca5_107 openjpeg poppler libtiff libpng xerces-c expat libxml2 kealib json-c \
@@ -519,7 +519,7 @@ jobs:
     - name: Install dependency
       shell: bash -l {0}
       run: |
-        conda install --yes --quiet proj pytest pytest-env pytest-benchmark filelock lxml cmake
+        conda install --yes --quiet proj pytest pytest-env pytest-benchmark filelock lxml cmake setuptools
     - name: Check CMake version
       shell: bash -l {0}
       run: |
diff --git a/ci/travis/conda/meta.yaml.patch b/ci/travis/conda/meta.yaml.patch
new file mode 100644
index 000000000000..96047817d95b
--- /dev/null
+++ b/ci/travis/conda/meta.yaml.patch
@@ -0,0 +1,28 @@
+diff --git a/recipe/meta.yaml b/recipe/meta.yaml
+index f3afcef..eb825ae 100644
+--- a/recipe/meta.yaml
++++ b/recipe/meta.yaml
+@@ -31,6 +31,7 @@ requirements:
+     - {{ stdlib("c") }}
+     - {{ compiler('cxx') }}
+     - swig
++    - setuptools
+   host:
+     - blosc
+     - expat
+@@ -614,6 +615,7 @@ outputs:
+         - python                                 # [build_platform != target_platform]
+         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
+         - numpy                                  # [build_platform != target_platform]
++        - setuptools
+         - swig
+       host:
+         - python
+@@ -623,6 +625,7 @@ outputs:
+         - libkml-devel
+         - libxml2
+         - expat
++        - setuptools
+       run:
+         - python
+         - libgdal-core {{ version }}.*
diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh
index b4cd637babee..44da66498178 100755
--- a/ci/travis/conda/setup.sh
+++ b/ci/travis/conda/setup.sh
@@ -19,6 +19,8 @@ git clone  https://github.com/conda-forge/gdal-feedstock.git
 
 cd gdal-feedstock
 
+patch -p1 < ../ci/travis/conda/meta.yaml.patch
+
 cat > recipe/recipe_clobber.yaml <<EOL
 source:
   path: ../../../gdal
diff --git a/ci/travis/osx/before_install.sh b/ci/travis/osx/before_install.sh
index 9669860d9305..0dbb594ab30b 100755
--- a/ci/travis/osx/before_install.sh
+++ b/ci/travis/osx/before_install.sh
@@ -6,7 +6,7 @@ conda update -n base -c defaults conda
 conda install -y compilers automake pkgconfig cmake
 
 conda config --set channel_priority strict
-conda install --yes --quiet proj python=3.12 swig lxml jsonschema numpy
+conda install --yes --quiet proj python=3.12 swig lxml jsonschema numpy setuptools
 conda install --yes --quiet libgdal libgdal-arrow-parquet
 # Now remove all libgdal* packages, but not their dependencies
 conda remove --yes --force $(conda list libgdal | grep libgdal | awk '{print $1}')

From 5e944e2a067c330655a9b3427983cf6460db514d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Aug 2024 00:00:29 +0200
Subject: [PATCH 49/94] vsicurl.py: skip on osx

---
 autotest/gcore/vsicurl.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 2480571cede6..8def0357724a 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -28,6 +28,7 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
+import os
 import sys
 import time
 
@@ -37,7 +38,13 @@
 
 from osgeo import gdal, ogr
 
-pytestmark = pytest.mark.require_curl()
+pytestmark = [
+    pytest.mark.require_curl(),
+    pytest.mark.skipif(
+        os.environ.get("BUILD_NAME", "") == "macos_build_conda",
+        reason="fail with SIGPIPE",
+    ),
+]
 
 ###############################################################################
 #

From de84911a55f15509b3381ebac17c9962dd109fe9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 02:20:46 +0000
Subject: [PATCH 50/94] Bump msys2/setup-msys2 from 2.23.0 to 2.24.0

Bumps [msys2/setup-msys2](https://github.com/msys2/setup-msys2) from 2.23.0 to 2.24.0.
- [Release notes](https://github.com/msys2/setup-msys2/releases)
- [Changelog](https://github.com/msys2/setup-msys2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/msys2/setup-msys2/compare/d0e80f58dffbc64f6a3a1f43527d469b4fc7b6c8...5df0ca6cbf14efcd08f8d5bd5e049a3cc8e07fd2)

---
updated-dependencies:
- dependency-name: msys2/setup-msys2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/cmake_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
index 7dd430062a70..9ad0016d16a5 100644
--- a/.github/workflows/cmake_builds.yml
+++ b/.github/workflows/cmake_builds.yml
@@ -314,7 +314,7 @@ jobs:
       - name: Checkout GDAL
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Install development packages
-        uses: msys2/setup-msys2@d0e80f58dffbc64f6a3a1f43527d469b4fc7b6c8 # v2.23.0
+        uses: msys2/setup-msys2@5df0ca6cbf14efcd08f8d5bd5e049a3cc8e07fd2 # v2.24.0
         with:
           msystem: MINGW64
           update: true

From 8e4c596c79a49e53884edc02127cb2ce8cbc2cf3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 02:20:50 +0000
Subject: [PATCH 51/94] Bump actions/setup-python from 5.1.0 to 5.1.1

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/82c7e631bb3cdc910f68e0081d67478d79c6982d...39cd14951b08e74b54015e9e001cdefcf80e669f)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/code_checks.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/code_checks.yml b/.github/workflows/code_checks.yml
index 18a29bdba220..44d8e1e841d9 100644
--- a/.github/workflows/code_checks.yml
+++ b/.github/workflows/code_checks.yml
@@ -105,7 +105,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+      - uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
 
   doxygen:
@@ -145,7 +145,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up Python
-      uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+      uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
       with:
         python-version: 3.8
     - name: Install lint tool

From 940e5455d60fbf98288cc03e12e218d0ab7a3fe8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 02:20:53 +0000
Subject: [PATCH 52/94] Bump ossf/scorecard-action from 2.3.3 to 2.4.0

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.3 to 2.4.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/dc50aa9510b46c811795eb24b2f1ba02a914e534...62b2cac7ed8198b15735ed49ab1e5cf35480ba46)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 425bc372a745..bd471f2a8487 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -41,7 +41,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif

From 76bf4c1ef214bd075573d26c87db4ec425e61002 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 02:20:57 +0000
Subject: [PATCH 53/94] Bump docker/login-action from 3.2.0 to 3.3.0

Bumps [docker/login-action](https://github.com/docker/login-action) from 3.2.0 to 3.3.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/0d4c9c5ea7693da7b068278f7b52bda2a190a446...9780b0c442fbb1117ed29e0efdff1e18412f7567)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/linux_build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
index ef1eb6501999..d6476ad23629 100644
--- a/.github/workflows/linux_build.yml
+++ b/.github/workflows/linux_build.yml
@@ -178,7 +178,7 @@ jobs:
 
       - name: Login to Docker Hub
         if: env.CONTAINER_REGISTRY == 'docker.io'
-        uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

From f1727ccaac76e9bacaeea1575bbf7c1edd9e8994 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 02:21:06 +0000
Subject: [PATCH 54/94] Bump github/codeql-action from 3.25.11 to 3.25.15

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.11 to 3.25.15.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...afb54ba388a7dca6ecae48f608c4ff05ff4cc77a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql.yml    | 4 ++--
 .github/workflows/scorecard.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f492c7c9cb0c..c7cec407a7e6 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -107,7 +107,7 @@ jobs:
     # We do that after running CMake to avoid CodeQL to trigger during CMake time,
     # in particular during HDF5 detection which is terribly slow (https://github.com/OSGeo/gdal/issues/9549)
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+      uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -127,6 +127,6 @@ jobs:
         cmake --build build -j$(nproc)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+      uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 425bc372a745..c2b5865e3229 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           sarif_file: results.sarif

From aac73e13e22e01debc4d4d2b919606df8c4049ee Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Aug 2024 20:44:05 +0200
Subject: [PATCH 55/94] Skip vsicurl.py on fedora:rawhide

---
 .github/workflows/linux_build.yml | 4 +++-
 autotest/gcore/vsicurl.py         | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
index d6476ad23629..61018055f11d 100644
--- a/.github/workflows/linux_build.yml
+++ b/.github/workflows/linux_build.yml
@@ -81,7 +81,7 @@ jobs:
 
           - name: Fedora Rawhide, clang++
             id: fedora_rawhide
-            travis_branch: sanitize
+            travis_branch: fedora_rawhide
             container: fedora_rawhide
             build_script: build.sh
             os: ubuntu-22.04
@@ -304,6 +304,7 @@ jobs:
         env:
           TRAVIS: yes
           TRAVIS_BRANCH: ${{ matrix.travis_branch }}
+          BUILD_NAME: ${{ matrix.travis_branch }}
         run: |
           if test -f ".github/workflows/${{ matrix.id }}/${{ matrix.test_script }}"; then
             TEST_CMD="$(pwd)/.github/workflows/${{ matrix.id }}/${{ matrix.test_script }}"
@@ -326,6 +327,7 @@ jobs:
             -e GITHUB_WORKFLOW \
             -e TRAVIS \
             -e TRAVIS_BRANCH \
+            -e BUILD_NAME \
             -e "GDAL_SOURCE_DIR=$(pwd)" \
             -u $(id -u ${USER}):$(id -g ${USER}) \
             --security-opt seccomp=unconfined \
diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 8def0357724a..6336d8f3f4f0 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -41,7 +41,7 @@
 pytestmark = [
     pytest.mark.require_curl(),
     pytest.mark.skipif(
-        os.environ.get("BUILD_NAME", "") == "macos_build_conda",
+        os.environ.get("BUILD_NAME", "") in ("macos_build_conda", "fedora_rawhide"),
         reason="fail with SIGPIPE",
     ),
 ]

From 87f10631a0e335c9909e3a4ee11684c7316c2f5d Mon Sep 17 00:00:00 2001
From: AbelPau <a.pau@creaf.uab.cat>
Date: Fri, 2 Aug 2024 08:55:12 +0200
Subject: [PATCH 56/94] MiraMonVector: fix Issue 70860 in oss-fuzz

The minus sign hadn't been taken into account in a particular case when translating numerical fields.
---
 ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp b/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp
index 517008cd7d5f..b3b7e4f3e068 100644
--- a/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp
+++ b/ogr/ogrsf_frmts/miramon/ogrmiramonlayer.cpp
@@ -2216,6 +2216,7 @@ OGRErr OGRMiraMonLayer::TranslateFieldsValuesToMM(OGRFeature *poFeature)
     MM_EXT_DBF_N_FIELDS nNumFields = m_poFeatureDefn->GetFieldCount();
     MM_EXT_DBF_N_MULTIPLE_RECORDS nNumRecords, nRealNumRecords;
     hMMFeature.nNumMRecords = 0;
+#define MAX_SIZE_OF_FIELD_NUMBER_WITH_MINUS 22
 
     for (MM_EXT_DBF_N_FIELDS iField = 0; iField < nNumFields; iField++)
     {
@@ -2427,7 +2428,7 @@ OGRErr OGRMiraMonLayer::TranslateFieldsValuesToMM(OGRFeature *poFeature)
                         hMMFeature.pRecords[nIRecord].nNumField))
                     return OGRERR_NOT_ENOUGH_MEMORY;
 
-                char szChain[21];
+                char szChain[MAX_SIZE_OF_FIELD_NUMBER_WITH_MINUS];
                 MM_SprintfDoubleSignifFigures(
                     szChain, sizeof(szChain),
                     phMiraMonLayer->pLayerDB->pFields[iField].nNumberOfDecimals,
@@ -2643,7 +2644,7 @@ OGRErr OGRMiraMonLayer::TranslateFieldsValuesToMM(OGRFeature *poFeature)
                 hMMFeature.pRecords[0].pField[iField].bIsValid = 0;
             else
             {
-                char szChain[21];
+                char szChain[MAX_SIZE_OF_FIELD_NUMBER_WITH_MINUS];
                 MM_SprintfDoubleSignifFigures(
                     szChain, sizeof(szChain),
                     phMiraMonLayer->pLayerDB->pFields[iField].nNumberOfDecimals,

From b47c95825e7edcfdd4a19cf89b9b80810c75b958 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Aug 2024 11:09:26 +0200
Subject: [PATCH 57/94] autotest/gcore/vsicurl.py

Skip with curl >= 8.9.1
---
 autotest/gcore/vsicurl.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index 6336d8f3f4f0..dd6f3e08dcb5 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -28,7 +28,6 @@
 # DEALINGS IN THE SOFTWARE.
 ###############################################################################
 
-import os
 import sys
 import time
 
@@ -38,10 +37,21 @@
 
 from osgeo import gdal, ogr
 
+
+def curl_version():
+    actual_version = [0, 0, 0]
+    for build_info_item in gdal.VersionInfo("BUILD_INFO").strip().split("\n"):
+        if build_info_item.startswith("CURL_VERSION="):
+            actual_version = [
+                int(x) for x in build_info_item[len("CURL_VERSION=") :].split(".")
+            ]
+    return actual_version
+
+
 pytestmark = [
     pytest.mark.require_curl(),
     pytest.mark.skipif(
-        os.environ.get("BUILD_NAME", "") in ("macos_build_conda", "fedora_rawhide"),
+        curl_version() >= [8, 9, 1],
         reason="fail with SIGPIPE",
     ),
 ]

From 1233a6ebde0cddcb51bd509f7cd4aaf3560cb356 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Aug 2024 11:44:47 +0200
Subject: [PATCH 58/94] ESRIJSON: use 'alias' field member to set OGR
 alternative field name

---
 autotest/ogr/ogr_esrijson.py                  | 4 ++++
 ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/autotest/ogr/ogr_esrijson.py b/autotest/ogr/ogr_esrijson.py
index c8f77e96f1b2..0c96b870f6d6 100755
--- a/autotest/ogr/ogr_esrijson.py
+++ b/autotest/ogr/ogr_esrijson.py
@@ -102,6 +102,10 @@ def test_ogr_esrijson_read_point():
     assert rc
 
     layer_defn = lyr.GetLayerDefn()
+
+    fld_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("objectid"))
+    assert fld_defn.GetAlternativeName() == "Object ID"
+
     fld_defn = layer_defn.GetFieldDefn(layer_defn.GetFieldIndex("fooDate"))
     assert fld_defn.GetType() == ogr.OFTDateTime
     assert fld_defn.GetWidth() == 0
diff --git a/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp b/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
index 84fbd570bbf5..1a3a13402b97 100644
--- a/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
+++ b/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp
@@ -381,6 +381,14 @@ bool OGRESRIJSONReader::ParseField(json_object *poObj)
             }
         }
 
+        json_object *poObjAlias = OGRGeoJSONFindMemberByName(poObj, "alias");
+        if (poObjAlias && json_object_get_type(poObjAlias) == json_type_string)
+        {
+            const char *pszAlias = json_object_get_string(poObjAlias);
+            if (strcmp(pszObjName, pszAlias) != 0)
+                fldDefn.SetAlternativeName(pszAlias);
+        }
+
         poDefn->AddFieldDefn(&fldDefn);
 
         bSuccess = true;

From 98bf188fcc083f85b8c4fd5b889b17efe9522347 Mon Sep 17 00:00:00 2001
From: Hannes <kannes@users.noreply.github.com>
Date: Fri, 2 Aug 2024 13:59:13 +0200
Subject: [PATCH 59/94] Doc: Fix curly braces in VFS, nested zip example with
 braces

- Formatting fix from https://github.com/OSGeo/gdal/pull/3270 for the other occurrences of the curly brace syntax
- Additional vsizip example showing how to access a file in a nested zip, using the curly brace syntax
---
 doc/source/user/virtual_file_systems.rst | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/source/user/virtual_file_systems.rst b/doc/source/user/virtual_file_systems.rst
index b4aea9243f10..860025e30452 100644
--- a/doc/source/user/virtual_file_systems.rst
+++ b/doc/source/user/virtual_file_systems.rst
@@ -83,6 +83,7 @@ Examples:
     /vsizip/my.zip/my.tif  (relative path to the .zip)
     /vsizip//home/even/my.zip/subdir/my.tif  (absolute path to the .zip)
     /vsizip/c:\users\even\my.zip\subdir\my.tif
+    /vsizip/{/vsizip/my.zip/subdir/subzip.zip}/subdir_in_subzip/my.shp  (alternate syntax for a nested .zip)
 
 .kmz, .ods and .xlsx extensions are also detected as valid extensions for zip-compatible archives.
 
@@ -200,7 +201,7 @@ Examples:
     /vsitar//home/even/my.tar/subdir/my.tif # (absolute path to the .tar)
     /vsitar/c:\users\even\my.tar\subdir\my.tif
 
-Starting with GDAL 2.2, an alternate syntax is available so as to enable chaining and not being dependent on .tar extension, e.g.: :file:`/vsitar/{/path/to/the/archive}/path/inside/the/tar/file`. Note that :file:`/path/to/the/archive` may also itself use this alternate syntax.
+Starting with GDAL 2.2, an alternate syntax is available so as to enable chaining and not being dependent on .tar extension, e.g.: ``/vsitar/{/path/to/the/archive}/path/inside/the/tar/file``. Note that :file:`/path/to/the/archive` may also itself use this alternate syntax.
 
 .. _vsi7z:
 
@@ -227,7 +228,7 @@ Default extensions recognized by this virtual file system are:
 ``mpkx`` and ``ppkx`` (Esri ArcGIS Pro Project Package).
 
 An alternate syntax is available so as to enable chaining and not being
-dependent on those extensions, e.g.: :file:`/vsi7z/{/path/to/the/archive}/path/inside/the/archive`.
+dependent on those extensions, e.g.: ``/vsi7z/{/path/to/the/archive}/path/inside/the/archive``.
 Note that :file:`/path/to/the/archive` may also itself use this alternate syntax.
 
 Note that random seeking within a large compressed file will be inefficient when
@@ -257,7 +258,7 @@ is the relative path to the file inside the archive.`
 The default extension recognized by this virtual file system is: ``rar``
 
 An alternate syntax is available so as to enable chaining and not being
-dependent on those extensions, e.g.: :file:`/vsirar/{/path/to/the/archive}/path/inside/the/archive`.
+dependent on those extensions, e.g.: ``/vsirar/{/path/to/the/archive}/path/inside/the/archive``.
 Note that :file:`/path/to/the/archive` may also itself use this alternate syntax.
 
 Note that random seeking within a large compressed file will be inefficient when

From 718663c3983bed55672241a4903c6e618065f18f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Aug 2024 14:56:50 +0200
Subject: [PATCH 60/94] JSONFG: fix reading non-FeatureCollection documents
 larger than 6,000 bytes

Fixes #10525
---
 autotest/ogr/ogr_jsonfg.py                  | 26 +++++++++++++++++++++
 ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp | 12 +++++-----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/autotest/ogr/ogr_jsonfg.py b/autotest/ogr/ogr_jsonfg.py
index beab0559103a..a94636f7af96 100755
--- a/autotest/ogr/ogr_jsonfg.py
+++ b/autotest/ogr/ogr_jsonfg.py
@@ -473,6 +473,32 @@ def test_jsonfg_read_two_features_types():
     assert f.GetFID() == 1
 
 
+###############################################################################
+# Test reading file with a single Feature larger than 6000 bytes
+
+
+def test_jsonfg_read_single_feature_large(tmp_vsimem):
+
+    tmp_file = str(tmp_vsimem / "test.json")
+    content = """{
+      "type": "Feature",
+      "conformsTo" : [ "[ogc-json-fg-1-0.1:core]" ],
+      %s
+      "id": 1,
+      "geometry": { "type": "Point", "coordinates": [2, 49] },
+      "properties": { "foo": 1 },
+      "place": null,
+      "time": null
+    }""" % (
+        " " * 100000
+    )
+
+    gdal.FileFromMemBuffer(tmp_file, content)
+
+    ds = gdal.OpenEx(tmp_file)
+    assert ds.GetDriver().GetDescription() == "JSONFG"
+
+
 ###############################################################################
 # Test time handling
 
diff --git a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp
index 2b4d8b65ebe2..dc4661d0f907 100644
--- a/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp
+++ b/ogr/ogrsf_frmts/jsonfg/ogrjsonfgdataset.cpp
@@ -324,13 +324,13 @@ bool OGRJSONFGDataset::Open(GDALOpenInfo *poOpenInfo,
             }
             if (!bCanTryWithNonStreamingParserOut)
                 return false;
-
-            // Fallback to in-memory ingestion
-            CPLAssert(poOpenInfo->fpL == nullptr);
-            poOpenInfo->fpL = fp.release();
-            if (!ReadFromFile(poOpenInfo, pszUnprefixed))
-                return false;
         }
+
+        // Fallback to in-memory ingestion
+        CPLAssert(poOpenInfo->fpL == nullptr);
+        poOpenInfo->fpL = fp.release();
+        if (!ReadFromFile(poOpenInfo, pszUnprefixed))
+            return false;
     }
 
     // In-memory ingestion of the file

From c889f141e44071e8c21627e4f2a5fc4229da989a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 2 Aug 2024 11:18:14 +0200
Subject: [PATCH 61/94] Add a Arrow VSI file system

Starting with GDAL 3.10 and Arrow 16.0, any GDAL Virtual File System can be
used (in a read-only context) wherever the Arrow C++ library expects a URI, in
particular outside of the context of the OGR Arrow driver, by:

- loading the libgdal.so/dll library (or the ogr_Arrow.so/dll plugin library if
  the Arrow driver is built as a library) with the arrow::fs::LoadFileSystemFactories()
  function (cf `Defining new filesystems <https://arrow.apache.org/docs/cpp/io.html#defining-new-filesystems>`__)
  Note: if the Arrow driver is fully loaded, e.g. by querying
  GetGDALDriverManager()->GetDriverByName("ARROW")->GetMetadata(), the Arrow VSI
  file system will be also registered.

- Prefixing any GDAL file name with the ``vsi://`` URI scheme prefix. In addition
  to any potential vsi prefix in the GDAL file name. So the ``/vsicurl/http://example.com``
  GDAL file name becomes the ``vsi:///vsicurl/http://example.com`` Arrow URI.
---
 autotest/ogr/ogr_arrow.py                     |  15 ++
 autotest/ogr/ogr_parquet.py                   |  17 ++
 doc/source/drivers/vector/arrow.rst           |  22 +-
 ogr/ogrsf_frmts/arrow/CMakeLists.txt          |   4 +
 ogr/ogrsf_frmts/arrow/ogrfeatherdriver.cpp    |  58 ++++-
 .../arrow/ogrfeatherdrivercore.cpp            |   7 +
 .../arrow/vsifilesystemregistrar.cpp          |  61 +++++
 .../arrow_common/ogr_include_arrow.h          |   5 +
 .../arrow_common/vsiarrowfilesystem.hpp       | 235 +++++++++++++++++
 ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp  | 240 +++---------------
 scripts/cppcheck.sh                           |   1 +
 11 files changed, 457 insertions(+), 208 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/arrow/vsifilesystemregistrar.cpp
 create mode 100644 ogr/ogrsf_frmts/arrow_common/vsiarrowfilesystem.hpp

diff --git a/autotest/ogr/ogr_arrow.py b/autotest/ogr/ogr_arrow.py
index c5c1165d97fa..cba6928589bc 100755
--- a/autotest/ogr/ogr_arrow.py
+++ b/autotest/ogr/ogr_arrow.py
@@ -779,3 +779,18 @@ def test_ogr_arrow_ipc_read_stdin(tmp_path):
         lyr = ds.GetLayer(0)
         f = lyr.GetNextFeature()
         assert f["foo"] == "bar"
+
+
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_arrow_vsi_arrow_file_system():
+
+    version = int(
+        ogr.GetDriverByName("ARROW").GetMetadataItem("ARROW_VERSION").split(".")[0]
+    )
+    if version < 16:
+        pytest.skip("requires Arrow >= 16.0.0")
+
+    ogr.Open("vsi://data/arrow/test.feather")
diff --git a/autotest/ogr/ogr_parquet.py b/autotest/ogr/ogr_parquet.py
index 0d3d268cc2a7..28feedd7aa42 100755
--- a/autotest/ogr/ogr_parquet.py
+++ b/autotest/ogr/ogr_parquet.py
@@ -4097,3 +4097,20 @@ def test_ogr_parquet_ignored_fields_bounding_box_column_arrow_dataset(tmp_path):
     lyr.SetSpatialFilterRect(0, 0, 0, 0)
     lyr.ResetReading()
     assert lyr.GetNextFeature() is None
+
+
+###############################################################################
+
+
+@gdaltest.enable_exceptions()
+def test_ogr_parquet_vsi_arrow_file_system():
+
+    version = int(
+        ogr.GetDriverByName("ARROW").GetMetadataItem("ARROW_VERSION").split(".")[0]
+    )
+    if version < 16:
+        pytest.skip("requires Arrow >= 16.0.0")
+
+    ds = ogr.Open("PARQUET:vsi://data/parquet/test.parquet")
+    lyr = ds.GetLayer(0)
+    assert lyr.GetFeatureCount() > 0
diff --git a/doc/source/drivers/vector/arrow.rst b/doc/source/drivers/vector/arrow.rst
index 0b088cf11a77..27cfb3bf80e0 100644
--- a/doc/source/drivers/vector/arrow.rst
+++ b/doc/source/drivers/vector/arrow.rst
@@ -117,7 +117,7 @@ The driver can be installed as a plugin for the ``libgdal`` conda-forge package
     conda install -c conda-forge libgdal-arrow-parquet
 
 Standalone plugin compilation
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+-----------------------------
 
 .. versionadded:: 3.10
 
@@ -141,6 +141,26 @@ systematically loaded at GDAL driver initialization time, and will not benefit f
 `deferred plugin loading capabilities <rfc-96>`. For that, libgdal itself must be built with the
 CMake variable OGR_REGISTER_DRIVER_ARROW_FOR_LATER_PLUGIN=ON set.
 
+Arrow VSI file system
+---------------------
+
+.. versionadded:: 3.10
+
+Starting with GDAL 3.10 and Arrow 16.0, any GDAL Virtual File System can be
+used (in a read-only context) wherever the Arrow C++ library expects a URI, in
+particular outside of the context of the OGR Arrow driver, by:
+
+- loading the libgdal.so/dll library (or the ogr_Arrow.so/dll plugin library if
+  the Arrow driver is built as a library) with the arrow::fs::LoadFileSystemFactories()
+  function (cf `Defining new filesystems <https://arrow.apache.org/docs/cpp/io.html#defining-new-filesystems>`__)
+  Note: if the Arrow driver is fully loaded, e.g. by querying
+  GetGDALDriverManager()->GetDriverByName("ARROW")->GetMetadata(), the Arrow VSI
+  file system will be also registered.
+
+- Prefixing any GDAL file name with the ``vsi://`` URI scheme prefix. In addition
+  to any potential vsi prefix in the GDAL file name. So the ``/vsicurl/http://example.com``
+  GDAL file name becomes the ``vsi:///vsicurl/http://example.com`` Arrow URI.
+
 Links
 -----
 
diff --git a/ogr/ogrsf_frmts/arrow/CMakeLists.txt b/ogr/ogrsf_frmts/arrow/CMakeLists.txt
index aa73287a8555..4f55a984c737 100644
--- a/ogr/ogrsf_frmts/arrow/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/arrow/CMakeLists.txt
@@ -38,6 +38,10 @@ else()
 target_include_directories(ogr_Arrow PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
 endif()
 
+if(${Arrow_VERSION} VERSION_GREATER_EQUAL 16.0)
+    target_sources(ogr_Arrow PRIVATE vsifilesystemregistrar.cpp)
+endif()
+
 if(${Arrow_VERSION} VERSION_GREATER_EQUAL 10.0)
     if(ARROW_USE_STATIC_LIBRARIES)
         gdal_target_link_libraries(ogr_Arrow PRIVATE Arrow::arrow_static)
diff --git a/ogr/ogrsf_frmts/arrow/ogrfeatherdriver.cpp b/ogr/ogrsf_frmts/arrow/ogrfeatherdriver.cpp
index a2e7906be06f..8e5dad1c0053 100644
--- a/ogr/ogrsf_frmts/arrow/ogrfeatherdriver.cpp
+++ b/ogr/ogrsf_frmts/arrow/ogrfeatherdriver.cpp
@@ -135,8 +135,18 @@ static GDALDataset *OGRFeatherDriverOpen(GDALOpenInfo *poOpenInfo)
         return nullptr;
     }
 
-    const bool bIsStreamingFormat = IsArrowIPCStream(poOpenInfo);
-    if (!bIsStreamingFormat && !OGRFeatherDriverIsArrowFileFormat(poOpenInfo))
+    GDALOpenInfo *poOpenInfoForIdentify = poOpenInfo;
+    std::unique_ptr<GDALOpenInfo> poOpenInfoTmp;
+    if (STARTS_WITH(poOpenInfo->pszFilename, "vsi://"))
+    {
+        poOpenInfoTmp = std::make_unique<GDALOpenInfo>(
+            poOpenInfo->pszFilename + strlen("vsi://"), poOpenInfo->nOpenFlags);
+        poOpenInfoForIdentify = poOpenInfoTmp.get();
+    }
+
+    const bool bIsStreamingFormat = IsArrowIPCStream(poOpenInfoForIdentify);
+    if (!bIsStreamingFormat &&
+        !OGRFeatherDriverIsArrowFileFormat(poOpenInfoForIdentify))
     {
         return nullptr;
     }
@@ -165,11 +175,33 @@ static GDALDataset *OGRFeatherDriverOpen(GDALOpenInfo *poOpenInfo)
     }
     else
     {
-        auto result = arrow::io::ReadableFile::Open(poOpenInfo->pszFilename);
+        // FileSystemFromUriOrPath() doesn't like relative paths
+        // so transform them to absolute.
+        std::string osPath(poOpenInfo->pszFilename);
+        if (CPLIsFilenameRelative(osPath.c_str()))
+        {
+            char *pszCurDir = CPLGetCurrentDir();
+            if (pszCurDir == nullptr)
+                return nullptr;
+            osPath = CPLFormFilename(pszCurDir, osPath.c_str(), nullptr);
+            CPLFree(pszCurDir);
+        }
+
+        std::string osFSPath;
+        auto poFS =
+            arrow::fs::FileSystemFromUriOrPath(osPath.c_str(), &osFSPath);
+        if (!poFS.ok())
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "arrow::fs::FileSystemFromUriOrPath failed with %s",
+                     poFS.status().message().c_str());
+            return nullptr;
+        }
+        auto result = (*poFS)->OpenInputFile(osFSPath);
         if (!result.ok())
         {
             CPLError(CE_Failure, CPLE_AppDefined,
-                     "ReadableFile::Open() failed with %s",
+                     "OpenInputFile() failed with %s",
                      result.status().message().c_str());
             return nullptr;
         }
@@ -431,5 +463,23 @@ void RegisterOGRArrow()
     poDriver->pfnOpen = OGRFeatherDriverOpen;
     poDriver->pfnCreate = OGRFeatherDriverCreate;
 
+    poDriver->SetMetadataItem("ARROW_VERSION", ARROW_VERSION_STRING);
+
     GetGDALDriverManager()->RegisterDriver(poDriver.release());
+
+#if ARROW_VERSION_MAJOR >= 16
+    // Mostly for tests
+    const char *pszPath =
+        CPLGetConfigOption("OGR_ARROW_LOAD_FILE_SYSTEM_FACTORIES", nullptr);
+    if (pszPath)
+    {
+        auto result = arrow::fs::LoadFileSystemFactories(pszPath);
+        if (!result.ok())
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "arrow::fs::LoadFileSystemFactories() failed with %s",
+                     result.message().c_str());
+        }
+    }
+#endif
 }
diff --git a/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.cpp b/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.cpp
index 84639ecf0ab9..837d3c1ff7d8 100644
--- a/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.cpp
+++ b/ogr/ogrsf_frmts/arrow/ogrfeatherdrivercore.cpp
@@ -147,6 +147,13 @@ bool OGRFeatherDriverIsArrowFileFormat(GDALOpenInfo *poOpenInfo)
 
 int OGRFeatherDriverIdentify(GDALOpenInfo *poOpenInfo)
 {
+    if (STARTS_WITH(poOpenInfo->pszFilename, "vsi://"))
+    {
+        GDALOpenInfo oOpenInfo(poOpenInfo->pszFilename + strlen("vsi://"),
+                               poOpenInfo->nOpenFlags);
+        return OGRFeatherDriverIdentify(&oOpenInfo);
+    }
+
     int ret = OGRFeatherDriverIsArrowIPCStreamBasic(poOpenInfo);
     if (ret == GDAL_IDENTIFY_TRUE || ret == GDAL_IDENTIFY_UNKNOWN)
         return ret;
diff --git a/ogr/ogrsf_frmts/arrow/vsifilesystemregistrar.cpp b/ogr/ogrsf_frmts/arrow/vsifilesystemregistrar.cpp
new file mode 100644
index 000000000000..f8f673110b1d
--- /dev/null
+++ b/ogr/ogrsf_frmts/arrow/vsifilesystemregistrar.cpp
@@ -0,0 +1,61 @@
+/******************************************************************************
+ *
+ * Project:  GDAL
+ * Purpose:  Arrow virtual file system using VSI
+ * Author:   Even Rouault, <even.rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault, <even.rouault at spatialys.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ ****************************************************************************/
+
+#include "cpl_error.h"
+
+#include "../arrow_common/ogr_include_arrow.h"
+#include "../arrow_common/vsiarrowfilesystem.hpp"
+
+// Only available since Arrow 17.0
+#ifndef ARROW_REGISTER_FILESYSTEM
+namespace arrow::fs
+{
+#define ARROW_REGISTER_FILESYSTEM(scheme, factory_function, finalizer)         \
+    ::arrow::fs::FileSystemRegistrar                                           \
+    {                                                                          \
+        scheme, ::arrow::fs::FileSystemFactory{factory_function}, finalizer    \
+    }
+}  // namespace arrow::fs
+#endif
+
+auto kVSIFileSystemModule = ARROW_REGISTER_FILESYSTEM(
+    []()
+    {
+        CPLDebugOnly("ARROW", "Register VSI Arrow file system");
+        return "vsi";
+    }(),
+    [](const arrow::fs::Uri &uri, const arrow::io::IOContext & /* io_context */,
+       std::string *out_path)
+        -> arrow::Result<std::shared_ptr<arrow::fs::FileSystem>>
+    {
+        constexpr std::string_view kScheme = "vsi://";
+        if (out_path)
+            *out_path = uri.ToString().substr(kScheme.size());
+        return std::make_shared<VSIArrowFileSystem>("ARROW", std::string());
+    },
+    {});
diff --git a/ogr/ogrsf_frmts/arrow_common/ogr_include_arrow.h b/ogr/ogrsf_frmts/arrow_common/ogr_include_arrow.h
index f274fa49ea02..043da713d11d 100644
--- a/ogr/ogrsf_frmts/arrow_common/ogr_include_arrow.h
+++ b/ogr/ogrsf_frmts/arrow_common/ogr_include_arrow.h
@@ -46,6 +46,10 @@
 #include "arrow/builder.h"
 #include "arrow/array/array_dict.h"
 #include "arrow/c/bridge.h"
+#include "arrow/filesystem/filesystem.h"
+#if ARROW_VERSION_MAJOR >= 16
+#include "arrow/filesystem/filesystem_library.h"
+#endif
 #include "arrow/ipc/reader.h"
 #include "arrow/ipc/writer.h"
 #include "arrow/io/file.h"
@@ -53,6 +57,7 @@
 #include "arrow/record_batch.h"
 #include "arrow/util/decimal.h"
 #include "arrow/util/key_value_metadata.h"
+#include "arrow/util/uri.h"
 
 #ifdef _MSC_VER
 #pragma warning(pop)
diff --git a/ogr/ogrsf_frmts/arrow_common/vsiarrowfilesystem.hpp b/ogr/ogrsf_frmts/arrow_common/vsiarrowfilesystem.hpp
new file mode 100644
index 000000000000..6a259e5d880b
--- /dev/null
+++ b/ogr/ogrsf_frmts/arrow_common/vsiarrowfilesystem.hpp
@@ -0,0 +1,235 @@
+/******************************************************************************
+ *
+ * Project:  Parquet Translator
+ * Purpose:  Implements OGRParquetDriver.
+ * Author:   Even Rouault, <even.rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2022, Planet Labs
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ ****************************************************************************/
+
+#ifndef VSIARROWFILESYSTEM_HPP_INCLUDED
+#define VSIARROWFILESYSTEM_HPP_INCLUDED
+
+#include "arrow/util/config.h"
+
+#include "ograrrowrandomaccessfile.h"
+
+/************************************************************************/
+/*                         VSIArrowFileSystem                           */
+/************************************************************************/
+
+class VSIArrowFileSystem final : public arrow::fs::FileSystem
+{
+    const std::string m_osEnvVarPrefix;
+    const std::string m_osQueryParameters;
+
+  public:
+    explicit VSIArrowFileSystem(const std::string &osEnvVarPrefix,
+                                const std::string &osQueryParameters)
+        : m_osEnvVarPrefix(osEnvVarPrefix),
+          m_osQueryParameters(osQueryParameters)
+    {
+    }
+
+    std::string type_name() const override
+    {
+        return "vsi" + m_osEnvVarPrefix;
+    }
+
+    using arrow::fs::FileSystem::Equals;
+
+    bool Equals(const arrow::fs::FileSystem &other) const override
+    {
+        const auto poOther = dynamic_cast<const VSIArrowFileSystem *>(&other);
+        return poOther != nullptr &&
+               poOther->m_osEnvVarPrefix == m_osEnvVarPrefix &&
+               poOther->m_osQueryParameters == m_osQueryParameters;
+    }
+
+    using arrow::fs::FileSystem::GetFileInfo;
+
+    arrow::Result<arrow::fs::FileInfo>
+    GetFileInfo(const std::string &path) override
+    {
+        auto fileType = arrow::fs::FileType::Unknown;
+        VSIStatBufL sStat;
+        if (VSIStatL(path.c_str(), &sStat) == 0)
+        {
+            if (VSI_ISREG(sStat.st_mode))
+                fileType = arrow::fs::FileType::File;
+            else if (VSI_ISDIR(sStat.st_mode))
+                fileType = arrow::fs::FileType::Directory;
+        }
+        else
+        {
+            fileType = arrow::fs::FileType::NotFound;
+        }
+        arrow::fs::FileInfo info(path, fileType);
+        if (fileType == arrow::fs::FileType::File)
+            info.set_size(sStat.st_size);
+        return info;
+    }
+
+    arrow::Result<arrow::fs::FileInfoVector>
+    GetFileInfo(const arrow::fs::FileSelector &select) override
+    {
+        arrow::fs::FileInfoVector res;
+        VSIDIR *psDir = VSIOpenDir(select.base_dir.c_str(),
+                                   select.recursive ? -1 : 0, nullptr);
+        if (psDir == nullptr)
+            return res;
+
+        bool bParquetFound = false;
+        const int nMaxNonParquetFiles = atoi(
+            CPLGetConfigOption("OGR_PARQUET_MAX_NON_PARQUET_FILES", "100"));
+        const int nMaxListedFiles =
+            atoi(CPLGetConfigOption("OGR_PARQUET_MAX_LISTED_FILES", "1000000"));
+        while (const auto psEntry = VSIGetNextDirEntry(psDir))
+        {
+            if (!bParquetFound)
+                bParquetFound =
+                    EQUAL(CPLGetExtension(psEntry->pszName), "parquet");
+
+            const std::string osFilename =
+                select.base_dir + '/' + psEntry->pszName;
+            int nMode = psEntry->nMode;
+            if (!psEntry->bModeKnown)
+            {
+                VSIStatBufL sStat;
+                if (VSIStatL(osFilename.c_str(), &sStat) == 0)
+                    nMode = sStat.st_mode;
+            }
+
+            auto fileType = arrow::fs::FileType::Unknown;
+            if (VSI_ISREG(nMode))
+                fileType = arrow::fs::FileType::File;
+            else if (VSI_ISDIR(nMode))
+                fileType = arrow::fs::FileType::Directory;
+
+            arrow::fs::FileInfo info(osFilename, fileType);
+            if (fileType == arrow::fs::FileType::File && psEntry->bSizeKnown)
+            {
+                info.set_size(psEntry->nSize);
+            }
+            res.push_back(info);
+
+            if (m_osEnvVarPrefix == "PARQUET")
+            {
+                // Avoid iterating over too many files if there's no likely parquet
+                // files.
+                if (static_cast<int>(res.size()) == nMaxNonParquetFiles &&
+                    !bParquetFound)
+                    break;
+                if (static_cast<int>(res.size()) == nMaxListedFiles)
+                    break;
+            }
+        }
+        VSICloseDir(psDir);
+        return res;
+    }
+
+    arrow::Status CreateDir(const std::string & /*path*/,
+                            bool /*recursive*/ = true) override
+    {
+        return arrow::Status::IOError("CreateDir() unimplemented");
+    }
+
+    arrow::Status DeleteDir(const std::string & /*path*/) override
+    {
+        return arrow::Status::IOError("DeleteDir() unimplemented");
+    }
+
+    arrow::Status DeleteDirContents(const std::string & /*path*/
+#if ARROW_VERSION_MAJOR >= 8
+                                    ,
+                                    bool /*missing_dir_ok*/ = false
+#endif
+                                    ) override
+    {
+        return arrow::Status::IOError("DeleteDirContents() unimplemented");
+    }
+
+    arrow::Status DeleteRootDirContents() override
+    {
+        return arrow::Status::IOError("DeleteRootDirContents() unimplemented");
+    }
+
+    arrow::Status DeleteFile(const std::string & /*path*/) override
+    {
+        return arrow::Status::IOError("DeleteFile() unimplemented");
+    }
+
+    arrow::Status Move(const std::string & /*src*/,
+                       const std::string & /*dest*/) override
+    {
+        return arrow::Status::IOError("Move() unimplemented");
+    }
+
+    arrow::Status CopyFile(const std::string & /*src*/,
+                           const std::string & /*dest*/) override
+    {
+        return arrow::Status::IOError("CopyFile() unimplemented");
+    }
+
+    using arrow::fs::FileSystem::OpenInputStream;
+
+    arrow::Result<std::shared_ptr<arrow::io::InputStream>>
+    OpenInputStream(const std::string &path) override
+    {
+        return OpenInputFile(path);
+    }
+
+    using arrow::fs::FileSystem::OpenInputFile;
+
+    arrow::Result<std::shared_ptr<arrow::io::RandomAccessFile>>
+    OpenInputFile(const std::string &path) override
+    {
+        std::string osPath(path);
+        osPath += m_osQueryParameters;
+        CPLDebugOnly(m_osEnvVarPrefix.c_str(), "Opening %s", osPath.c_str());
+        auto fp = VSIVirtualHandleUniquePtr(VSIFOpenL(osPath.c_str(), "rb"));
+        if (fp == nullptr)
+            return arrow::Status::IOError("OpenInputFile() failed for " +
+                                          osPath);
+        return std::make_shared<OGRArrowRandomAccessFile>(std::move(fp));
+    }
+
+    using arrow::fs::FileSystem::OpenOutputStream;
+
+    arrow::Result<std::shared_ptr<arrow::io::OutputStream>>
+    OpenOutputStream(const std::string & /*path*/,
+                     const std::shared_ptr<const arrow::KeyValueMetadata>
+                         & /* metadata */) override
+    {
+        return arrow::Status::IOError("OpenOutputStream() unimplemented");
+    }
+
+    arrow::Result<std::shared_ptr<arrow::io::OutputStream>>
+    OpenAppendStream(const std::string & /*path*/,
+                     const std::shared_ptr<const arrow::KeyValueMetadata>
+                         & /* metadata */) override
+    {
+        return arrow::Status::IOError("OpenAppendStream() unimplemented");
+    }
+};
+
+#endif  // VSIARROWFILESYSTEM_HPP_INCLUDED
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp
index f3c0236128b5..9ee2558a40a6 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp
@@ -36,204 +36,13 @@
 #include "ogrparquetdrivercore.h"
 
 #include "../arrow_common/ograrrowrandomaccessfile.h"
+#include "../arrow_common/vsiarrowfilesystem.hpp"
 #include "../arrow_common/ograrrowwritablefile.h"
 #include "../arrow_common/ograrrowdataset.hpp"
 #include "../arrow_common/ograrrowlayer.hpp"  // for the destructor
 
 #ifdef GDAL_USE_ARROWDATASET
 
-/************************************************************************/
-/*                         VSIArrowFileSystem                           */
-/************************************************************************/
-
-class VSIArrowFileSystem final : public arrow::fs::FileSystem
-{
-    const std::string m_osQueryParameters;
-
-  public:
-    explicit VSIArrowFileSystem(const std::string &osQueryParameters)
-        : m_osQueryParameters(osQueryParameters)
-    {
-    }
-
-    std::string type_name() const override
-    {
-        return "vsi";
-    }
-
-    using arrow::fs::FileSystem::Equals;
-
-    bool Equals(const arrow::fs::FileSystem &other) const override
-    {
-        const auto poOther = dynamic_cast<const VSIArrowFileSystem *>(&other);
-        return poOther != nullptr &&
-               poOther->m_osQueryParameters == m_osQueryParameters;
-    }
-
-    using arrow::fs::FileSystem::GetFileInfo;
-
-    arrow::Result<arrow::fs::FileInfo>
-    GetFileInfo(const std::string &path) override
-    {
-        auto fileType = arrow::fs::FileType::Unknown;
-        VSIStatBufL sStat;
-        if (VSIStatL(path.c_str(), &sStat) == 0)
-        {
-            if (VSI_ISREG(sStat.st_mode))
-                fileType = arrow::fs::FileType::File;
-            else if (VSI_ISDIR(sStat.st_mode))
-                fileType = arrow::fs::FileType::Directory;
-        }
-        else
-        {
-            fileType = arrow::fs::FileType::NotFound;
-        }
-        arrow::fs::FileInfo info(path, fileType);
-        if (fileType == arrow::fs::FileType::File)
-            info.set_size(sStat.st_size);
-        return info;
-    }
-
-    arrow::Result<arrow::fs::FileInfoVector>
-    GetFileInfo(const arrow::fs::FileSelector &select) override
-    {
-        arrow::fs::FileInfoVector res;
-        VSIDIR *psDir = VSIOpenDir(select.base_dir.c_str(),
-                                   select.recursive ? -1 : 0, nullptr);
-        if (psDir == nullptr)
-            return res;
-
-        bool bParquetFound = false;
-        const int nMaxNonParquetFiles = atoi(
-            CPLGetConfigOption("OGR_PARQUET_MAX_NON_PARQUET_FILES", "100"));
-        const int nMaxListedFiles =
-            atoi(CPLGetConfigOption("OGR_PARQUET_MAX_LISTED_FILES", "1000000"));
-        while (const auto psEntry = VSIGetNextDirEntry(psDir))
-        {
-            if (!bParquetFound)
-                bParquetFound =
-                    EQUAL(CPLGetExtension(psEntry->pszName), "parquet");
-
-            const std::string osFilename =
-                select.base_dir + '/' + psEntry->pszName;
-            int nMode = psEntry->nMode;
-            if (!psEntry->bModeKnown)
-            {
-                VSIStatBufL sStat;
-                if (VSIStatL(osFilename.c_str(), &sStat) == 0)
-                    nMode = sStat.st_mode;
-            }
-
-            auto fileType = arrow::fs::FileType::Unknown;
-            if (VSI_ISREG(nMode))
-                fileType = arrow::fs::FileType::File;
-            else if (VSI_ISDIR(nMode))
-                fileType = arrow::fs::FileType::Directory;
-
-            arrow::fs::FileInfo info(osFilename, fileType);
-            if (fileType == arrow::fs::FileType::File && psEntry->bSizeKnown)
-            {
-                info.set_size(psEntry->nSize);
-            }
-            res.push_back(info);
-
-            // Avoid iterating over too many files if there's no likely parquet
-            // files.
-            if (static_cast<int>(res.size()) == nMaxNonParquetFiles &&
-                !bParquetFound)
-                break;
-            if (static_cast<int>(res.size()) == nMaxListedFiles)
-                break;
-        }
-        VSICloseDir(psDir);
-        return res;
-    }
-
-    arrow::Status CreateDir(const std::string & /*path*/,
-                            bool /*recursive*/ = true) override
-    {
-        return arrow::Status::IOError("CreateDir() unimplemented");
-    }
-
-    arrow::Status DeleteDir(const std::string & /*path*/) override
-    {
-        return arrow::Status::IOError("DeleteDir() unimplemented");
-    }
-
-    arrow::Status DeleteDirContents(const std::string & /*path*/
-#if ARROW_VERSION_MAJOR >= 8
-                                    ,
-                                    bool /*missing_dir_ok*/ = false
-#endif
-                                    ) override
-    {
-        return arrow::Status::IOError("DeleteDirContents() unimplemented");
-    }
-
-    arrow::Status DeleteRootDirContents() override
-    {
-        return arrow::Status::IOError("DeleteRootDirContents() unimplemented");
-    }
-
-    arrow::Status DeleteFile(const std::string & /*path*/) override
-    {
-        return arrow::Status::IOError("DeleteFile() unimplemented");
-    }
-
-    arrow::Status Move(const std::string & /*src*/,
-                       const std::string & /*dest*/) override
-    {
-        return arrow::Status::IOError("Move() unimplemented");
-    }
-
-    arrow::Status CopyFile(const std::string & /*src*/,
-                           const std::string & /*dest*/) override
-    {
-        return arrow::Status::IOError("CopyFile() unimplemented");
-    }
-
-    using arrow::fs::FileSystem::OpenInputStream;
-
-    arrow::Result<std::shared_ptr<arrow::io::InputStream>>
-    OpenInputStream(const std::string &path) override
-    {
-        return OpenInputFile(path);
-    }
-
-    using arrow::fs::FileSystem::OpenInputFile;
-
-    arrow::Result<std::shared_ptr<arrow::io::RandomAccessFile>>
-    OpenInputFile(const std::string &path) override
-    {
-        std::string osPath(path);
-        osPath += m_osQueryParameters;
-        CPLDebugOnly("PARQUET", "Opening %s", osPath.c_str());
-        auto fp = VSIVirtualHandleUniquePtr(VSIFOpenL(osPath.c_str(), "rb"));
-        if (fp == nullptr)
-            return arrow::Status::IOError("OpenInputFile() failed for " +
-                                          osPath);
-        return std::make_shared<OGRArrowRandomAccessFile>(std::move(fp));
-    }
-
-    using arrow::fs::FileSystem::OpenOutputStream;
-
-    arrow::Result<std::shared_ptr<arrow::io::OutputStream>>
-    OpenOutputStream(const std::string & /*path*/,
-                     const std::shared_ptr<const arrow::KeyValueMetadata>
-                         & /* metadata */) override
-    {
-        return arrow::Status::IOError("OpenOutputStream() unimplemented");
-    }
-
-    arrow::Result<std::shared_ptr<arrow::io::OutputStream>>
-    OpenAppendStream(const std::string & /*path*/,
-                     const std::shared_ptr<const arrow::KeyValueMetadata>
-                         & /* metadata */) override
-    {
-        return arrow::Status::IOError("OpenAppendStream() unimplemented");
-    }
-};
-
 /************************************************************************/
 /*                      OpenFromDatasetFactory()                        */
 /************************************************************************/
@@ -264,16 +73,20 @@ static GDALDataset *OpenFromDatasetFactory(
 
 static std::shared_ptr<arrow::fs::FileSystem>
 GetFileSystem(std::string &osBasePathInOut,
-              const std::string &osQueryParameters)
+              const std::string &osQueryParameters, std::string &osFSFilename)
 {
     // Instantiate file system:
     // - VSIArrowFileSystem implementation for /vsi files
     // - base implementation for local files (if OGR_PARQUET_USE_VSI set to NO)
     std::shared_ptr<arrow::fs::FileSystem> fs;
     const bool bIsVSI = STARTS_WITH(osBasePathInOut.c_str(), "/vsi");
-    if (bIsVSI || CPLTestBool(CPLGetConfigOption("OGR_PARQUET_USE_VSI", "YES")))
+    VSIStatBufL sStat;
+    if ((bIsVSI ||
+         CPLTestBool(CPLGetConfigOption("OGR_PARQUET_USE_VSI", "YES"))) &&
+        VSIStatL(osBasePathInOut.c_str(), &sStat) == 0)
     {
-        fs = std::make_shared<VSIArrowFileSystem>(osQueryParameters);
+        osFSFilename = osBasePathInOut;
+        fs = std::make_shared<VSIArrowFileSystem>("PARQUET", osQueryParameters);
     }
     else
     {
@@ -288,7 +101,8 @@ GetFileSystem(std::string &osBasePathInOut,
             osPath = CPLFormFilename(pszCurDir, osPath.c_str(), nullptr);
             CPLFree(pszCurDir);
         }
-        PARQUET_ASSIGN_OR_THROW(fs, arrow::fs::FileSystemFromUriOrPath(osPath));
+        PARQUET_ASSIGN_OR_THROW(
+            fs, arrow::fs::FileSystemFromUriOrPath(osPath, &osFSFilename));
     }
     return fs;
 }
@@ -302,7 +116,8 @@ static GDALDataset *OpenParquetDatasetWithMetadata(
     const std::string &osQueryParameters, CSLConstList papszOpenOptions)
 {
     std::string osBasePath(osBasePathIn);
-    auto fs = GetFileSystem(osBasePath, osQueryParameters);
+    std::string osFSFilename;
+    auto fs = GetFileSystem(osBasePath, osQueryParameters, osFSFilename);
 
     arrow::dataset::ParquetFactoryOptions options;
     auto partitioningFactory = arrow::dataset::HivePartitioning::MakeFactory();
@@ -312,7 +127,7 @@ static GDALDataset *OpenParquetDatasetWithMetadata(
     std::shared_ptr<arrow::dataset::DatasetFactory> factory;
     PARQUET_ASSIGN_OR_THROW(
         factory, arrow::dataset::ParquetDatasetFactory::Make(
-                     osBasePath + '/' + pszMetadataFile, std::move(fs),
+                     osFSFilename + '/' + pszMetadataFile, std::move(fs),
                      std::make_shared<arrow::dataset::ParquetFileFormat>(),
                      std::move(options)));
 
@@ -329,16 +144,18 @@ OpenParquetDatasetWithoutMetadata(const std::string &osBasePathIn,
                                   CSLConstList papszOpenOptions)
 {
     std::string osBasePath(osBasePathIn);
-    auto fs = GetFileSystem(osBasePath, osQueryParameters);
+    std::string osFSFilename;
+    auto fs = GetFileSystem(osBasePath, osQueryParameters, osFSFilename);
 
     arrow::dataset::FileSystemFactoryOptions options;
     std::shared_ptr<arrow::dataset::DatasetFactory> factory;
-    VSIStatBufL sStat;
-    if (VSIStatL(osBasePath.c_str(), &sStat) == 0 && VSI_ISREG(sStat.st_mode))
+
+    const auto fileInfo = fs->GetFileInfo(osFSFilename);
+    if (fileInfo->IsFile())
     {
         PARQUET_ASSIGN_OR_THROW(
             factory, arrow::dataset::FileSystemDatasetFactory::Make(
-                         std::move(fs), {osBasePath},
+                         std::move(fs), {osFSFilename},
                          std::make_shared<arrow::dataset::ParquetFileFormat>(),
                          std::move(options)));
     }
@@ -350,7 +167,7 @@ OpenParquetDatasetWithoutMetadata(const std::string &osBasePathIn,
             std::move(partitioningFactory));
 
         arrow::fs::FileSelector selector;
-        selector.base_dir = osBasePath;
+        selector.base_dir = osFSFilename;
         selector.recursive = true;
 
         PARQUET_ASSIGN_OR_THROW(
@@ -909,9 +726,26 @@ void RegisterOGRParquet()
     poDriver->pfnOpen = OGRParquetDriverOpen;
     poDriver->pfnCreate = OGRParquetDriverCreate;
 
+    poDriver->SetMetadataItem("ARROW_VERSION", ARROW_VERSION_STRING);
 #ifdef GDAL_USE_ARROWDATASET
     poDriver->SetMetadataItem("ARROW_DATASET", "YES");
 #endif
 
     GetGDALDriverManager()->RegisterDriver(poDriver.release());
+
+#if ARROW_VERSION_MAJOR >= 16
+    // Mostly for tests
+    const char *pszPath =
+        CPLGetConfigOption("OGR_PARQUET_LOAD_FILE_SYSTEM_FACTORIES", nullptr);
+    if (pszPath)
+    {
+        auto result = arrow::fs::LoadFileSystemFactories(pszPath);
+        if (!result.ok())
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "arrow::fs::LoadFileSystemFactories() failed with %s",
+                     result.message().c_str());
+        }
+    }
+#endif
 }
diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh
index 2201450e7cad..feca3056dfeb 100755
--- a/scripts/cppcheck.sh
+++ b/scripts/cppcheck.sh
@@ -120,6 +120,7 @@ for dirname in alg port gcore ogr frmts gnm apps fuzzers; do
         -i ogrdissolve.cpp \
         -i gdalasyncread.cpp \
         -i gdaltorture.cpp \
+        -i vsifilesystemregistrar.cpp \
         $dirname \
         -j "$(nproc)" >>${LOG_FILE} 2>&1 &
     # Display some progress to avoid Travis-CI killing the job after 10 minutes

From 0c5ab6523d0e006292e3cefd6f51c5ebd08b773d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 1 Aug 2024 17:28:43 +0200
Subject: [PATCH 62/94] gdalproxypool.cpp: reduce mutex contention,
 particularly useful for VRT multithreading of remove sources

---
 gcore/gdalproxypool.cpp | 71 +++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 31 deletions(-)

diff --git a/gcore/gdalproxypool.cpp b/gcore/gdalproxypool.cpp
index 8282d7f98c09..f31ceb4698b0 100644
--- a/gcore/gdalproxypool.cpp
+++ b/gcore/gdalproxypool.cpp
@@ -80,6 +80,17 @@ struct _GDALProxyPoolCacheEntry
     GDALProxyPoolCacheEntry *next;
 };
 
+// This variable prevents a dataset that is going to be opened in
+// GDALDatasetPool::_RefDataset from increasing refCount if, during its
+// opening, it creates a GDALProxyPoolDataset.
+// We increment it before opening or closing a cached dataset and decrement
+// it afterwards
+// The typical use case is a VRT made of simple sources that are VRT
+// We don't want the "inner" VRT to take a reference on the pool, otherwise
+// there is a high chance that this reference will not be dropped and the pool
+// remain ghost.
+static thread_local int refCountOfDisabledRefCount = 0;
+
 class GDALDatasetPool
 {
   private:
@@ -88,7 +99,7 @@ class GDALDatasetPool
     /* Ref count of the pool singleton */
     /* Taken by "toplevel" GDALProxyPoolDataset in its constructor and released
      */
-    /* in its destructor. See also refCountOfDisableRefCount for the difference
+    /* in its destructor. See also refCountOfDisabledRefCount for the difference
      */
     /* between toplevel and inner GDALProxyPoolDataset */
     int refCount = 0;
@@ -100,19 +111,6 @@ class GDALDatasetPool
     GDALProxyPoolCacheEntry *firstEntry = nullptr;
     GDALProxyPoolCacheEntry *lastEntry = nullptr;
 
-    /* This variable prevents a dataset that is going to be opened in
-     * GDALDatasetPool::_RefDataset */
-    /* from increasing refCount if, during its opening, it creates a
-     * GDALProxyPoolDataset */
-    /* We increment it before opening or closing a cached dataset and decrement
-     * it afterwards */
-    /* The typical use case is a VRT made of simple sources that are VRT */
-    /* We don't want the "inner" VRT to take a reference on the pool, otherwise
-     * there is */
-    /* a high chance that this reference will not be dropped and the pool remain
-     * ghost */
-    int refCountOfDisableRefCount = 0;
-
     /* Caution : to be sure that we don't run out of entries, size must be at */
     /* least greater or equal than the maximum number of threads */
     explicit GDALDatasetPool(int maxSize, int64_t nMaxRAMUsage);
@@ -256,6 +254,9 @@ GDALDatasetPool::_RefDataset(const char *pszFileName, GDALAccess eAccess,
                              CSLConstList papszOpenOptions, int bShared,
                              bool bForceOpen, const char *pszOwner)
 {
+    CPLMutex **pMutex = GDALGetphDLMutex();
+    CPLMutexHolderD(pMutex);
+
     if (bInDestruction)
         return nullptr;
 
@@ -293,9 +294,9 @@ GDALDatasetPool::_RefDataset(const char *pszFileName, GDALAccess eAccess,
             /* dataset */
             GDALSetResponsiblePIDForCurrentThread(candidate->responsiblePID);
 
-            refCountOfDisableRefCount++;
+            refCountOfDisabledRefCount++;
             GDALClose(candidate->poDS);
-            refCountOfDisableRefCount--;
+            refCountOfDisabledRefCount--;
 
             candidate->poDS = nullptr;
             GDALSetResponsiblePIDForCurrentThread(responsiblePID);
@@ -340,7 +341,7 @@ GDALDatasetPool::_RefDataset(const char *pszFileName, GDALAccess eAccess,
     {
         GDALProxyPoolCacheEntry *next = cur->next;
 
-        if (cur->pszFileNameAndOpenOptions &&
+        if (cur->refCount >= 0 && cur->pszFileNameAndOpenOptions &&
             osFilenameAndOO == cur->pszFileNameAndOpenOptions &&
             ((bShared && cur->responsiblePID == responsiblePID &&
               ((cur->pszOwner == nullptr && pszOwner == nullptr) ||
@@ -414,16 +415,25 @@ GDALDatasetPool::_RefDataset(const char *pszFileName, GDALAccess eAccess,
     cur->pszFileNameAndOpenOptions = CPLStrdup(osFilenameAndOO.c_str());
     cur->pszOwner = (pszOwner) ? CPLStrdup(pszOwner) : nullptr;
     cur->responsiblePID = responsiblePID;
-    cur->refCount = 1;
+    cur->refCount = -1;  // to mark loading of dataset in progress
     cur->nRAMUsage = 0;
 
-    refCountOfDisableRefCount++;
-    int nFlag = ((eAccess == GA_Update) ? GDAL_OF_UPDATE : GDAL_OF_READONLY) |
-                GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR;
+    refCountOfDisabledRefCount++;
+    const int nFlag =
+        ((eAccess == GA_Update) ? GDAL_OF_UPDATE : GDAL_OF_READONLY) |
+        GDAL_OF_RASTER | GDAL_OF_VERBOSE_ERROR;
     CPLConfigOptionSetter oSetter("CPL_ALLOW_VSISTDIN", "NO", true);
-    cur->poDS = GDALDataset::Open(pszFileName, nFlag, nullptr, papszOpenOptions,
+
+    // Release mutex while opening dataset to avoid lock contention.
+    CPLReleaseMutex(*pMutex);
+    auto poDS = GDALDataset::Open(pszFileName, nFlag, nullptr, papszOpenOptions,
                                   nullptr);
-    refCountOfDisableRefCount--;
+    CPLAcquireMutex(*pMutex, 1000.0);
+
+    cur->poDS = poDS;
+    cur->refCount = 1;
+
+    refCountOfDisabledRefCount--;
 
     if (cur->poDS)
     {
@@ -489,9 +499,9 @@ void GDALDatasetPool::_CloseDatasetIfZeroRefCount(const char *pszFileName,
             CPLFree(cur->pszOwner);
             cur->pszOwner = nullptr;
 
-            refCountOfDisableRefCount++;
+            refCountOfDisabledRefCount++;
             GDALClose(poDS);
-            refCountOfDisableRefCount--;
+            refCountOfDisabledRefCount--;
 
             GDALSetResponsiblePIDForCurrentThread(responsiblePID);
             break;
@@ -545,7 +555,7 @@ void GDALDatasetPool::Ref()
         singleton =
             new GDALDatasetPool(GDALGetMaxDatasetPoolSize(), l_nMaxRAMUsage);
     }
-    if (singleton->refCountOfDisableRefCount == 0)
+    if (refCountOfDisabledRefCount == 0)
         singleton->refCount++;
 }
 
@@ -555,7 +565,7 @@ void GDALDatasetPool::PreventDestroy()
     CPLMutexHolderD(GDALGetphDLMutex());
     if (!singleton)
         return;
-    singleton->refCountOfDisableRefCount++;
+    refCountOfDisabledRefCount++;
 }
 
 /* keep that in sync with gdaldrivermanager.cpp */
@@ -578,7 +588,7 @@ void GDALDatasetPool::Unref()
         CPLAssert(false);
         return;
     }
-    if (singleton->refCountOfDisableRefCount == 0)
+    if (refCountOfDisabledRefCount == 0)
     {
         singleton->refCount--;
         if (singleton->refCount == 0)
@@ -595,8 +605,8 @@ void GDALDatasetPool::ForceDestroy()
     CPLMutexHolderD(GDALGetphDLMutex());
     if (!singleton)
         return;
-    singleton->refCountOfDisableRefCount--;
-    CPLAssert(singleton->refCountOfDisableRefCount == 0);
+    refCountOfDisabledRefCount--;
+    CPLAssert(refCountOfDisabledRefCount == 0);
     singleton->refCount = 0;
     delete singleton;
     singleton = nullptr;
@@ -619,7 +629,6 @@ GDALDatasetPool::RefDataset(const char *pszFileName, GDALAccess eAccess,
                             char **papszOpenOptions, int bShared,
                             bool bForceOpen, const char *pszOwner)
 {
-    CPLMutexHolderD(GDALGetphDLMutex());
     return singleton->_RefDataset(pszFileName, eAccess, papszOpenOptions,
                                   bShared, bForceOpen, pszOwner);
 }

From ce5bafde89e238af88d3f51794cb7de6ed94b1dd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 28 Jul 2024 18:08:01 +0200
Subject: [PATCH 63/94] SRTMHGT: add support for 0.5 deg resolution datasets

Fixes #10514
---
 autotest/gdrivers/srtmhgt.py     | 36 ++++++++++++++++++++++++++++++++
 frmts/srtmhgt/srtmhgtdataset.cpp | 22 +++++++++++--------
 2 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/autotest/gdrivers/srtmhgt.py b/autotest/gdrivers/srtmhgt.py
index 2e29d1e73c43..76acf525a138 100755
--- a/autotest/gdrivers/srtmhgt.py
+++ b/autotest/gdrivers/srtmhgt.py
@@ -191,3 +191,39 @@ def test_srtmhgt_hgts():
 
     assert min_ == 1.25
     assert max_ == 1.25
+
+
+###############################################################################
+# Test reading files of all supported sizes
+
+
+@pytest.mark.parametrize(
+    "width,height,nb_bytes",
+    [
+        (1201, 1201, 2),
+        (1801, 3601, 2),
+        (3601, 3601, 1),
+        (3601, 3601, 2),
+        (3601, 3601, 4),
+        (7201, 7201, 2),
+    ],
+)
+def test_srtmhgt_all_supported_sizes(tmp_vsimem, width, height, nb_bytes):
+
+    filename = str(tmp_vsimem / "n00e000.hgt")
+    f = gdal.VSIFOpenL(filename, "wb")
+    if f is None:
+        pytest.skip()
+    gdal.VSIFTruncateL(f, width * height * nb_bytes)
+    gdal.VSIFCloseL(f)
+
+    ds = gdal.Open(filename)
+    assert ds is not None
+    assert ds.GetGeoTransform()[1] == pytest.approx(1.0 / (width - 1), rel=1e-8)
+    assert ds.GetRasterBand(1).DataType == (
+        gdal.GDT_Byte
+        if nb_bytes == 1
+        else gdal.GDT_Int16
+        if nb_bytes == 2
+        else gdal.GDT_Float32
+    )
diff --git a/frmts/srtmhgt/srtmhgtdataset.cpp b/frmts/srtmhgt/srtmhgtdataset.cpp
index 367ef23af841..ff8c8d863ff4 100644
--- a/frmts/srtmhgt/srtmhgtdataset.cpp
+++ b/frmts/srtmhgt/srtmhgtdataset.cpp
@@ -344,11 +344,12 @@ int SRTMHGTDataset::Identify(GDALOpenInfo *poOpenInfo)
 
     if (VSIStatL(poOpenInfo->pszFilename, &fileStat) != 0)
         return FALSE;
-    if (fileStat.st_size != 3601 * 3601 &&
+    if (fileStat.st_size != 1201 * 1201 * 2 &&
+        fileStat.st_size != 1801 * 3601 * 2 &&
+        fileStat.st_size != 3601 * 3601 &&
         fileStat.st_size != 3601 * 3601 * 2 &&
         fileStat.st_size != 3601 * 3601 * 4 &&  // .hgts
-        fileStat.st_size != 1801 * 3601 * 2 &&
-        fileStat.st_size != 1201 * 1201 * 2)
+        fileStat.st_size != 7201 * 7201 * 2)
         return FALSE;
 
     return TRUE;
@@ -443,6 +444,13 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
     GDALDataType eDT = GDT_Int16;
     switch (fileStat.st_size)
     {
+        case 1201 * 1201 * 2:
+            numPixels_x = numPixels_y = 1201;
+            break;
+        case 1801 * 3601 * 2:
+            numPixels_x = 1801;
+            numPixels_y = 3601;
+            break;
         case 3601 * 3601:
             numPixels_x = numPixels_y = 3601;
             eDT = GDT_Byte;
@@ -454,12 +462,8 @@ GDALDataset *SRTMHGTDataset::Open(GDALOpenInfo *poOpenInfo)
             numPixels_x = numPixels_y = 3601;
             eDT = GDT_Float32;
             break;
-        case 1801 * 3601 * 2:
-            numPixels_x = 1801;
-            numPixels_y = 3601;
-            break;
-        case 1201 * 1201 * 2:
-            numPixels_x = numPixels_y = 1201;
+        case 7201 * 7201 * 2:
+            numPixels_x = numPixels_y = 7201;
             break;
         default:
             numPixels_x = numPixels_y = 0;

From aeef2a0a6c1938b5a433bf9ef2918f6a7635af19 Mon Sep 17 00:00:00 2001
From: Johannes Quast <54998646+jatsqi@users.noreply.github.com>
Date: Mon, 5 Aug 2024 17:53:44 +0200
Subject: [PATCH 64/94] HANA: Add support for fast extent estimation (#10543)

---
 autotest/ogr/ogr_hana.py                    |  92 ++++++++++++++++-
 ogr/ogrsf_frmts/hana/ogr_hana.h             |  17 +++-
 ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp  |  28 +++++-
 ogr/ogrsf_frmts/hana/ogrhanalayer.cpp       | 103 ++++++++++++++------
 ogr/ogrsf_frmts/hana/ogrhanaresultlayer.cpp |   9 +-
 ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp  |   2 +-
 ogr/ogrsf_frmts/hana/ogrhanautils.cpp       |  13 +++
 ogr/ogrsf_frmts/hana/ogrhanautils.h         |  57 +++++++++++
 8 files changed, 280 insertions(+), 41 deletions(-)

diff --git a/autotest/ogr/ogr_hana.py b/autotest/ogr/ogr_hana.py
index f9a9ddc1e2c6..391ce62cd4f1 100644
--- a/autotest/ogr/ogr_hana.py
+++ b/autotest/ogr/ogr_hana.py
@@ -1220,6 +1220,94 @@ def check_value(expected):
     check_value(vec1)
 
 
+###############################################################################
+# Verify a working fast extent implementation
+
+
+def test_ogr_hana_39():
+    conn = create_connection()
+
+    def delta_merge():
+        execute_sql(
+            conn,
+            f"MERGE DELTA OF {table_name}",
+        )
+
+    # Create test table
+    layer_name = get_test_name()
+    table_name = f'"{gdaltest.hana_schema_name}"."{layer_name}"'
+    execute_sql(
+        conn,
+        f"CREATE COLUMN TABLE {table_name} (id INT, geom ST_Geometry(4326)) NO AUTO MERGE",
+    )
+
+    # Insert points
+    points_wkt = ["POINT(0 0)", "POINT(10 0)", "POINT(40 0)"]
+    for id, wkt in enumerate(points_wkt):
+        execute_sql(
+            conn,
+            f"INSERT INTO {table_name} (id, geom) VALUES ({id}, ST_GeomFromText('{wkt}', 4326))",
+        )
+    delta_merge()
+
+    # Check extent (1.)
+    ds = open_datasource(0)
+    layer = ds.GetLayerByName(layer_name)
+    assert layer is not None, "did not get layer"
+    check_extent(layer, (0, 40, 0, 0), force=False)
+
+    # Delete outer most point...
+    # Because of the disabled delta merge, the extent should remain unchanged
+    # when the fast extent estimation is used.
+    execute_sql(
+        conn,
+        f"DELETE FROM {table_name} WHERE id=2",
+    )
+    check_extent(layer, (0, 40, 0, 0), force=False)
+    delta_merge()
+    check_extent(layer, (0, 10, 0, 0), force=False)
+
+    # Tear-down
+    execute_sql(conn, f"DROP TABLE {table_name}")
+
+
+###############################################################################
+# Verify a working fallback in case the fast extent estimation fails
+
+
+def test_ogr_hana_40():
+    conn = create_connection()
+
+    # Create test table
+    layer_name = get_test_name()
+    table_name = f'"{gdaltest.hana_schema_name}"."{layer_name}"'
+    execute_sql(
+        conn,
+        f"CREATE COLUMN TABLE {table_name} (id INT, geom ST_Geometry(4326)) NO AUTO MERGE",
+    )
+
+    # Check extent. The table is empty so the extent should be (0, 0, 0, 0)
+    ds = open_datasource(0)
+    layer = ds.GetLayerByName(layer_name)
+    assert layer is not None, "did not get layer"
+    check_extent(layer, (0, 0, 0, 0), force=False)
+
+    # Insert points without merging the delta.
+    # The fallback should be triggered and return the correct extent.
+    execute_sql(
+        conn,
+        f"INSERT INTO {table_name} (id, geom) VALUES (0, ST_GeomFromText('POINT(0 10)', 4326))",
+    )
+    execute_sql(
+        conn,
+        f"INSERT INTO {table_name} (id, geom) VALUES (0, ST_GeomFromText('POINT(0 40)', 4326))",
+    )
+    check_extent(layer, (0, 0, 10, 40), force=False)
+
+    # Tear-down
+    execute_sql(conn, f"DROP TABLE {table_name}")
+
+
 ###############################################################################
 #  Create a table from data/poly.shp
 
@@ -1363,8 +1451,8 @@ def open_datasource(update=0, open_opts=None):
         return gdal.OpenEx(conn_str, update, open_options=[open_opts])
 
 
-def check_extent(layer, expected, max_error=0.001):
-    actual = layer.GetExtent()
+def check_extent(layer, expected, force=True, max_error=0.001):
+    actual = layer.GetExtent(force=force)
     minx = abs(actual[0] - expected[0])
     maxx = abs(actual[1] - expected[1])
     miny = abs(actual[2] - expected[2])
diff --git a/ogr/ogrsf_frmts/hana/ogr_hana.h b/ogr/ogrsf_frmts/hana/ogr_hana.h
index 2d391c7bd5ba..cf733d990023 100644
--- a/ogr/ogrsf_frmts/hana/ogr_hana.h
+++ b/ogr/ogrsf_frmts/hana/ogr_hana.h
@@ -29,6 +29,7 @@
 #ifndef OGR_HANA_H_INCLUDED
 #define OGR_HANA_H_INCLUDED
 
+#include "hana/ogrhanautils.h"
 #include "ogrsf_frmts.h"
 #include "cpl_string.h"
 
@@ -230,7 +231,8 @@ class OGRHanaLayer : public OGRLayer
                                  const CPLString &tableName,
                                  const CPLString &query,
                                  const CPLString &featureDefName);
-    void ReadGeometryExtent(int geomField, OGREnvelope *extent);
+    void ReadGeometryExtent(int geomField, OGREnvelope *extent, int force);
+    bool IsFastExtentAvailable();
 
   public:
     explicit OGRHanaLayer(OGRHanaDataSource *datasource);
@@ -416,13 +418,15 @@ class OGRHanaDataSource final : public GDALDataset
     SrsCache srsCache_;
     odbc::EnvironmentRef connEnv_;
     odbc::ConnectionRef conn_;
-    int majorVersion_ = 0;
+    OGRHANA::HanaVersion hanaVersion_;
+    OGRHANA::HanaVersion cloudVersion_;
 
   private:
     void CreateTable(const CPLString &tableName, const CPLString &fidName,
                      const CPLString &fidType, const CPLString &geomColumnName,
                      OGRwkbGeometryType geomType, bool geomColumnNullable,
                      const CPLString &geomColumnIndexType, int geomSrid);
+    void DetermineVersions();
 
   protected:
     std::pair<CPLString, CPLString> FindSchemaAndTableNames(const char *query);
@@ -469,9 +473,14 @@ class OGRHanaDataSource final : public GDALDataset
 
     int Open(const char *newName, char **options, int update);
 
-    int GetMajorVersion() const
+    OGRHANA::HanaVersion GetHanaVersion() const
     {
-        return majorVersion_;
+        return hanaVersion_;
+    }
+
+    OGRHANA::HanaVersion GetHanaCloudVersion() const
+    {
+        return cloudVersion_;
     }
 
     OGRErr DeleteLayer(int index) override;
diff --git a/ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp b/ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp
index db584953092a..30404c29eeae 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp
@@ -624,10 +624,7 @@ int OGRHanaDataSource::Open(const char *newName, char **openOptions, int update)
 
         if (conn_->connected())
         {
-            odbc::DatabaseMetaDataRef dbmd = conn_->getDatabaseMetaData();
-            CPLString dbVersion(dbmd->getDBMSVersion());
-            majorVersion_ =
-                atoi(dbVersion.substr(0u, dbVersion.find('.')).c_str());
+            DetermineVersions();
 
             const char *paramTables = CSLFetchNameValueDef(
                 connOptions, OGRHanaOpenOptionsConstants::TABLES, "");
@@ -698,6 +695,29 @@ void OGRHanaDataSource::CreateTable(
     ExecuteSQL(sql);
 }
 
+void OGRHanaDataSource::DetermineVersions()
+{
+    odbc::DatabaseMetaDataRef dbmd = conn_->getDatabaseMetaData();
+    CPLString dbVersion(dbmd->getDBMSVersion());
+    hanaVersion_ = HanaVersion::fromString(dbVersion);
+
+    if (hanaVersion_.major() < 4)
+    {
+        cloudVersion_ = HanaVersion(0, 0, 0);
+        return;
+    }
+
+    odbc::StatementRef stmt = conn_->createStatement();
+    const char *sql = "SELECT CLOUD_VERSION FROM SYS.M_DATABASE;";
+
+    odbc::ResultSetRef rsVersion = stmt->executeQuery(sql);
+    if (rsVersion->next())
+        cloudVersion_ =
+            HanaVersion::fromString(rsVersion->getString(1)->c_str());
+
+    rsVersion->close();
+}
+
 /************************************************************************/
 /*                            FindSchemaAndTableNames()                 */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/hana/ogrhanalayer.cpp b/ogr/ogrsf_frmts/hana/ogrhanalayer.cpp
index fa4c267abf5c..27541403796a 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanalayer.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanalayer.cpp
@@ -36,6 +36,7 @@
 #include <memory>
 
 #include "odbc/Exception.h"
+#include "odbc/PreparedStatement.h"
 #include "odbc/ResultSet.h"
 #include "odbc/Statement.h"
 #include "odbc/Types.h"
@@ -354,7 +355,7 @@ void OGRHanaLayer::BuildWhereClause()
             const GeometryColumnDescription &geomClmDesc =
                 geomColumns_[static_cast<std::size_t>(m_iGeomFieldFilter)];
             spatialFilter = BuildSpatialFilter(
-                dataSource_->GetMajorVersion(), *m_poFilterGeom,
+                dataSource_->GetHanaVersion().major(), *m_poFilterGeom,
                 geomClmDesc.name, geomClmDesc.srid);
         }
     }
@@ -776,48 +777,70 @@ OGRErr OGRHanaLayer::InitFeatureDefinition(const CPLString &schemaName,
 /*                         ReadGeometryExtent()                         */
 /************************************************************************/
 
-void OGRHanaLayer::ReadGeometryExtent(int geomField, OGREnvelope *extent)
+void OGRHanaLayer::ReadGeometryExtent(int geomField, OGREnvelope *extent,
+                                      int force)
 {
     EnsureInitialized();
 
     OGRGeomFieldDefn *geomFieldDef = featureDefn_->GetGeomFieldDefn(geomField);
     const char *clmName = geomFieldDef->GetNameRef();
-    int srid = GetGeometryColumnSrid(geomField);
-    CPLString sql;
-    if (dataSource_->IsSrsRoundEarth(srid))
+    odbc::PreparedStatementRef stmt;
+    if (!force && IsTableLayer())
     {
-        CPLString quotedClmName = QuotedIdentifier(clmName);
-        bool hasSrsPlanarEquivalent = dataSource_->HasSrsPlanarEquivalent(srid);
-        CPLString geomColumn =
-            !hasSrsPlanarEquivalent
-                ? quotedClmName
-                : CPLString().Printf("%s.ST_SRID(%d)", quotedClmName.c_str(),
-                                     ToPlanarSRID(srid));
-        CPLString columns = CPLString().Printf(
-            "MIN(%s.ST_XMin()), MIN(%s.ST_YMin()), MAX(%s.ST_XMax()), "
-            "MAX(%s.ST_YMax())",
-            geomColumn.c_str(), geomColumn.c_str(), geomColumn.c_str(),
-            geomColumn.c_str());
-        sql = BuildQuery(rawQuery_.c_str(), columns.c_str());
+        auto names = dataSource_->FindSchemaAndTableNames(rawQuery_.c_str());
+        stmt = dataSource_->PrepareStatement(
+            "SELECT MIN_X, MIN_Y, MAX_X, MAX_Y FROM "
+            "SYS.M_ST_GEOMETRY_COLUMNS WHERE SCHEMA_NAME=? AND TABLE_NAME=? "
+            "AND COLUMN_NAME=?");
+        stmt->setString(1, names.first == ""
+                               ? odbc::String(dataSource_->schemaName_)
+                               : odbc::String(names.first));
+        stmt->setString(2, odbc::String(names.second));
+        stmt->setString(3, odbc::String(clmName));
     }
     else
     {
-        CPLString columns = CPLString().Printf(
-            "ST_EnvelopeAggr(%s) AS ext", QuotedIdentifier(clmName).c_str());
-        CPLString subQuery = BuildQuery(rawQuery_.c_str(), columns);
-        sql = CPLString().Printf(
-            "SELECT ext.ST_XMin(),ext.ST_YMin(),ext.ST_XMax(),ext.ST_YMax() "
-            "FROM (%s)",
-            subQuery.c_str());
+        int srid = GetGeometryColumnSrid(geomField);
+        if (dataSource_->IsSrsRoundEarth(srid))
+        {
+            CPLString quotedClmName = QuotedIdentifier(clmName);
+            bool hasSrsPlanarEquivalent =
+                dataSource_->HasSrsPlanarEquivalent(srid);
+            CPLString geomColumn =
+                !hasSrsPlanarEquivalent
+                    ? quotedClmName
+                    : CPLString().Printf("%s.ST_SRID(%d)",
+                                         quotedClmName.c_str(),
+                                         ToPlanarSRID(srid));
+            CPLString columns = CPLString().Printf(
+                "MIN(%s.ST_XMin()), MIN(%s.ST_YMin()), MAX(%s.ST_XMax()), "
+                "MAX(%s.ST_YMax())",
+                geomColumn.c_str(), geomColumn.c_str(), geomColumn.c_str(),
+                geomColumn.c_str());
+            stmt = dataSource_->PrepareStatement(
+                BuildQuery(rawQuery_.c_str(), columns.c_str()));
+        }
+        else
+        {
+            CPLString columns =
+                CPLString().Printf("ST_EnvelopeAggr(%s) AS ext",
+                                   QuotedIdentifier(clmName).c_str());
+            CPLString subQuery = BuildQuery(rawQuery_.c_str(), columns);
+            stmt = dataSource_->PrepareStatement(CPLString().Printf(
+                "SELECT "
+                "ext.ST_XMin(),ext.ST_YMin(),ext.ST_XMax(),ext.ST_YMax() "
+                "FROM (%s)",
+                subQuery.c_str()));
+        }
     }
 
+    bool set = false;
     extent->MinX = 0.0;
     extent->MaxX = 0.0;
     extent->MinY = 0.0;
     extent->MaxY = 0.0;
 
-    odbc::StatementRef stmt = dataSource_->CreateStatement();
-    odbc::ResultSetRef rsExtent = stmt->executeQuery(sql.c_str());
+    odbc::ResultSetRef rsExtent = stmt->executeQuery();
     if (rsExtent->next())
     {
         odbc::Double val = rsExtent->getDouble(1);
@@ -827,9 +850,30 @@ void OGRHanaLayer::ReadGeometryExtent(int geomField, OGREnvelope *extent)
             extent->MinY = *rsExtent->getDouble(2);
             extent->MaxX = *rsExtent->getDouble(3);
             extent->MaxY = *rsExtent->getDouble(4);
+            set = true;
         }
     }
+
     rsExtent->close();
+    if (!set && !force)
+        ReadGeometryExtent(geomField, extent, true);
+}
+
+bool OGRHanaLayer::IsFastExtentAvailable()
+{
+    if (geomColumns_.empty())
+        return false;
+
+    switch (dataSource_->GetHanaVersion().major())
+    {
+        case 2:
+            return dataSource_->GetHanaVersion() >= HanaVersion(2, 0, 80);
+        case 4:
+            return dataSource_->GetHanaCloudVersion() >=
+                   HanaVersion(2024, 2, 0);
+    }
+
+    return false;
 }
 
 /************************************************************************/
@@ -866,7 +910,10 @@ OGRErr OGRHanaLayer::GetExtent(int iGeomField, OGREnvelope *extent, int force)
 
     try
     {
-        ReadGeometryExtent(iGeomField, extent);
+        if (!force)
+            force = !IsFastExtentAvailable();
+        ReadGeometryExtent(iGeomField, extent, force);
+
         return OGRERR_NONE;
     }
     catch (const std::exception &ex)
diff --git a/ogr/ogrsf_frmts/hana/ogrhanaresultlayer.cpp b/ogr/ogrsf_frmts/hana/ogrhanaresultlayer.cpp
index bb5c27ff9f38..6e0f0682c469 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanaresultlayer.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanaresultlayer.cpp
@@ -26,6 +26,7 @@
  * DEALINGS IN THE SOFTWARE.
  ****************************************************************************/
 
+#include "ogr_core.h"
 #include "ogr_hana.h"
 
 #include <memory>
@@ -69,9 +70,13 @@ OGRErr OGRHanaResultLayer::Initialize()
 
 int OGRHanaResultLayer::TestCapability(const char *capabilities)
 {
+    if (EQUAL(capabilities, OLCFastGetExtent))
+    {
+        EnsureInitialized();
+        return IsFastExtentAvailable();
+    }
     if (EQUAL(capabilities, OLCFastFeatureCount) ||
-        EQUAL(capabilities, OLCFastSpatialFilter) ||
-        EQUAL(capabilities, OLCFastGetExtent))
+        EQUAL(capabilities, OLCFastSpatialFilter))
     {
         EnsureInitialized();
         return (geomColumns_.size() > 0);
diff --git a/ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp b/ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp
index da1b81aaaf9e..61a4c933e7b1 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp
@@ -1149,7 +1149,7 @@ int OGRHanaTableLayer::TestCapability(const char *capabilities)
     if (EQUAL(capabilities, OLCFastGetExtent))
     {
         EnsureInitialized();
-        return !geomColumns_.empty();
+        return IsFastExtentAvailable();
     }
     if (EQUAL(capabilities, OLCCreateField))
         return updateMode_;
diff --git a/ogr/ogrsf_frmts/hana/ogrhanautils.cpp b/ogr/ogrsf_frmts/hana/ogrhanautils.cpp
index 9fbf6e402f45..0fe7b2d97d23 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanautils.cpp
+++ b/ogr/ogrsf_frmts/hana/ogrhanautils.cpp
@@ -27,12 +27,25 @@
  ****************************************************************************/
 
 #include "ogrhanautils.h"
+#include "cpl_string.h"
 
 #include <algorithm>
 
 namespace OGRHANA
 {
 
+HanaVersion HanaVersion::fromString(const char *version)
+{
+    CPLString splVersion(version);
+    splVersion.replaceAll('-', '.').replaceAll(' ', '.');
+
+    const CPLStringList parts(CSLTokenizeString2(splVersion, ".", 0));
+    if (parts.size() < 3)
+        return HanaVersion(0, 0, 0);
+
+    return HanaVersion(atoi(parts[0]), atoi(parts[1]), atoi(parts[2]));
+}
+
 const char *SkipLeadingSpaces(const char *value)
 {
     while (*value == ' ')
diff --git a/ogr/ogrsf_frmts/hana/ogrhanautils.h b/ogr/ogrsf_frmts/hana/ogrhanautils.h
index c064a7bbb7ac..ed038d0b3b80 100644
--- a/ogr/ogrsf_frmts/hana/ogrhanautils.h
+++ b/ogr/ogrsf_frmts/hana/ogrhanautils.h
@@ -42,6 +42,63 @@ namespace OGRHANA
 
 constexpr const char *ARRAY_VALUES_DELIMITER = "^%^";
 
+class HanaVersion
+{
+
+  public:
+    explicit HanaVersion(unsigned int major, unsigned int minor,
+                         unsigned int patch)
+        : components_{major, minor, patch}
+    {
+    }
+
+    HanaVersion() : components_{0, 0, 0}
+    {
+    }
+
+    unsigned int major() const
+    {
+        return components_[0];
+    }
+
+    unsigned int minor() const
+    {
+        return components_[1];
+    }
+
+    unsigned int patch() const
+    {
+        return components_[2];
+    }
+
+    bool operator<=(const HanaVersion &other)
+    {
+        for (size_t i = 0; i < 3; ++i)
+            if (components_[i] != other.components_[i])
+                return components_[i] < other.components_[i];
+        return true;
+    }
+
+    bool operator>=(const HanaVersion &other)
+    {
+        return !(*this <= other) || (*this == other);
+    }
+
+    bool operator==(const HanaVersion &other)
+    {
+        for (size_t i = 0; i < 3; ++i)
+            if (components_[i] != other.components_[i])
+                return false;
+        return true;
+    }
+
+  public:
+    static HanaVersion fromString(const char *str);
+
+  private:
+    unsigned int components_[3];
+};
+
 const char *SkipLeadingSpaces(const char *value);
 CPLString JoinStrings(const std::vector<CPLString> &strs, const char *delimiter,
                       CPLString (*decorator)(const CPLString &str) = nullptr);

From 77d19ac44c41ed2a041ac48e7f05d914bd8c8e2d Mon Sep 17 00:00:00 2001
From: Michael Scholz <michael.scholz@dlr.de>
Date: Mon, 5 Aug 2024 18:57:52 +0200
Subject: [PATCH 65/94] Implement handling of XML parsing errors

This requires dependency libOpenDRIVE to be increased to version 0.6.0.
---
 .github/workflows/ubuntu_20.04/Dockerfile.ci    | 2 +-
 .github/workflows/ubuntu_22.04/Dockerfile.ci    | 2 +-
 .github/workflows/ubuntu_24.04/Dockerfile.ci    | 2 +-
 doc/source/development/building_from_source.rst | 2 +-
 doc/source/drivers/vector/xodr.rst              | 2 +-
 docker/alpine-normal/Dockerfile                 | 2 +-
 docker/ubuntu-full/Dockerfile                   | 2 +-
 ogr/ogrsf_frmts/xodr/ogrxodrdatasource.cpp      | 9 +++++++++
 8 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ubuntu_20.04/Dockerfile.ci b/.github/workflows/ubuntu_20.04/Dockerfile.ci
index 89424ca0a80e..5501ea83dcb8 100644
--- a/.github/workflows/ubuntu_20.04/Dockerfile.ci
+++ b/.github/workflows/ubuntu_20.04/Dockerfile.ci
@@ -260,7 +260,7 @@ RUN mkdir sqlite \
     && rm -rf sqlite
 
 # Build libOpenDRIVE
-ARG OPENDRIVE_VERSION=0.5.0-gdal
+ARG OPENDRIVE_VERSION=0.6.0-gdal
 RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
     wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
     && tar xzf ${OPENDRIVE_VERSION}.tar.gz \
diff --git a/.github/workflows/ubuntu_22.04/Dockerfile.ci b/.github/workflows/ubuntu_22.04/Dockerfile.ci
index 711cb293cf15..d6db8850de46 100644
--- a/.github/workflows/ubuntu_22.04/Dockerfile.ci
+++ b/.github/workflows/ubuntu_22.04/Dockerfile.ci
@@ -106,7 +106,7 @@ RUN mkdir mongocxx \
     && rm -rf mongocxx
 
 # Build libOpenDRIVE
-ARG OPENDRIVE_VERSION=0.5.0-gdal
+ARG OPENDRIVE_VERSION=0.6.0-gdal
 RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
     wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
     && tar xzf ${OPENDRIVE_VERSION}.tar.gz \
diff --git a/.github/workflows/ubuntu_24.04/Dockerfile.ci b/.github/workflows/ubuntu_24.04/Dockerfile.ci
index b9465fc6c8fb..6839a077a1b1 100644
--- a/.github/workflows/ubuntu_24.04/Dockerfile.ci
+++ b/.github/workflows/ubuntu_24.04/Dockerfile.ci
@@ -107,7 +107,7 @@ RUN mkdir mongocxx \
     && rm -rf mongocxx
 
 # Build libOpenDRIVE
-ARG OPENDRIVE_VERSION=0.5.0-gdal
+ARG OPENDRIVE_VERSION=0.6.0-gdal
 RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
     wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
     && tar xzf ${OPENDRIVE_VERSION}.tar.gz \
diff --git a/doc/source/development/building_from_source.rst b/doc/source/development/building_from_source.rst
index aa18a4cea761..6a067888836e 100644
--- a/doc/source/development/building_from_source.rst
+++ b/doc/source/development/building_from_source.rst
@@ -1160,7 +1160,7 @@ It is used by the internal libtiff library or the :ref:`raster.zarr` driver.
 libOpenDRIVE
 ************
 
-`libOpenDRIVE <https://github.com/pageldev/libOpenDRIVE>`_ is required for the :ref:`vector.xodr` driver.
+`libOpenDRIVE <https://github.com/pageldev/libOpenDRIVE>`_ in version >= 0.6.0 is required for the :ref:`vector.xodr` driver.
 
 .. option:: OpenDrive_DIR
 
diff --git a/doc/source/drivers/vector/xodr.rst b/doc/source/drivers/vector/xodr.rst
index d1e526671767..1c2b0c7300f1 100644
--- a/doc/source/drivers/vector/xodr.rst
+++ b/doc/source/drivers/vector/xodr.rst
@@ -7,7 +7,7 @@ XODR -- OpenDRIVE Road Description Format
 
 .. shortname:: XODR
 
-.. build_dependencies:: libOpenDRIVE >= 0.5.0, GEOS
+.. build_dependencies:: libOpenDRIVE >= 0.6.0, GEOS
 
 This driver provides read access to road network elements of OpenDRIVE datasets.
 
diff --git a/docker/alpine-normal/Dockerfile b/docker/alpine-normal/Dockerfile
index d4f79ecdeb5e..fe2358f92c9e 100644
--- a/docker/alpine-normal/Dockerfile
+++ b/docker/alpine-normal/Dockerfile
@@ -114,7 +114,7 @@ RUN if test "${HDF4_VERSION}" != "" -a "$(uname -m)" = "x86_64"; then ( \
     ); fi
 
 # Build libOpenDRIVE
-ARG OPENDRIVE_VERSION=0.5.0-gdal
+ARG OPENDRIVE_VERSION=0.6.0-gdal
 RUN if test "${OPENDRIVE_VERSION}" != ""; then ( \
     wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
     && tar xzf ${OPENDRIVE_VERSION}.tar.gz \
diff --git a/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile
index 9beeb5f3898d..9b6355a9ec4f 100644
--- a/docker/ubuntu-full/Dockerfile
+++ b/docker/ubuntu-full/Dockerfile
@@ -173,7 +173,7 @@ RUN . /buildscripts/bh-set-envvars.sh \
     ); fi
 
 # Build libOpenDRIVE
-ARG OPENDRIVE_VERSION=0.5.0-gdal
+ARG OPENDRIVE_VERSION=0.6.0-gdal
 RUN . /buildscripts/bh-set-envvars.sh \
     && if test "${OPENDRIVE_VERSION}" != ""; then ( \
     wget -q https://github.com/DLR-TS/libOpenDRIVE/archive/refs/tags/${OPENDRIVE_VERSION}.tar.gz \
diff --git a/ogr/ogrsf_frmts/xodr/ogrxodrdatasource.cpp b/ogr/ogrsf_frmts/xodr/ogrxodrdatasource.cpp
index bf2f78e32779..13c7debb642a 100644
--- a/ogr/ogrsf_frmts/xodr/ogrxodrdatasource.cpp
+++ b/ogr/ogrsf_frmts/xodr/ogrxodrdatasource.cpp
@@ -35,6 +35,15 @@ using namespace std;
 bool OGRXODRDataSource::Open(const char *pszFilename, CSLConstList openOptions)
 {
     odr::OpenDriveMap xodr(pszFilename, false);
+    pugi::xml_parse_result parse_result = xodr.xml_parse_result;
+    if (!parse_result ||
+        parse_result.status != pugi::xml_parse_status::status_ok)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OpenDRIVE dataset %s could not be parsed: %s.", pszFilename,
+                 parse_result.description());
+        return FALSE;
+    }
     bool parsingFailed = xodr.xml_doc.child("OpenDRIVE").empty();
     if (parsingFailed)
     {

From 1d8b691d3491c6844176849276b61a6c42523e23 Mon Sep 17 00:00:00 2001
From: Michael Scholz <michael.scholz@dlr.de>
Date: Mon, 5 Aug 2024 19:21:40 +0200
Subject: [PATCH 66/94] Emphasize ASAM affiliation

As wished by ASAM e.V. because OpenDRIVE is officially their registered trademark
---
 doc/source/drivers/vector/xodr.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/source/drivers/vector/xodr.rst b/doc/source/drivers/vector/xodr.rst
index 1c2b0c7300f1..e95feb12eb25 100644
--- a/doc/source/drivers/vector/xodr.rst
+++ b/doc/source/drivers/vector/xodr.rst
@@ -9,9 +9,9 @@ XODR -- OpenDRIVE Road Description Format
 
 .. build_dependencies:: libOpenDRIVE >= 0.6.0, GEOS
 
-This driver provides read access to road network elements of OpenDRIVE datasets.
+This driver provides read access to road network elements of ASAM OpenDRIVE datasets.
 
-`OpenDRIVE <https://www.asam.net/standards/detail/opendrive/>`_ is an open industry format for lane-detailed description of road networks, commonly used in applications of the automotive and transportation systems domains. It bundles polynomial, continuous road geometry modelling with all necessary topological links and semantic information from traffic-regulating infrastructure (signs and traffic lights).
+`ASAM OpenDRIVE <https://www.asam.net/standards/detail/opendrive/>`_ is an open industry format for lane-detailed description of road networks, commonly used in applications of the automotive and transportation systems domains. It bundles polynomial, continuous road geometry modelling with all necessary topological links and semantic information from traffic-regulating infrastructure (signs and traffic lights).
 
 Driver capabilities
 -------------------

From 5b7fb448106ab249e27953476fb235176e6b492f Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart.louwers@gmail.com>
Date: Tue, 6 Aug 2024 12:48:21 +0200
Subject: [PATCH 67/94] Link to felt/tippecanoe

---
 doc/source/drivers/vector/mvt.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/drivers/vector/mvt.rst b/doc/source/drivers/vector/mvt.rst
index ce9a2d98e339..48bca8307de9 100644
--- a/doc/source/drivers/vector/mvt.rst
+++ b/doc/source/drivers/vector/mvt.rst
@@ -442,7 +442,7 @@ See Also:
 -  `Mapbox Vector Tile
    Specification <https://github.com/mapbox/vector-tile-spec>`__
 -  :ref:`MBTiles <raster.mbtiles>` driver
--  `tippecanoe <https://github.com/mapbox/tippecanoe>`__: Builds vector
+-  `tippecanoe <https://github.com/felt/tippecanoe>`__: Builds vector
    tilesets from large (or small) collections of GeoJSON, Geobuf, or CSV
    features
 -  `Links to tools dealing with Mapbox Vector

From d874c2af53cd0c977160908423e2fed88824f361 Mon Sep 17 00:00:00 2001
From: Johannes Quast <johannes.quast@sap.com>
Date: Tue, 6 Aug 2024 12:12:33 +0000
Subject: [PATCH 68/94] Remove flaky test

---
 autotest/ogr/ogr_hana.py | 53 +---------------------------------------
 1 file changed, 1 insertion(+), 52 deletions(-)

diff --git a/autotest/ogr/ogr_hana.py b/autotest/ogr/ogr_hana.py
index 391ce62cd4f1..479d6a85fdf4 100644
--- a/autotest/ogr/ogr_hana.py
+++ b/autotest/ogr/ogr_hana.py
@@ -1220,62 +1220,11 @@ def check_value(expected):
     check_value(vec1)
 
 
-###############################################################################
-# Verify a working fast extent implementation
-
-
-def test_ogr_hana_39():
-    conn = create_connection()
-
-    def delta_merge():
-        execute_sql(
-            conn,
-            f"MERGE DELTA OF {table_name}",
-        )
-
-    # Create test table
-    layer_name = get_test_name()
-    table_name = f'"{gdaltest.hana_schema_name}"."{layer_name}"'
-    execute_sql(
-        conn,
-        f"CREATE COLUMN TABLE {table_name} (id INT, geom ST_Geometry(4326)) NO AUTO MERGE",
-    )
-
-    # Insert points
-    points_wkt = ["POINT(0 0)", "POINT(10 0)", "POINT(40 0)"]
-    for id, wkt in enumerate(points_wkt):
-        execute_sql(
-            conn,
-            f"INSERT INTO {table_name} (id, geom) VALUES ({id}, ST_GeomFromText('{wkt}', 4326))",
-        )
-    delta_merge()
-
-    # Check extent (1.)
-    ds = open_datasource(0)
-    layer = ds.GetLayerByName(layer_name)
-    assert layer is not None, "did not get layer"
-    check_extent(layer, (0, 40, 0, 0), force=False)
-
-    # Delete outer most point...
-    # Because of the disabled delta merge, the extent should remain unchanged
-    # when the fast extent estimation is used.
-    execute_sql(
-        conn,
-        f"DELETE FROM {table_name} WHERE id=2",
-    )
-    check_extent(layer, (0, 40, 0, 0), force=False)
-    delta_merge()
-    check_extent(layer, (0, 10, 0, 0), force=False)
-
-    # Tear-down
-    execute_sql(conn, f"DROP TABLE {table_name}")
-
-
 ###############################################################################
 # Verify a working fallback in case the fast extent estimation fails
 
 
-def test_ogr_hana_40():
+def test_ogr_hana_39():
     conn = create_connection()
 
     # Create test table

From 7076c1db6e49e841933755563d6c31f6a0327d56 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 7 Aug 2024 15:47:24 +0200
Subject: [PATCH 69/94] PG/PGDump: make sure spatial index name is unique, even
 if several tables have a long enough prefix

Also truncates too long table name and append part of their MD5 to make
them unique.

Fixes #10522, #7629
---
 autotest/ogr/ogr_pg.py                        | 19 +++-
 autotest/ogr/ogr_pgdump.py                    | 67 +++++++++++--
 ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp        | 39 +++-----
 ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp        | 19 +---
 ogr/ogrsf_frmts/pgdump/ogr_pgdump.h           |  6 ++
 .../pgdump/ogrpgdumpdatasource.cpp            | 37 ++++----
 ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp     | 95 +++++++++++++++----
 7 files changed, 190 insertions(+), 92 deletions(-)

diff --git a/autotest/ogr/ogr_pg.py b/autotest/ogr/ogr_pg.py
index ea9c514e3a77..9c6b39eec499 100755
--- a/autotest/ogr/ogr_pg.py
+++ b/autotest/ogr/ogr_pg.py
@@ -5887,7 +5887,8 @@ def test_ogr_pg_field_comment(pg_ds):
 def test_ogr_pg_long_identifiers(pg_ds):
 
     long_name = "test_" + ("X" * 64) + "_long_name"
-    short_name = "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    short_name = "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_3ba7c630"
+    assert len(short_name) == 63
     with gdal.quiet_errors():
         lyr = pg_ds.CreateLayer(long_name)
     assert lyr.GetName() == short_name
@@ -5895,12 +5896,26 @@ def test_ogr_pg_long_identifiers(pg_ds):
     assert lyr.CreateFeature(f) == ogr.OGRERR_NONE
     assert lyr.SyncToDisk() == ogr.OGRERR_NONE
 
+    long_name2 = "test_" + ("X" * 64) + "_long_name2"
+    short_name2 = "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_bb4afe1c"
+    assert len(short_name2) == 63
+    with gdal.quiet_errors():
+        lyr = pg_ds.CreateLayer(long_name2)
+    assert lyr.GetName() == short_name2
+    f = ogr.Feature(lyr.GetLayerDefn())
+    assert lyr.CreateFeature(f) == ogr.OGRERR_NONE
+    assert lyr.SyncToDisk() == ogr.OGRERR_NONE
+
     pg_ds = reconnect(pg_ds, update=1)
 
-    got_lyr = pg_ds.GetLayerByName(long_name)
+    got_lyr = pg_ds.GetLayerByName(short_name)
     assert got_lyr
     assert got_lyr.GetName() == short_name
 
+    got_lyr = pg_ds.GetLayerByName(short_name2)
+    assert got_lyr
+    assert got_lyr.GetName() == short_name2
+
 
 ###############################################################################
 # Test extent 3D
diff --git a/autotest/ogr/ogr_pgdump.py b/autotest/ogr/ogr_pgdump.py
index 29de4208452a..7be8981c89e2 100755
--- a/autotest/ogr/ogr_pgdump.py
+++ b/autotest/ogr/ogr_pgdump.py
@@ -1484,17 +1484,72 @@ def check_and_remove(needle):
 # Test long identifiers
 
 
-def test_ogr_pgdump_long_identifiers(tmp_vsimem):
+@pytest.mark.parametrize(
+    "launder,long_name,geometry_name,short_name,pk_name,idx_name",
+    [
+        (
+            True,
+            "test_" + ("X" * (63 - len("test_"))),
+            "wkb_geometry",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_pk",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_a5a5c85f_0_geom_idx",
+        ),
+        (
+            True,
+            "test_" + ("X" * (63 - len("test_") - len("wkb_geometry") - 2)),
+            "wkb_geometry",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_pk",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_0_geom_idx",
+        ),
+        (
+            True,
+            "test_" + ("X" * 64) + "_long_name",
+            "wkb_geometry",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_3ba7c630",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_3ba7c_pk",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_05e1f255_0_geom_idx",
+        ),
+        (
+            True,
+            "test_" + ("X" * 64) + "_long_name2",
+            "wkb_geometry",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_bb4afe1c",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_bb4af_pk",
+            "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_950ad059_0_geom_idx",
+        ),
+        (
+            False,
+            "test_" + ("X" * 64) + "_long_name2",
+            "wkb_geometry",
+            "test_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX_bb4afe1c",
+            "test_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX_bb4af_pk",
+            "test_XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX_2c8a17fc_0_geom_idx",
+        ),
+    ],
+)
+def test_ogr_pgdump_long_identifiers(
+    tmp_vsimem, launder, long_name, geometry_name, short_name, pk_name, idx_name
+):
 
     ds = ogr.GetDriverByName("PGDump").CreateDataSource(
         tmp_vsimem / "test_ogr_pgdump_long_identifiers.sql", options=["LINEFORMAT=LF"]
     )
 
-    long_name = "test_" + ("X" * 64) + "_long_name"
-    short_name = "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+    assert len(short_name) <= 63
+    assert len(idx_name) <= 63
+    assert len(pk_name) <= 63
 
     with gdal.quiet_errors():
-        lyr = ds.CreateLayer(long_name, geom_type=ogr.wkbPoint)
+        lyr = ds.CreateLayer(
+            long_name,
+            geom_type=ogr.wkbPoint,
+            options=[
+                "LAUNDER=" + ("YES" if launder else "NO"),
+                "GEOMETRY_NAME=" + geometry_name,
+            ],
+        )
     lyr.CreateField(ogr.FieldDefn("str", ogr.OFTString))
     f = ogr.Feature(lyr.GetLayerDefn())
     f["str"] = "foo"
@@ -1515,10 +1570,10 @@ def check_and_remove(needle):
 
     check_and_remove(f"""CREATE TABLE "public"."{short_name}"();""")
     check_and_remove(
-        f"""ALTER TABLE "public"."{short_name}" ADD COLUMN "ogc_fid" SERIAL CONSTRAINT "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_pk" PRIMARY KEY;"""
+        f"""ALTER TABLE "public"."{short_name}" ADD COLUMN "ogc_fid" SERIAL CONSTRAINT "{pk_name}" PRIMARY KEY;"""
     )
     check_and_remove(
-        f"""CREATE INDEX "test_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx_wkb_geometry_geom_idx" ON "public"."{short_name}" USING GIST ("wkb_geometry");"""
+        f"""CREATE INDEX "{idx_name}" ON "public"."{short_name}" USING GIST ("wkb_geometry");"""
     )
 
 
diff --git a/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
index 1c2c6a93b8e0..6f76b85af036 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
@@ -1589,7 +1589,9 @@ OGRLayer *OGRPGDataSource::ICreateLayer(const char *pszLayerName,
             pszTableName = OGRPGCommonLaunderName(pszDotPos + 1, "PG",
                                                   bUTF8ToASCII);  // skip "."
         else
-            pszTableName = CPLStrdup(pszDotPos + 1);  // skip "."
+            pszTableName = CPLStrdup(
+                OGRPGCommonGenerateShortEnoughIdentifier(pszDotPos + 1)
+                    .c_str());  // skip "."
     }
     else
     {
@@ -1598,7 +1600,9 @@ OGRLayer *OGRPGDataSource::ICreateLayer(const char *pszLayerName,
             pszTableName = OGRPGCommonLaunderName(pszLayerName, "PG",
                                                   bUTF8ToASCII);  // skip "."
         else
-            pszTableName = CPLStrdup(pszLayerName);  // skip "."
+            pszTableName =
+                CPLStrdup(OGRPGCommonGenerateShortEnoughIdentifier(pszLayerName)
+                              .c_str());  // skip "."
     }
 
     /* -------------------------------------------------------------------- */
@@ -1936,32 +1940,11 @@ OGRLayer *OGRPGDataSource::ICreateLayer(const char *pszLayerName,
 
         if (eType != wkbNone && bHavePostGIS && bCreateSpatialIndex)
         {
-            /* --------------------------------------------------------------------
-             */
-            /*      Create the spatial index. */
-            /*                                                                      */
-            /*      We're doing this before we add geometry and record to the
-             * table */
-            /*      so this may not be exactly the best way to do it. */
-            /* --------------------------------------------------------------------
-             */
-            std::string osIndexName(pszTableName);
-            std::string osSuffix("_");
-            osSuffix += pszGFldName;
-            osSuffix += "_geom_idx";
-            if (bLaunder)
-            {
-                if (osSuffix.size() >=
-                    static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                {
-                    osSuffix = "_0_geom_idx";
-                }
-                if (osIndexName.size() + osSuffix.size() >
-                    static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                    osIndexName.resize(OGR_PG_NAMEDATALEN - 1 -
-                                       osSuffix.size());
-            }
-            osIndexName += osSuffix;
+            // Create the spatial index.
+            // We're doing this before we add geometry and record to the
+            // table, so this may not be exactly the best way to do it.
+            const std::string osIndexName(OGRPGCommonGenerateSpatialIndexName(
+                pszTableName, pszGFldName, 0));
 
             osCommand.Printf("CREATE INDEX %s ON %s.%s USING %s (%s)",
                              OGRPGEscapeColumnName(osIndexName.c_str()).c_str(),
diff --git a/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp b/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp
index 27883d8877b6..69776e7ad6fa 100644
--- a/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp
+++ b/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp
@@ -2536,23 +2536,8 @@ OGRPGTableLayer::RunCreateSpatialIndex(const OGRPGGeomFieldDefn *poGeomField,
     PGconn *hPGConn = poDS->GetPGConn();
     CPLString osCommand;
 
-    std::string osIndexName(pszTableName);
-    std::string osSuffix("_");
-    osSuffix += poGeomField->GetNameRef();
-    osSuffix += "_geom_idx";
-    if (bLaunderColumnNames)
-    {
-        if (osSuffix.size() >= static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-        {
-            osSuffix = "_";
-            osSuffix += CPLSPrintf("%d", nIdx);
-            osSuffix += "_geom_idx";
-        }
-        if (osIndexName.size() + osSuffix.size() >
-            static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-            osIndexName.resize(OGR_PG_NAMEDATALEN - 1 - osSuffix.size());
-    }
-    osIndexName += osSuffix;
+    const std::string osIndexName(OGRPGCommonGenerateSpatialIndexName(
+        pszTableName, poGeomField->GetNameRef(), nIdx));
 
     osCommand.Printf("CREATE INDEX %s ON %s USING %s (%s)",
                      OGRPGEscapeColumnName(osIndexName.c_str()).c_str(),
diff --git a/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h b/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h
index 910f99404486..0201bff52c4a 100644
--- a/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h
+++ b/ogr/ogrsf_frmts/pgdump/ogr_pgdump.h
@@ -72,6 +72,12 @@ char CPL_DLL *OGRPGCommonLaunderName(const char *pszSrcName,
                                      const char *pszDebugPrefix,
                                      bool bUTF8ToASCII);
 
+std::string CPL_DLL
+OGRPGCommonGenerateShortEnoughIdentifier(const char *pszIdentifier);
+
+std::string CPL_DLL OGRPGCommonGenerateSpatialIndexName(
+    const char *pszTableName, const char *pszGeomFieldName, int nGeomFieldIdx);
+
 /************************************************************************/
 /*                        OGRPGDumpGeomFieldDefn                        */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp b/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp
index b4edaafd5756..d6dee8170db7 100644
--- a/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp
+++ b/ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp
@@ -30,6 +30,7 @@
 #include <cstring>
 #include "ogr_pgdump.h"
 #include "cpl_conv.h"
+#include "cpl_md5.h"
 #include "cpl_string.h"
 
 /************************************************************************/
@@ -148,6 +149,16 @@ char *OGRPGCommonLaunderName(const char *pszSrcName, const char *pszDebugPrefix,
             }
         }
     }
+
+    if (i == OGR_PG_NAMEDATALEN - 1 && pszSafeName[i] != '\0' &&
+        pszSafeName[i + 1] != '\0')
+    {
+        constexpr int FIRST_8_CHARS_OF_MD5 = 8;
+        pszSafeName[i - FIRST_8_CHARS_OF_MD5 - 1] = '_';
+        memcpy(pszSafeName + i - FIRST_8_CHARS_OF_MD5, CPLMD5String(pszSrcName),
+               FIRST_8_CHARS_OF_MD5);
+    }
+
     pszSafeName[i] = '\0';
 
     if (strcmp(pszSrcName, pszSafeName) != 0)
@@ -274,7 +285,8 @@ OGRPGDumpDataSource::ICreateLayer(const char *pszLayerName,
             CPLFree(pszTmp);
         }
         else
-            osTable = pszDotPos + 1;  // skip "."
+            osTable = OGRPGCommonGenerateShortEnoughIdentifier(pszDotPos +
+                                                               1);  // skip "."
     }
     else
     {
@@ -286,7 +298,7 @@ OGRPGDumpDataSource::ICreateLayer(const char *pszLayerName,
             CPLFree(pszTmp);
         }
         else
-            osTable = pszLayerName;
+            osTable = OGRPGCommonGenerateShortEnoughIdentifier(pszLayerName);
     }
 
     const std::string osTableEscaped =
@@ -498,8 +510,8 @@ OGRPGDumpDataSource::ICreateLayer(const char *pszLayerName,
     if (bCreateTable && !osFIDColumnName.empty())
     {
         std::string osConstraintName(osTable);
-        if (bLaunder && osConstraintName.size() + strlen("_pk") >
-                            static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
+        if (osConstraintName.size() + strlen("_pk") >
+            static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
         {
             osConstraintName.resize(OGR_PG_NAMEDATALEN - 1 - strlen("_pk"));
         }
@@ -592,21 +604,8 @@ OGRPGDumpDataSource::ICreateLayer(const char *pszLayerName,
     std::vector<std::string> aosSpatialIndexCreationCommands;
     if (bCreateTable && bCreateSpatialIndex && pszGFldName && eType != wkbNone)
     {
-        std::string osIndexName(osTable);
-        std::string osSuffix("_");
-        osSuffix += pszGFldName;
-        osSuffix += "_geom_idx";
-        if (bLaunder)
-        {
-            if (osSuffix.size() >= static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-            {
-                osSuffix = "_0_geom_idx";
-            }
-            if (osIndexName.size() + osSuffix.size() >
-                static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                osIndexName.resize(OGR_PG_NAMEDATALEN - 1 - osSuffix.size());
-        }
-        osIndexName += osSuffix;
+        const std::string osIndexName(OGRPGCommonGenerateSpatialIndexName(
+            osTable.c_str(), pszGFldName, 0));
 
         /* --------------------------------------------------------------- */
         /*      Create the spatial index.                                  */
diff --git a/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp b/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
index e8d07f811445..36053c48709d 100644
--- a/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
+++ b/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
@@ -28,6 +28,7 @@
 
 #include "ogr_pgdump.h"
 #include "cpl_conv.h"
+#include "cpl_md5.h"
 #include "cpl_string.h"
 #include "ogr_p.h"
 
@@ -1554,6 +1555,77 @@ CPLString OGRPGCommonLayerGetPGDefault(OGRFieldDefn *poFieldDefn)
     return osRet;
 }
 
+/************************************************************************/
+/*                OGRPGCommonGenerateShortEnoughIdentifier()            */
+/************************************************************************/
+
+std::string OGRPGCommonGenerateShortEnoughIdentifier(const char *pszIdentifier)
+{
+    if (strlen(pszIdentifier) <= static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
+        return pszIdentifier;
+
+    constexpr int FIRST_8_CHARS_OF_MD5 = 8;
+    std::string osRet(pszIdentifier,
+                      OGR_PG_NAMEDATALEN - 1 - 1 - FIRST_8_CHARS_OF_MD5);
+    osRet += '_';
+    osRet += std::string(CPLMD5String(pszIdentifier), FIRST_8_CHARS_OF_MD5);
+    return osRet;
+}
+
+/************************************************************************/
+/*                 OGRPGCommonGenerateSpatialIndexName()                 */
+/************************************************************************/
+
+/** Generates the name of the spatial index on table pszTableName
+ * using pszGeomFieldName, such that it fits in OGR_PG_NAMEDATALEN - 1 bytes.
+ * The index of the geometry field may be used if the geometry field name
+ * is too long.
+ */
+std::string OGRPGCommonGenerateSpatialIndexName(const char *pszTableName,
+                                                const char *pszGeomFieldName,
+                                                int nGeomFieldIdx)
+{
+    // Nominal case: use full table and geometry field name
+    for (const char *pszSuffix : {"_geom_idx", "_idx"})
+    {
+        if (strlen(pszTableName) + 1 + strlen(pszGeomFieldName) +
+                strlen(pszSuffix) <=
+            static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
+        {
+            std::string osRet(pszTableName);
+            osRet += '_';
+            osRet += pszGeomFieldName;
+            osRet += pszSuffix;
+            return osRet;
+        }
+    }
+
+    // Slightly degraded case: use table name and geometry field index
+    const std::string osGeomFieldIdx(CPLSPrintf("%d", nGeomFieldIdx));
+    if (strlen(pszTableName) + 1 + osGeomFieldIdx.size() +
+            strlen("_geom_idx") <=
+        static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
+    {
+        std::string osRet(pszTableName);
+        osRet += '_';
+        osRet += osGeomFieldIdx;
+        osRet += "_geom_idx";
+        return osRet;
+    }
+
+    // Fallback case: use first characters of table name,
+    // first 8 chars of its MD5 and then the geometry field index.
+    constexpr int FIRST_8_CHARS_OF_MD5 = 8;
+    std::string osSuffix("_");
+    osSuffix += std::string(CPLMD5String(pszTableName), FIRST_8_CHARS_OF_MD5);
+    osSuffix += '_';
+    osSuffix += osGeomFieldIdx;
+    osSuffix += "_geom_idx";
+    std::string osRet(pszTableName, OGR_PG_NAMEDATALEN - 1 - osSuffix.size());
+    osRet += osSuffix;
+    return osRet;
+}
+
 /************************************************************************/
 /*                           GetNextFeature()                           */
 /************************************************************************/
@@ -1812,26 +1884,9 @@ OGRErr OGRPGDumpLayer::CreateGeomField(const OGRGeomFieldDefn *poGeomFieldIn,
 
         if (m_bCreateSpatialIndexFlag)
         {
-            std::string osIndexName(GetName());
-            std::string osSuffix("_");
-            osSuffix += poGeomField->GetNameRef();
-            osSuffix += "_geom_idx";
-            if (m_bLaunderColumnNames)
-            {
-                if (osSuffix.size() >=
-                    static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                {
-                    osSuffix = "_";
-                    osSuffix +=
-                        CPLSPrintf("%d", m_poFeatureDefn->GetGeomFieldCount());
-                    osSuffix += "_geom_idx";
-                }
-                if (osIndexName.size() + osSuffix.size() >
-                    static_cast<size_t>(OGR_PG_NAMEDATALEN - 1))
-                    osIndexName.resize(OGR_PG_NAMEDATALEN - 1 -
-                                       osSuffix.size());
-            }
-            osIndexName += osSuffix;
+            const std::string osIndexName(OGRPGCommonGenerateSpatialIndexName(
+                GetName(), poGeomField->GetNameRef(),
+                m_poFeatureDefn->GetGeomFieldCount()));
 
             osCommand.Printf(
                 "CREATE INDEX %s ON %s USING %s (%s)",

From fd9748ebb3a1cf1e622b414da4ab92dcaa5498e4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 7 Aug 2024 17:13:03 +0200
Subject: [PATCH 70/94] LIBKML writer: set name of NetworkLink from NAME layer
 creation option

Fixes #10507

And, on reading of directory KML datasets, don't consider the root doc.kml as a layer
---
 autotest/ogr/ogr_libkml.py                    | 19 +++++++++++
 doc/source/drivers/vector/libkml.rst          |  3 +-
 .../libkml/ogrlibkmldatasource.cpp            | 32 +++++++++++++++----
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/autotest/ogr/ogr_libkml.py b/autotest/ogr/ogr_libkml.py
index cc32eb283013..1f12e68f5d32 100755
--- a/autotest/ogr/ogr_libkml.py
+++ b/autotest/ogr/ogr_libkml.py
@@ -1841,6 +1841,25 @@ def test_ogr_libkml_write_container_properties(tmp_vsimem):
     )
 
 
+###############################################################################
+# Test effect of NAME layer creation option
+
+
+@pytest.mark.parametrize("filename", ["out_dir", "out.kml", "out.kmz"])
+def test_ogr_libkml_name_layer_creation_option(tmp_vsimem, filename):
+
+    ds = ogr.GetDriverByName("LIBKML").CreateDataSource(tmp_vsimem / filename)
+    ds.CreateLayer(
+        "test",
+        options=["NAME=lyr_name"],
+    )
+    ds = None
+
+    ds = ogr.Open(tmp_vsimem / filename)
+    lyr = ds.GetLayer(0)
+    assert lyr.GetName() == "lyr_name"
+
+
 ###############################################################################
 # Test reading gx:TimeStamp and gx:TimeSpan
 
diff --git a/doc/source/drivers/vector/libkml.rst b/doc/source/drivers/vector/libkml.rst
index fb04a1953dec..ee7ac9114270 100644
--- a/doc/source/drivers/vector/libkml.rst
+++ b/doc/source/drivers/vector/libkml.rst
@@ -420,7 +420,8 @@ options :
 -  .. lco:: NAME
 
       `<name> <https://developers.google.com/kml/documentation/kmlreference#name>`__
-      element
+      element. Also used to set the name of the NetworkLink pointing to the layer,
+      starting with GDAL 3.10
 
 -  .. lco:: VISIBILITY
 
diff --git a/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp b/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
index 5cf1c16b394e..de6832bcb482 100644
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
@@ -1300,10 +1300,16 @@ int OGRLIBKMLDataSource::OpenKmz(const char *pszFilename, int bUpdateIn)
                 }
 
                 /***** create the layer *****/
-                AddLayer(CPLGetBasename(oKmlHref.get_path().c_str()),
-                         wkbUnknown, nullptr, this, std::move(poKmlLyrRoot),
-                         poKmlLyrContainer, oKmlHref.get_path().c_str(), FALSE,
-                         bUpdateIn, static_cast<int>(nKmlFeatures));
+                const std::string osLayerName =
+                    poKmlNetworkLink->has_name()
+                        ? poKmlNetworkLink->get_name()
+                        : std::string(
+                              CPLGetBasename(oKmlHref.get_path().c_str()));
+
+                AddLayer(osLayerName.c_str(), wkbUnknown, nullptr, this,
+                         std::move(poKmlLyrRoot), poKmlLyrContainer,
+                         oKmlHref.get_path().c_str(), FALSE, bUpdateIn,
+                         static_cast<int>(nKmlFeatures));
 
                 /***** check if any features are another layer *****/
                 ParseLayers(std::move(poKmlLyrContainer), true);
@@ -1453,8 +1459,19 @@ int OGRLIBKMLDataSource::OpenDir(const char *pszFilename, int bUpdateIn)
             continue;
         }
 
+        // Root document generated by ourselves. Contains nothing of interest
+        if (poKmlContainer->has_id() && poKmlContainer->get_id() == "root_doc")
+        {
+            continue;
+        }
+
+        const std::string osLayerName =
+            poKmlContainer->has_name()
+                ? poKmlContainer->get_name()
+                : std::string(CPLGetBasename(osFilePath.c_str()));
+
         /***** create the layer *****/
-        AddLayer(CPLGetBasename(osFilePath.c_str()), wkbUnknown, nullptr, this,
+        AddLayer(osLayerName.c_str(), wkbUnknown, nullptr, this,
                  std::move(poKmlRoot), poKmlContainer, osFilePath.c_str(),
                  FALSE, bUpdateIn, nFiles);
 
@@ -2195,7 +2212,7 @@ OGRLIBKMLLayer *OGRLIBKMLDataSource::CreateLayerKml(
 
 OGRLIBKMLLayer *OGRLIBKMLDataSource::CreateLayerKmz(
     const char *pszLayerName, const OGRSpatialReference *poSRS,
-    OGRwkbGeometryType eGType, CSLConstList /* papszOptions */)
+    OGRwkbGeometryType eGType, CSLConstList papszOptions)
 {
     DocumentPtr poKmlDocument = nullptr;
 
@@ -2210,6 +2227,9 @@ OGRLIBKMLLayer *OGRLIBKMLDataSource::CreateLayerKmz(
             poKmlDocument = AsDocument(m_poKmlDocKml);
 
             NetworkLinkPtr poKmlNetLink = m_poKmlFactory->CreateNetworkLink();
+            poKmlNetLink->set_name(
+                CSLFetchNameValueDef(papszOptions, "NAME", pszLayerName));
+
             LinkPtr poKmlLink = m_poKmlFactory->CreateLink();
 
             std::string oHref;

From 9a8b9077a04972a926313ebd669a86e9d4e0581a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 7 Aug 2024 17:31:13 +0200
Subject: [PATCH 71/94] OGRSQL: return in error when 'Did not find
 end-of-string character' is emitted

Fixes #10515
---
 autotest/ogr/ogr_sql_rfc28.py | 7 +++----
 ogr/swq.cpp                   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/autotest/ogr/ogr_sql_rfc28.py b/autotest/ogr/ogr_sql_rfc28.py
index 6b54af821e2b..0fa8d763bf73 100755
--- a/autotest/ogr/ogr_sql_rfc28.py
+++ b/autotest/ogr/ogr_sql_rfc28.py
@@ -741,12 +741,11 @@ def test_ogr_rfc28_union_all_three_branch_and(data_ds):
 # Test lack of end-of-string character
 
 
+@gdaltest.enable_exceptions()
 def test_ogr_rfc28_33(data_ds):
 
-    with gdal.quiet_errors():
-        lyr = data_ds.ExecuteSQL("select * from idlink where name='foo")
-
-    assert lyr is None
+    with pytest.raises(Exception, match="Did not find end-of-string character"):
+        data_ds.ExecuteSQL("select * from idlink'")
 
 
 ###############################################################################
diff --git a/ogr/swq.cpp b/ogr/swq.cpp
index 38d983d42489..045e6ace1db9 100644
--- a/ogr/swq.cpp
+++ b/ogr/swq.cpp
@@ -142,7 +142,7 @@ int swqlex(YYSTYPE *ppNode, swq_parse_context *context)
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Did not find end-of-string character");
             CPLFree(token);
-            return 0;
+            return YYerror;
         }
 
         *ppNode = new swq_expr_node(token);

From a137cc6198c474a13ca9a7a2076fc14a4df3d3a2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 7 Aug 2024 19:03:19 +0200
Subject: [PATCH 72/94] COG: properly deal with mask bands w.r.t resampling
 when generating JPEG output, or when input has a mask band

Fixes regression introduced in 3.5 per 383f727fc1f

Fixes #10536
---
 autotest/gcore/cog.py              | 29 +++++++++++++++++++++++++++++
 frmts/gtiff/cogdriver.cpp          | 30 ++++++++++++++++++------------
 frmts/gtiff/gt_overview.cpp        | 14 +++++++++++---
 frmts/gtiff/gt_overview.h          |  3 ++-
 frmts/gtiff/gtiffdataset_write.cpp |  5 +++--
 5 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/autotest/gcore/cog.py b/autotest/gcore/cog.py
index dc76fa994306..3e97af03937e 100755
--- a/autotest/gcore/cog.py
+++ b/autotest/gcore/cog.py
@@ -1922,3 +1922,32 @@ def test_cog_stats(tmp_vsimem, nbands, co, src_has_stats, expected_val):
     if expected_val and ds.RasterCount == 2:
         assert ds.GetRasterBand(2).GetMetadataItem("STATISTICS_MINIMUM") == "255"
     ds = None
+
+
+###############################################################################
+
+
+def test_cog_mask_band_overviews(tmp_vsimem):
+
+    """Test bugfix for https://github.com/OSGeo/gdal/issues/10536"""
+
+    filename = str(tmp_vsimem / "out.tif")
+    with gdal.config_option("COG_DELETE_TEMP_FILES", "NO"):
+        gdal.Translate(
+            filename,
+            "data/stefan_full_rgba.tif",
+            options="-co RESAMPLING=LANCZOS -co OVERVIEW_COUNT=3 -of COG -outsize 1024 0 -b 1 -b 2 -b 3 -mask 4",
+        )
+
+    ds = gdal.Open(filename)
+    assert [ds.GetRasterBand(i + 1).GetOverview(2).Checksum() for i in range(3)] == [
+        51556,
+        39258,
+        23928,
+    ]
+
+    ds = gdal.Open(filename + ".msk.ovr.tmp")
+    assert ds.GetMetadataItem("INTERNAL_MASK_FLAGS_1") == "2"
+    assert ds.GetRasterBand(1).IsMaskBand()
+    assert ds.GetRasterBand(1).GetOverview(0).IsMaskBand()
+    assert ds.GetRasterBand(1).GetOverview(1).IsMaskBand()
diff --git a/frmts/gtiff/cogdriver.cpp b/frmts/gtiff/cogdriver.cpp
index 063742b421d5..f5c5045ac212 100644
--- a/frmts/gtiff/cogdriver.cpp
+++ b/frmts/gtiff/cogdriver.cpp
@@ -737,19 +737,25 @@ GDALCOGCreator::~GDALCOGCreator()
     // may reference the later
     m_poRGBMaskDS.reset();
 
-    if (m_poReprojectedDS)
+    // Config option just for testing purposes
+    const bool bDeleteTempFiles =
+        CPLTestBool(CPLGetConfigOption("COG_DELETE_TEMP_FILES", "YES"));
+    if (bDeleteTempFiles)
     {
-        CPLString osProjectedDSName(m_poReprojectedDS->GetDescription());
-        m_poReprojectedDS.reset();
-        VSIUnlink(osProjectedDSName);
-    }
-    if (!m_osTmpOverviewFilename.empty())
-    {
-        VSIUnlink(m_osTmpOverviewFilename);
-    }
-    if (!m_osTmpMskOverviewFilename.empty())
-    {
-        VSIUnlink(m_osTmpMskOverviewFilename);
+        if (m_poReprojectedDS)
+        {
+            CPLString osProjectedDSName(m_poReprojectedDS->GetDescription());
+            m_poReprojectedDS.reset();
+            VSIUnlink(osProjectedDSName);
+        }
+        if (!m_osTmpOverviewFilename.empty())
+        {
+            VSIUnlink(m_osTmpOverviewFilename);
+        }
+        if (!m_osTmpMskOverviewFilename.empty())
+        {
+            VSIUnlink(m_osTmpMskOverviewFilename);
+        }
     }
 }
 
diff --git a/frmts/gtiff/gt_overview.cpp b/frmts/gtiff/gt_overview.cpp
index 723837809135..b55c4319f3a2 100644
--- a/frmts/gtiff/gt_overview.cpp
+++ b/frmts/gtiff/gt_overview.cpp
@@ -207,7 +207,8 @@ toff_t GTIFFWriteDirectory(TIFF *hTIFF, int nSubfileType, int nXSize,
 /************************************************************************/
 
 void GTIFFBuildOverviewMetadata(const char *pszResampling,
-                                GDALDataset *poBaseDS, CPLString &osMetadata)
+                                GDALDataset *poBaseDS, bool bIsForMaskBand,
+                                CPLString &osMetadata)
 
 {
     osMetadata = "<GDALMetadata>";
@@ -220,7 +221,11 @@ void GTIFFBuildOverviewMetadata(const char *pszResampling,
         osMetadata += "</Item>";
     }
 
-    if (poBaseDS->GetMetadataItem("INTERNAL_MASK_FLAGS_1"))
+    if (bIsForMaskBand)
+    {
+        osMetadata += "<Item name=\"INTERNAL_MASK_FLAGS_1\">2</Item>";
+    }
+    else if (poBaseDS->GetMetadataItem("INTERNAL_MASK_FLAGS_1"))
     {
         for (int iBand = 0; iBand < 200; iBand++)
         {
@@ -797,7 +802,10 @@ CPLErr GTIFFBuildOverviewsEx(const char *pszFilename, int nBands,
     GDALDataset *poBaseDS = papoBandList[0]->GetDataset();
     if (poBaseDS)
     {
-        GTIFFBuildOverviewMetadata(pszResampling, poBaseDS, osMetadata);
+        const bool bIsForMaskBand =
+            nBands == 1 && papoBandList[0]->IsMaskBand();
+        GTIFFBuildOverviewMetadata(pszResampling, poBaseDS, bIsForMaskBand,
+                                   osMetadata);
     }
 
     if (poBaseDS != nullptr && poBaseDS->GetRasterCount() == nBands)
diff --git a/frmts/gtiff/gt_overview.h b/frmts/gtiff/gt_overview.h
index 9014662e67c7..5b56f4929ef2 100644
--- a/frmts/gtiff/gt_overview.h
+++ b/frmts/gtiff/gt_overview.h
@@ -53,7 +53,8 @@ toff_t GTIFFWriteDirectory(TIFF *hTIFF, int nSubfileType, int nXSize,
                            bool bDeferStrileArrayWriting);
 
 void GTIFFBuildOverviewMetadata(const char *pszResampling,
-                                GDALDataset *poBaseDS, CPLString &osMetadata);
+                                GDALDataset *poBaseDS, bool bIsForMaskBand,
+                                CPLString &osMetadata);
 
 CPLErr GTIFFBuildOverviewsEx(const char *pszFilename, int nBands,
                              GDALRasterBand *const *papoBandList,
diff --git a/frmts/gtiff/gtiffdataset_write.cpp b/frmts/gtiff/gtiffdataset_write.cpp
index 01ee5fbab966..402368800c82 100644
--- a/frmts/gtiff/gtiffdataset_write.cpp
+++ b/frmts/gtiff/gtiffdataset_write.cpp
@@ -2803,7 +2803,7 @@ CPLErr GTiffDataset::CreateOverviewsFromSrcOverviews(GDALDataset *poSrcDS,
     /* -------------------------------------------------------------------- */
     CPLString osMetadata;
 
-    GTIFFBuildOverviewMetadata("NONE", this, osMetadata);
+    GTIFFBuildOverviewMetadata("NONE", this, false, osMetadata);
 
     int nCompression;
     uint16_t nPlanarConfig;
@@ -3094,7 +3094,8 @@ CPLErr GTiffDataset::IBuildOverviews(const char *pszResampling, int nOverviews,
     /* -------------------------------------------------------------------- */
     CPLString osMetadata;
 
-    GTIFFBuildOverviewMetadata(pszResampling, this, osMetadata);
+    const bool bIsForMaskBand = nBands == 1 && GetRasterBand(1)->IsMaskBand();
+    GTIFFBuildOverviewMetadata(pszResampling, this, bIsForMaskBand, osMetadata);
 
     int nCompression;
     uint16_t nPlanarConfig;

From 6e9fe041b56665145bf5afb7633035217390fb0d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Aug 2024 16:24:34 +0200
Subject: [PATCH 73/94] Fix -Wnull-dereference warnings of gcc 14.2

---
 alg/gdalsievefilter.cpp | 5 +----
 frmts/jpegxl/jpegxl.cpp | 3 ++-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/alg/gdalsievefilter.cpp b/alg/gdalsievefilter.cpp
index cf20d13d4d15..5d11f97105a7 100644
--- a/alg/gdalsievefilter.cpp
+++ b/alg/gdalsievefilter.cpp
@@ -369,7 +369,7 @@ CPLErr CPL_STDCALL GDALSieveFilter(GDALRasterBandH hSrcBand,
     std::vector<int> anBigNeighbour;
     try
     {
-        anBigNeighbour.resize(anPolySizes.size());
+        anBigNeighbour.resize(anPolySizes.size(), -1);
     }
     catch (const std::exception &)
     {
@@ -378,9 +378,6 @@ CPLErr CPL_STDCALL GDALSieveFilter(GDALRasterBandH hSrcBand,
         return CE_Failure;
     }
 
-    for (int iPoly = 0; iPoly < static_cast<int>(anPolySizes.size()); iPoly++)
-        anBigNeighbour[iPoly] = -1;
-
     /* ==================================================================== */
     /*      Second pass ... identify the largest neighbour for each         */
     /*      polygon.                                                        */
diff --git a/frmts/jpegxl/jpegxl.cpp b/frmts/jpegxl/jpegxl.cpp
index b160978da7fc..17b6ba51dc6a 100644
--- a/frmts/jpegxl/jpegxl.cpp
+++ b/frmts/jpegxl/jpegxl.cpp
@@ -1838,7 +1838,8 @@ GDALDataset *JPEGXLDataset::CreateCopy(const char *pszFilename,
                                    nJPEGXLContent);
 
                 size_t nInsertPos = 0;
-                if (abyData[0] == 0xff && abyData[1] == 0x0a)
+                if (abyData.size() >= 2 && abyData[0] == 0xff &&
+                    abyData[1] == 0x0a)
                 {
                     // If we get a "naked" codestream, insert it into a
                     // ISOBMFF-based container

From d70ed332a3b9bd8a166020c0ce7c65ce2760b988 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 8 Aug 2024 16:32:43 +0200
Subject: [PATCH 74/94] Internal shapelib: resync with upstream

---
 ogr/ogrsf_frmts/shape/dbfopen.c   | 26 +++++++++++++++++---------
 ogr/ogrsf_frmts/shape/sbnsearch.c |  2 +-
 ogr/ogrsf_frmts/shape/shapefil.h  |  4 ++--
 ogr/ogrsf_frmts/shape/shpopen.c   |  2 +-
 ogr/ogrsf_frmts/shape/shptree.c   |  2 +-
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/ogr/ogrsf_frmts/shape/dbfopen.c b/ogr/ogrsf_frmts/shape/dbfopen.c
index bbbcea1d7525..ea0f06728ef2 100644
--- a/ogr/ogrsf_frmts/shape/dbfopen.c
+++ b/ogr/ogrsf_frmts/shape/dbfopen.c
@@ -6,7 +6,7 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
- * Copyright (c) 2012-2019, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2012-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************/
@@ -481,7 +481,7 @@ DBFHandle SHPAPI_CALL DBFOpenLL(const char *pszFilename, const char *pszAccess,
 
     for (int iField = 0; iField < nFields; iField++)
     {
-        unsigned char *pabyFInfo = pabyBuf + iField * XBASE_FLDHDR_SZ;
+        const unsigned char *pabyFInfo = pabyBuf + iField * XBASE_FLDHDR_SZ;
         if (pabyFInfo[0] == HEADER_RECORD_TERMINATOR)
         {
             psDBF->nFields = iField;
@@ -1119,7 +1119,7 @@ SHPDate SHPAPI_CALL DBFReadDateAttribute(DBFHandle psDBF, int iRecord,
 /*      Return TRUE if the passed string is NULL.                       */
 /************************************************************************/
 
-static bool DBFIsValueNULL(char chType, const char *pszValue)
+static bool DBFIsValueNULL(char chType, const char *pszValue, int size)
 {
     if (pszValue == SHPLIB_NULLPTR)
         return true;
@@ -1144,14 +1144,19 @@ static bool DBFIsValueNULL(char chType, const char *pszValue)
             return true;
 
         case 'D':
-            /* NULL date fields have value "00000000" */
+            /* NULL date fields have value "00000000" or "0"*size */
             /* Some DBF files have fields filled with spaces */
             /* (trimmed by DBFReadStringAttribute) to indicate null */
             /* values for dates (#4265). */
             /* And others have '       0': https://lists.osgeo.org/pipermail/gdal-dev/2023-November/058010.html */
             /* And others just empty string: https://github.com/OSGeo/gdal/issues/10405 */
-            return pszValue[0] == 0 || strncmp(pszValue, "00000000", 8) == 0 ||
-                   strcmp(pszValue, " ") == 0 || strcmp(pszValue, "0") == 0;
+            if (pszValue[0] == 0 || strncmp(pszValue, "00000000", 8) == 0 ||
+                strcmp(pszValue, " ") == 0 || strcmp(pszValue, "0") == 0)
+                return true;
+            for (int i = 0; i < size; i++)
+                if (pszValue[i] != '0')
+                    return false;
+            return true;
 
         case 'L':
             /* NULL boolean fields have value "?" */
@@ -1179,7 +1184,8 @@ int SHPAPI_CALL DBFIsAttributeNULL(const DBFHandle psDBF, int iRecord,
     if (pszValue == SHPLIB_NULLPTR)
         return TRUE;
 
-    return DBFIsValueNULL(psDBF->pachFieldType[iField], pszValue);
+    return DBFIsValueNULL(psDBF->pachFieldType[iField], pszValue,
+                          psDBF->panFieldSize[iField]);
 }
 
 /************************************************************************/
@@ -2166,7 +2172,8 @@ int SHPAPI_CALL DBFAlterFieldDefn(DBFHandle psDBF, int iField,
             }
 
             memcpy(pszOldField, pszRecord + nOffset, nOldWidth);
-            const bool bIsNULL = DBFIsValueNULL(chOldType, pszOldField);
+            const bool bIsNULL =
+                DBFIsValueNULL(chOldType, pszOldField, nOldWidth);
 
             if (nWidth != nOldWidth)
             {
@@ -2243,7 +2250,8 @@ int SHPAPI_CALL DBFAlterFieldDefn(DBFHandle psDBF, int iField,
             }
 
             memcpy(pszOldField, pszRecord + nOffset, nOldWidth);
-            const bool bIsNULL = DBFIsValueNULL(chOldType, pszOldField);
+            const bool bIsNULL =
+                DBFIsValueNULL(chOldType, pszOldField, nOldWidth);
 
             if (nOffset + nOldWidth < nOldRecordLength)
             {
diff --git a/ogr/ogrsf_frmts/shape/sbnsearch.c b/ogr/ogrsf_frmts/shape/sbnsearch.c
index d036b1bbfb18..e5766a4d3492 100644
--- a/ogr/ogrsf_frmts/shape/sbnsearch.c
+++ b/ogr/ogrsf_frmts/shape/sbnsearch.c
@@ -5,7 +5,7 @@
  * Author:   Even Rouault, even dot rouault at spatialys.com
  *
  ******************************************************************************
- * Copyright (c) 2012-2014, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2012-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************/
diff --git a/ogr/ogrsf_frmts/shape/shapefil.h b/ogr/ogrsf_frmts/shape/shapefil.h
index e1832fae1b45..308dc6416cc1 100644
--- a/ogr/ogrsf_frmts/shape/shapefil.h
+++ b/ogr/ogrsf_frmts/shape/shapefil.h
@@ -9,7 +9,7 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
- * Copyright (c) 2012-2016, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2012-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************
@@ -231,7 +231,7 @@ extern "C"
 #define SHPP_RING 5
 
     /* -------------------------------------------------------------------- */
-    /*      SHPObject - represents on shape (without attributes) read       */
+    /*      SHPObject - represents one shape (without attributes) read      */
     /*      from the .shp file.                                             */
     /* -------------------------------------------------------------------- */
     struct tagSHPObject
diff --git a/ogr/ogrsf_frmts/shape/shpopen.c b/ogr/ogrsf_frmts/shape/shpopen.c
index a32e7cb224c2..014e15770c67 100644
--- a/ogr/ogrsf_frmts/shape/shpopen.c
+++ b/ogr/ogrsf_frmts/shape/shpopen.c
@@ -6,7 +6,7 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, 2001, Frank Warmerdam
- * Copyright (c) 2011-2019, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2011-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************/
diff --git a/ogr/ogrsf_frmts/shape/shptree.c b/ogr/ogrsf_frmts/shape/shptree.c
index dfbc5ec93591..ef89e00a8a79 100644
--- a/ogr/ogrsf_frmts/shape/shptree.c
+++ b/ogr/ogrsf_frmts/shape/shptree.c
@@ -6,7 +6,7 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
- * Copyright (c) 2012, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2012-2024, Even Rouault <even dot rouault at spatialys.com>
  *
  * SPDX-License-Identifier: MIT OR LGPL-2.0-or-later
  ******************************************************************************

From 729451abcb8fd923aaf40e8e6b0507cd6586e987 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 9 Aug 2024 14:11:53 +0200
Subject: [PATCH 75/94] OSM: avoid creating /vsimem/osm_importer directory

Fixes #10566
---
 ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
index 79ee6de286fa..6dfe592d232d 100644
--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
@@ -2885,8 +2885,7 @@ int OGROSMDataSource::Open(const char *pszFilename,
         }
 
         m_bInMemoryNodesFile = true;
-        m_osNodesFilename.Printf("/vsimem/osm_importer/osm_temp_nodes_%p",
-                                 this);
+        m_osNodesFilename.Printf("/vsimem/osm_temp_nodes_%p", this);
         m_fpNodes = VSIFOpenL(m_osNodesFilename, "wb+");
         if (m_fpNodes == nullptr)
         {
@@ -2972,7 +2971,7 @@ bool OGROSMDataSource::CreateTempDB()
     }
     else
     {
-        m_osTmpDBName.Printf("/vsimem/osm_importer/osm_temp_%p.sqlite", this);
+        m_osTmpDBName.Printf("/vsimem/osm_temp_%p.sqlite", this);
 
         // On 32 bit, the virtual memory space is scarce, so we need to
         // reserve it right now. Will not hurt on 64 bit either.

From 65eb4622070b94e21a2bf0085bcd2421fa65486a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 9 Aug 2024 15:09:01 +0200
Subject: [PATCH 76/94] Shapelib: make detect_suspicious_char_digit_zero script
 happy

---
 ogr/ogrsf_frmts/shape/dbfopen.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ogr/ogrsf_frmts/shape/dbfopen.c b/ogr/ogrsf_frmts/shape/dbfopen.c
index ea0f06728ef2..90ed7ea8e9c8 100644
--- a/ogr/ogrsf_frmts/shape/dbfopen.c
+++ b/ogr/ogrsf_frmts/shape/dbfopen.c
@@ -1144,6 +1144,8 @@ static bool DBFIsValueNULL(char chType, const char *pszValue, int size)
             return true;
 
         case 'D':
+        {
+            const char DIGIT_ZERO = '0';
             /* NULL date fields have value "00000000" or "0"*size */
             /* Some DBF files have fields filled with spaces */
             /* (trimmed by DBFReadStringAttribute) to indicate null */
@@ -1154,9 +1156,10 @@ static bool DBFIsValueNULL(char chType, const char *pszValue, int size)
                 strcmp(pszValue, " ") == 0 || strcmp(pszValue, "0") == 0)
                 return true;
             for (int i = 0; i < size; i++)
-                if (pszValue[i] != '0')
+                if (pszValue[i] != DIGIT_ZERO)
                     return false;
             return true;
+        }
 
         case 'L':
             /* NULL boolean fields have value "?" */

From 423d0a6a4871a5709ff07cc6d8893716334714d9 Mon Sep 17 00:00:00 2001
From: Curtis Doty <Curtis@GreenKey.net>
Date: Fri, 9 Aug 2024 23:45:43 +0000
Subject: [PATCH 77/94] Avoid confusing/misleasing error

 - "gdal_target_link_libraries(): PRIVATE is a mandatory argument."
---
 frmts/pdf/CMakeLists.txt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt
index 957304165b21..048cb0592e1c 100644
--- a/frmts/pdf/CMakeLists.txt
+++ b/frmts/pdf/CMakeLists.txt
@@ -76,7 +76,10 @@ if (GDAL_USE_PDFIUM)
   target_compile_definitions(gdal_PDF PRIVATE -DHAVE_PDFIUM)
   gdal_target_link_libraries(gdal_PDF PRIVATE PDFIUM::PDFIUM)
   if (UNIX)
-    find_library(LCMS2_LIBRARY NAMES lcms2)
+    find_package(JPEG REQUIRED)
+    find_package(PNG REQUIRED)
+    find_package(OpenJPEG REQUIRED)
+    find_library(LCMS2_LIBRARY NAMES lcms2 REQUIRED)
 
     # Rather hacky... Related how we build pdfium in https://github.com/rouault/pdfium_build_gdal_3_4
     gdal_target_link_libraries(

From bf8a28ad08730c2d1ad27e73ac88dca1f0358604 Mon Sep 17 00:00:00 2001
From: Javier Jimenez Shaw <j1@jimenezshaw.com>
Date: Sun, 28 Jul 2024 12:03:30 +0200
Subject: [PATCH 78/94] add complex_float32.tif with non zero imaginary part

---
 autotest/gcore/data/complex_float32.tif | Bin 0 -> 1578 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 autotest/gcore/data/complex_float32.tif

diff --git a/autotest/gcore/data/complex_float32.tif b/autotest/gcore/data/complex_float32.tif
new file mode 100644
index 0000000000000000000000000000000000000000..78bb2af8f96f22d1f968601ad4e554b481c34460
GIT binary patch
literal 1578
zcma)(drTBZ9LJYu6p=!xr&b!)D@cn46tO%!c4l`0B|I!pK+-B6u;A5W?|QdLgoa{8
zC=bi=E{2CKP(@n}1u<%RH+yR%p|)bR2Grn#XaPY4s$xXx(q0<cV(cF?zwi9!GvE1U
zCN$I?TYzDh9fp}%U}mDS5r^3vZEn&~>|2=hEN4AOJD6Gib=CsImdxo(OnTOHsfocw
z#%T@{W75_l)4R_WvlnZTIfmsnn`4*7i#o;i9#LD0m6fyNjA62kL1cIY!^u<RoSd-1
zaakzGq~okSoe7jC$=MXGlvpeCnr;4PcQ?l*sx&E#MoO%iADJ~x<aVnWDe=w=2u7Q%
zQK&hEij@)}3MGSwrmIyNj!D54ET_VQBjZ9n=RcY%(kAm+3XkE$xN=R({PYe+E+$P>
zrKV~b?uCKHI~k3Vk?#@{Cuu*L-%6=q8Sz<s*82F(4`}7-YUM2A@3ZCwFQa8xtx98x
zAIt7!RhjJkW|?9bCBvq1I}$Tk1t+@x3zvEQ^AG?0R}6aqOyVWw|8g&}`Fr~T@R_JJ
zB#xX1(P6!Y&AAQ0-Rv_E`0gs0F?@tLyr=>``6Uf(AASVXhgyNhtFI%Y&cfjLquwxf
zu7ZgCu!v}TxC9zP?9s|`7XBXVjQpOSGkAVK0nD#hqw2yAFw<NH@W)|rEWwg^OVI}V
z$3F%w#-*?}@&-_4_@djv3k|<*9W+R;A0t*?JW5zeWYDqI6@mOpn233!!q~;AjB|h$
z?cQkltuAn&xCCTZ?uB*-2la0_^uzltIiM*c2)5_oaLZ^s;!7Uti6KW+^JNcFlYNKS
zKA8<`Y-Nb~PJja>ff9awADvcv!}CAoAoESVz|$oL+zdDYt8?!djQ1VLZ5?sIrL+LL
zj%C5Rb-CzFe1U$XDg>?fogo@C-N4&TC!n<^8VxwxkY)7&XixW96c>>SbK1Jm>1$WP
za!>gN{{b7as-yu~^lc_DSL`P`e1C=kfmh+l)LL{guaQ{TSBmP7yMmdh5}@;TAR9c=
zQ2lf~`Ph9Cl09SjqJ2kT=jY-4g$t)Z(hsi4kt-w<=$(AAYdd+R_?p4>21!mYQj*H%
z4n(z0g2R3jXv-=MxV&{G><ZD5?uYiEh?GmD6I}(y``m>9eIfbj2BUEWdBEWN?G%5(
zNkVt#uMqa8n$!IQxB2RcFQ`e!n^e@)GB}*}9A0{UkJtP47%KM;kta7iqXw%x`S)}r
z-SIe@T3;GQ@6YR^qCH0Vs$=$~&RS*M^#~W9Rsw24j|-K#^DYmGI_fJNqq?_E^FtqC
z^sT`PBa)O;N!Q(sCAr;XV4fpw^)+Ffl37#XXO2_;A(aAiv4{@LauFnVz33Ay9#l}%
zLrT5QR+tHPpxf~Rq2?1EPwSk7^3l~oXUtJ}KK@N1{K-Dv^QOOXbcaTWAJ3txNKavR
zU6&9WT1)Fs4GKtlmey{n6_)$0rX~Fwg}UY*s?|SBh+^_+t8@9nYi`N(jGfBJB_E`0
br!G;>)H2HIn<C>q{|IvNE0hph-iZDHVW}#R

literal 0
HcmV?d00001


From 10e142d86ecd087670203b8a06f70bce5c29a8b4 Mon Sep 17 00:00:00 2001
From: Javier Jimenez Shaw <j1@jimenezshaw.com>
Date: Sun, 28 Jul 2024 12:08:25 +0200
Subject: [PATCH 79/94] add complex_int32.tif with non zero imaginary part

---
 autotest/gcore/data/complex_int32.tif | Bin 0 -> 1578 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 autotest/gcore/data/complex_int32.tif

diff --git a/autotest/gcore/data/complex_int32.tif b/autotest/gcore/data/complex_int32.tif
new file mode 100644
index 0000000000000000000000000000000000000000..d51efe7e6d517b664f2c734eed7aba2f5de07d18
GIT binary patch
literal 1578
zcma)+Pe>GD7{<R<vlO!oGKzv>4?zW~WMQza2K`~dBr?N8u#E0!Ztc!&vr{4+vLJ|V
zL3HiXtxG2_-J)YbL{!JhE?vs%6887^j5D#>ihc0x^S<x*ywCT}%*W<(JIxwnOuI3u
zMw23H1*w|2A&v*AH^#Aa%{6gHs%f#e(U^@j_0Bk!=cZWWpxIiZ8II#sXkJ}wGwb0S
z4aUseZ7|O{XqNm6aTDyh9>2z9jvhKVc+7@w!42JPtK(#Hp)EU}Teb(%W3E@Irn5bn
zE*1aToepi@4+=I&XS?f5WSS4BD>j|ow~WG8$Ae-eEc#wLd!$&hPOe<>gU}Y7q8Iwk
z;h|Hx-St~1P{-y{Im032x<R47deXW~n)fFrsy1A9V9vBb$+{Prc&vK9zE!E{Szb$T
zPj6p+LDel+N|NmF?Ox{1RIOL_gLwQA@0{mPdG*bv7^Y;sGvQ?Zf>#W2T_VqP{rwH2
z?`q6^e;lkp|EpWU=Fj$g|1TET&isURzXh&pv~)L>YhNr)vPh$q^y;2!Ur1_8{hHAv
ze$xDi&D0Z_@uRa<*V*F4PjNDb&eB>9<fopbk1(1;tR<~_b+%ZL_Ir(=_H<4QEI;)K
z(m+w4SbK?&wDMX2(uy^omiE4puZ^<B9?hznO7fMLAgyv~HNz*MXa5pwbVdic>YcHs
z4PFP5Grz`KJ=X>xzb&x*N8<iFu+|%Jn|cAh3crH~;R?|F`d6HzrdhTTUk2}qAHsXV
zV^9EZscH5{a2|9M?*Qr@f*tUhcm|$@bMOmzGkgm?B~HVm;3bE3GVEz;_sMsGOCTh_
z34dn)1MxUG3G{wO;g8@MXa@t-PQX6eJ$QA&*WoAdJ@)$8n}nO;7V7exBiH=L;j>^n
NctEaik%jfWegoJQ=V$-`

literal 0
HcmV?d00001


From ac3678a1e97cb66e4cc79b37146877cd4d30f441 Mon Sep 17 00:00:00 2001
From: Javier Jimenez Shaw <j1@jimenezshaw.com>
Date: Tue, 30 Jul 2024 15:37:42 +0200
Subject: [PATCH 80/94] support complex interpolateatpoint

---
 alg/gdal_interpolateatpoint.cpp      | 257 ++++++++++++++++++---------
 alg/gdal_interpolateatpoint.h        |   2 +-
 alg/gdal_rpc.cpp                     |   2 +-
 apps/gdallocationinfo.cpp            |  16 +-
 autotest/gcore/interpolateatpoint.py |  82 +++++++++
 gcore/gdalrasterband.cpp             |   4 +-
 6 files changed, 266 insertions(+), 97 deletions(-)

diff --git a/alg/gdal_interpolateatpoint.cpp b/alg/gdal_interpolateatpoint.cpp
index c2df303eed2c..0ba1d93e2db3 100644
--- a/alg/gdal_interpolateatpoint.cpp
+++ b/alg/gdal_interpolateatpoint.cpp
@@ -35,22 +35,24 @@
 
 #include <algorithm>
 
-static bool
-GDALInterpExtractDEMWindow(GDALRasterBand *pBand,
-                           std::unique_ptr<DoublePointsCache> &cacheDEM, int nX,
-                           int nY, int nWidth, int nHeight, double *padfOut)
+static bool GDALInterpExtractValuesWindow(
+    GDALRasterBand *pBand, std::unique_ptr<DoublePointsCache> &cache, int nX,
+    int nY, int nWidth, int nHeight, double *padfOutReal, double *padfOutImag)
 {
     constexpr int BLOCK_SIZE = 64;
 
     // Request the DEM by blocks of BLOCK_SIZE * BLOCK_SIZE and put them
-    // in cacheDEM
-    if (!cacheDEM)
-        cacheDEM.reset(new DoublePointsCache{});
+    // in cache
+    if (!cache)
+        cache.reset(new DoublePointsCache{});
 
     const int nXIters = (nX + nWidth - 1) / BLOCK_SIZE - nX / BLOCK_SIZE + 1;
     const int nYIters = (nY + nHeight - 1) / BLOCK_SIZE - nY / BLOCK_SIZE + 1;
     const int nRasterXSize = pBand->GetXSize();
     const int nRasterYSize = pBand->GetYSize();
+    const bool bIsComplex =
+        CPL_TO_BOOL(GDALDataTypeIsComplex(pBand->GetRasterDataType()));
+
     for (int iY = 0; iY < nYIters; iY++)
     {
         const int nBlockY = nY / BLOCK_SIZE + iY;
@@ -92,30 +94,62 @@ GDALInterpExtractDEMWindow(GDALRasterBand *pBand,
 #endif
 
             std::shared_ptr<std::vector<double>> poValue;
-            if (!cacheDEM->tryGet(nKey, poValue))
+            if (!cache->tryGet(nKey, poValue))
             {
-                poValue = std::make_shared<std::vector<double>>(nReqXSize *
-                                                                nReqYSize);
+                GDALDataType eDataType = GDT_Float64;
+                size_t nVectorSize{0};
+                if (bIsComplex)
+                {
+                    eDataType = GDT_CFloat64;
+                    nVectorSize = nReqXSize * nReqYSize * 2;
+                }
+                else
+                {
+                    eDataType = GDT_Float64;
+                    nVectorSize = nReqXSize * nReqYSize;
+                }
+                poValue = std::make_shared<std::vector<double>>(nVectorSize);
                 CPLErr eErr = pBand->RasterIO(
                     GF_Read, nBlockX * BLOCK_SIZE, nBlockY * BLOCK_SIZE,
                     nReqXSize, nReqYSize, poValue->data(), nReqXSize, nReqYSize,
-                    GDT_Float64, 0, 0, nullptr);
+                    eDataType, 0, 0, nullptr);
                 if (eErr != CE_None)
                 {
                     return false;
                 }
-                cacheDEM->insert(nKey, poValue);
+                cache->insert(nKey, poValue);
             }
 
-            // Compose the cached block to the final buffer
-            for (int j = 0; j < nLinesToCopy; j++)
+            auto composeToFinalBuffer =
+                [&](double *padfOut, const std::vector<double> &vect)
+            {
+                // Compose the cached block to the final buffer
+                for (int j = 0; j < nLinesToCopy; j++)
+                {
+                    memcpy(padfOut + (nFirstLineInOutput + j) * nWidth +
+                               nFirstColInOutput,
+                           vect.data() +
+                               (nFirstLineInCachedBlock + j) * nReqXSize +
+                               nFirstColInCachedBlock,
+                           nColsToCopy * sizeof(double));
+                }
+            };
+
+            if (bIsComplex)
+            {
+                std::vector<double> vReal(nReqXSize * nReqYSize);
+                std::vector<double> vImag(nReqXSize * nReqYSize);
+                for (size_t i = 0; i < vReal.size(); i++)
+                {
+                    vReal[i] = (*poValue)[2 * i];
+                    vImag[i] = (*poValue)[2 * i + 1];
+                }
+                composeToFinalBuffer(padfOutReal, vReal);
+                composeToFinalBuffer(padfOutImag, vImag);
+            }
+            else
             {
-                memcpy(padfOut + (nFirstLineInOutput + j) * nWidth +
-                           nFirstColInOutput,
-                       poValue->data() +
-                           (nFirstLineInCachedBlock + j) * nReqXSize +
-                           nFirstColInCachedBlock,
-                       nColsToCopy * sizeof(double));
+                composeToFinalBuffer(padfOutReal, *poValue);
             }
         }
     }
@@ -146,12 +180,14 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
                             GDALRIOResampleAlg eResampleAlg,
                             std::unique_ptr<DoublePointsCache> &cache,
                             const double dfXIn, const double dfYIn,
-                            double *pdfOutputValue)
+                            double *pdfOutputReal, double *pdfOutputImag)
 {
     const int nRasterXSize = pBand->GetXSize();
     const int nRasterYSize = pBand->GetYSize();
     int bGotNoDataValue = FALSE;
     const double dfNoDataValue = pBand->GetNoDataValue(&bGotNoDataValue);
+    const bool bIsComplex =
+        CPL_TO_BOOL(GDALDataTypeIsComplex(pBand->GetRasterDataType()));
 
     if (dfXIn < 0 || dfXIn > nRasterXSize || dfYIn < 0 || dfYIn > nRasterYSize)
     {
@@ -184,7 +220,7 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
         return dOutOfBorder;
     };
 
-    auto dragElevDataInBorder =
+    auto dragReadDataInBorder =
         [](double *adfElevData, int dOutOfBorder, int nKernelSize, bool bIsX)
     {
         while (dOutOfBorder < 0)
@@ -218,36 +254,39 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
         }
     };
 
-    if (eResampleAlg == GDALRIOResampleAlg::GRIORA_CubicSpline ||
-        eResampleAlg == GDALRIOResampleAlg::GRIORA_Cubic)
+    auto applyBilinearKernel = [&](double dfDeltaX, double dfDeltaY,
+                                   double *adfValues, double *pdfRes) -> bool
     {
-        // Convert from upper left corner of pixel coordinates to center of
-        // pixel coordinates:
-        const double dfX = dfXIn - 0.5;
-        const double dfY = dfYIn - 0.5;
-        const int dX = static_cast<int>(std::floor(dfX));
-        const int dY = static_cast<int>(std::floor(dfY));
-        const double dfDeltaX = dfX - dX;
-        const double dfDeltaY = dfY - dY;
-
-        const int dXNew = dX - 1;
-        const int dYNew = dY - 1;
-        const int nKernelSize = 4;
-        const int dXOutOfBorder =
-            outOfBorderCorrection(dXNew, nRasterXSize, nKernelSize);
-        const int dYOutOfBorder =
-            outOfBorderCorrection(dYNew, nRasterYSize, nKernelSize);
-
-        // CubicSpline interpolation.
-        double adfElevData[16] = {0.0};
-        if (!GDALInterpExtractDEMWindow(pBand, cache, dXNew - dXOutOfBorder,
-                                        dYNew - dYOutOfBorder, nKernelSize,
-                                        nKernelSize, adfElevData))
+        if (bGotNoDataValue)
         {
-            return FALSE;
+            // TODO: We could perhaps use a valid sample if there's one.
+            bool bFoundNoDataElev = false;
+            for (int k_i = 0; k_i < 4; k_i++)
+            {
+                if (ARE_REAL_EQUAL(dfNoDataValue, adfValues[k_i]))
+                    bFoundNoDataElev = true;
+            }
+            if (bFoundNoDataElev)
+            {
+                return FALSE;
+            }
         }
-        dragElevDataInBorder(adfElevData, dXOutOfBorder, nKernelSize, true);
-        dragElevDataInBorder(adfElevData, dYOutOfBorder, nKernelSize, false);
+        const double dfDeltaX1 = 1.0 - dfDeltaX;
+        const double dfDeltaY1 = 1.0 - dfDeltaY;
+
+        const double dfXZ1 = adfValues[0] * dfDeltaX1 + adfValues[1] * dfDeltaX;
+        const double dfXZ2 = adfValues[2] * dfDeltaX1 + adfValues[3] * dfDeltaX;
+        const double dfYZ = dfXZ1 * dfDeltaY1 + dfXZ2 * dfDeltaY;
+
+        *pdfRes = dfYZ;
+        return TRUE;
+    };
+
+    auto apply4x4Kernel = [&](double dfDeltaX, double dfDeltaY,
+                              double *adfValues, double *pdfRes) -> bool
+    {
+        if (!pdfRes)
+            return TRUE;
 
         double dfSumH = 0.0;
         double dfSumWeight = 0.0;
@@ -270,7 +309,7 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
 
                 // Create a sum of all values
                 // adjusted for the pixel's calculated weight.
-                const double dfElev = adfElevData[k_j + k_i * 4];
+                const double dfElev = adfValues[k_j + k_i * 4];
                 if (bGotNoDataValue && ARE_REAL_EQUAL(dfNoDataValue, dfElev))
                     continue;
 
@@ -283,7 +322,63 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
             return FALSE;
         }
 
-        *pdfOutputValue = dfSumH / dfSumWeight;
+        *pdfRes = dfSumH / dfSumWeight;
+
+        return TRUE;
+    };
+
+    if (eResampleAlg == GDALRIOResampleAlg::GRIORA_CubicSpline ||
+        eResampleAlg == GDALRIOResampleAlg::GRIORA_Cubic)
+    {
+        // Convert from upper left corner of pixel coordinates to center of
+        // pixel coordinates:
+        const double dfX = dfXIn - 0.5;
+        const double dfY = dfYIn - 0.5;
+        const int dX = static_cast<int>(std::floor(dfX));
+        const int dY = static_cast<int>(std::floor(dfY));
+        const double dfDeltaX = dfX - dX;
+        const double dfDeltaY = dfY - dY;
+
+        const int dXNew = dX - 1;
+        const int dYNew = dY - 1;
+        const int nKernelSize = 4;
+        const int dXOutOfBorder =
+            outOfBorderCorrection(dXNew, nRasterXSize, nKernelSize);
+        const int dYOutOfBorder =
+            outOfBorderCorrection(dYNew, nRasterYSize, nKernelSize);
+
+        // CubicSpline interpolation.
+        double adfReadDataReal[16] = {0.0};
+        double adfReadDataImag[16] = {0.0};
+        if (!GDALInterpExtractValuesWindow(
+                pBand, cache, dXNew - dXOutOfBorder, dYNew - dYOutOfBorder,
+                nKernelSize, nKernelSize, adfReadDataReal, adfReadDataImag))
+        {
+            return FALSE;
+        }
+        dragReadDataInBorder(adfReadDataReal, dXOutOfBorder, nKernelSize, true);
+        dragReadDataInBorder(adfReadDataReal, dYOutOfBorder, nKernelSize,
+                             false);
+        if (!apply4x4Kernel(dfDeltaX, dfDeltaY, adfReadDataReal, pdfOutputReal))
+            return FALSE;
+
+        if (pdfOutputImag)
+        {
+            if (bIsComplex)
+            {
+                dragReadDataInBorder(adfReadDataImag, dXOutOfBorder,
+                                     nKernelSize, true);
+                dragReadDataInBorder(adfReadDataImag, dYOutOfBorder,
+                                     nKernelSize, false);
+                if (!apply4x4Kernel(dfDeltaX, dfDeltaY, adfReadDataImag,
+                                    pdfOutputImag))
+                    return FALSE;
+            }
+            else
+            {
+                *pdfOutputImag = 0.0;
+            }
+        }
 
         return TRUE;
     }
@@ -305,55 +400,57 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
             outOfBorderCorrection(dY, nRasterYSize, nKernelSize);
 
         // Bilinear interpolation.
-        double adfElevData[4] = {0.0, 0.0, 0.0, 0.0};
-        if (!GDALInterpExtractDEMWindow(pBand, cache, dX - dXOutOfBorder,
-                                        dY - dYOutOfBorder, nKernelSize,
-                                        nKernelSize, adfElevData))
+        double adfReadDataReal[4] = {0.0, 0.0, 0.0, 0.0};
+        double adfReadDataImag[4] = {0.0, 0.0, 0.0, 0.0};
+        if (!GDALInterpExtractValuesWindow(
+                pBand, cache, dX - dXOutOfBorder, dY - dYOutOfBorder,
+                nKernelSize, nKernelSize, adfReadDataReal, adfReadDataImag))
         {
             return FALSE;
         }
-        dragElevDataInBorder(adfElevData, dXOutOfBorder, nKernelSize, true);
-        dragElevDataInBorder(adfElevData, dYOutOfBorder, nKernelSize, false);
+        dragReadDataInBorder(adfReadDataReal, dXOutOfBorder, nKernelSize, true);
+        dragReadDataInBorder(adfReadDataReal, dYOutOfBorder, nKernelSize,
+                             false);
+        if (!applyBilinearKernel(dfDeltaX, dfDeltaY, adfReadDataReal,
+                                 pdfOutputReal))
+            return FALSE;
 
-        if (bGotNoDataValue)
+        if (pdfOutputImag)
         {
-            // TODO: We could perhaps use a valid sample if there's one.
-            bool bFoundNoDataElev = false;
-            for (int k_i = 0; k_i < 4; k_i++)
+            if (bIsComplex)
             {
-                if (ARE_REAL_EQUAL(dfNoDataValue, adfElevData[k_i]))
-                    bFoundNoDataElev = true;
+                dragReadDataInBorder(adfReadDataImag, dXOutOfBorder,
+                                     nKernelSize, true);
+                dragReadDataInBorder(adfReadDataImag, dYOutOfBorder,
+                                     nKernelSize, false);
+
+                if (!applyBilinearKernel(dfDeltaX, dfDeltaY, adfReadDataImag,
+                                         pdfOutputImag))
+                    return FALSE;
             }
-            if (bFoundNoDataElev)
+            else
             {
-                return FALSE;
+                *pdfOutputImag = 0.0;
             }
         }
-        const double dfDeltaX1 = 1.0 - dfDeltaX;
-        const double dfDeltaY1 = 1.0 - dfDeltaY;
-
-        const double dfXZ1 =
-            adfElevData[0] * dfDeltaX1 + adfElevData[1] * dfDeltaX;
-        const double dfXZ2 =
-            adfElevData[2] * dfDeltaX1 + adfElevData[3] * dfDeltaX;
-        const double dfYZ = dfXZ1 * dfDeltaY1 + dfXZ2 * dfDeltaY;
-
-        *pdfOutputValue = dfYZ;
-
         return TRUE;
     }
     else
     {
         const int dX = static_cast<int>(dfXIn);
         const int dY = static_cast<int>(dfYIn);
-        double dfDEMH = 0.0;
-        if (!GDALInterpExtractDEMWindow(pBand, cache, dX, dY, 1, 1, &dfDEMH) ||
-            (bGotNoDataValue && ARE_REAL_EQUAL(dfNoDataValue, dfDEMH)))
+        double dfReal = 0.0;
+        double dfImag = 0.0;
+        if (!GDALInterpExtractValuesWindow(pBand, cache, dX, dY, 1, 1, &dfReal,
+                                           &dfImag) ||
+            (bGotNoDataValue && ARE_REAL_EQUAL(dfNoDataValue, dfReal)))
         {
             return FALSE;
         }
 
-        *pdfOutputValue = dfDEMH;
+        *pdfOutputReal = dfReal;
+        if (pdfOutputImag)
+            *pdfOutputImag = dfImag;
 
         return TRUE;
     }
diff --git a/alg/gdal_interpolateatpoint.h b/alg/gdal_interpolateatpoint.h
index 0d81e1066b0e..c0e8b3170ba3 100644
--- a/alg/gdal_interpolateatpoint.h
+++ b/alg/gdal_interpolateatpoint.h
@@ -54,7 +54,7 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
                             GDALRIOResampleAlg eResampleAlg,
                             std::unique_ptr<DoublePointsCache> &cache,
                             const double dfXIn, const double dfYIn,
-                            double *pdfOutputValue);
+                            double *pdfOutputReal, double *pdfOutputImag);
 
 /*! @endcond */
 
diff --git a/alg/gdal_rpc.cpp b/alg/gdal_rpc.cpp
index cad408853992..31e9c24c6aa0 100644
--- a/alg/gdal_rpc.cpp
+++ b/alg/gdal_rpc.cpp
@@ -1394,7 +1394,7 @@ static int GDALRPCGetDEMHeight(GDALRPCTransformInfo *psTransform,
     std::unique_ptr<DoublePointsCache> cacheDEM{psTransform->poCacheDEM};
     int res =
         GDALInterpolateAtPoint(psTransform->poDS->GetRasterBand(1), eResample,
-                               cacheDEM, dfXIn, dfYIn, pdfDEMH);
+                               cacheDEM, dfXIn, dfYIn, pdfDEMH, nullptr);
     psTransform->poCacheDEM = cacheDEM.release();
     return res;
 }
diff --git a/apps/gdallocationinfo.cpp b/apps/gdallocationinfo.cpp
index 15a7b806b286..372387dd1ac6 100644
--- a/apps/gdallocationinfo.cpp
+++ b/apps/gdallocationinfo.cpp
@@ -607,18 +607,10 @@ MAIN_START(argc, argv)
                 GDALDataTypeIsComplex(GDALGetRasterDataType(hBand)));
 
             CPLErr err;
-            if (bIsComplex)
-            {
-                err = GDALRasterIO(hBand, GF_Read, iPixelToQuery, iLineToQuery,
-                                   1, 1, adfPixel, 1, 1, GDT_CFloat64, 0, 0);
-            }
-            else
-            {
-                // GDALRasterInterpolateAtPoint is not implemented yet for complex datatype
-                err = GDALRasterInterpolateAtPoint(
-                    hBand, dfPixelToQuery, dfLineToQuery, eInterpolation,
-                    adfPixel, nullptr);
-            }
+            err = GDALRasterInterpolateAtPoint(hBand, dfPixelToQuery,
+                                               dfLineToQuery, eInterpolation,
+                                               &adfPixel[0], &adfPixel[1]);
+
             if (err == CE_None)
             {
                 CPLString osValue;
diff --git a/autotest/gcore/interpolateatpoint.py b/autotest/gcore/interpolateatpoint.py
index 1d06b74b5dc2..3dffd4c8b3f1 100755
--- a/autotest/gcore/interpolateatpoint.py
+++ b/autotest/gcore/interpolateatpoint.py
@@ -268,3 +268,85 @@ def test_interpolateatpoint_at_borders():
 
     res = mem_ds.GetRasterBand(1).InterpolateAtPoint(3.0, 4.6, gdal.GRIORA_Cubic)
     assert res == pytest.approx(0.6590625, 1e-6)
+
+
+def test_interpolateatpoint_complex_int():
+
+    ds = gdal.Open("data/complex_int32.tif")
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(0.0, 0.0, gdal.GRIORA_NearestNeighbour)
+    assert res == (-1 + 2j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.1, 7.2, gdal.GRIORA_NearestNeighbour)
+    assert res == (32 - 32j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_Bilinear)
+    assert res == (32 - 32j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_Cubic)
+    assert res == (32 - 32j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_CubicSpline)
+    assert res == pytest.approx((34.361111 - 37.055555j), 1e-6)
+
+
+def test_interpolateatpoint_complex_float():
+
+    ds = gdal.Open("data/complex_float32.tif")
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(0.0, 0.0, gdal.GRIORA_NearestNeighbour)
+    assert res == pytest.approx((-1.2027 + 1.60096j), 1e-4)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.1, 7.2, gdal.GRIORA_NearestNeighbour)
+    assert res == pytest.approx((32.031867 - 31.546283j), 1e-4)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx((32.031867 - 31.546283j), 1e-4)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_Cubic)
+    assert res == pytest.approx((32.031867 - 31.546283j), 1e-4)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(5.5, 7.5, gdal.GRIORA_CubicSpline)
+    assert res == pytest.approx((34.433130 - 36.741504j), 1e-4)
+
+
+def test_interpolateatpoint_big_complex():
+    # The purpose of this test is to check that the algorithm implementation
+    # works for bigger values above the first block of 64x64 pixels.
+    # To do that we are creating a virtual complex band from an existing RGB image.
+
+    ds = gdal.Open(
+        """<VRTDataset rasterXSize="512" rasterYSize="384">
+  <VRTRasterBand dataType="CFloat64" band="1" subClass="VRTDerivedRasterBand">
+    <Description>Complex</Description>
+    <PixelFunctionType>complex</PixelFunctionType>
+    <SimpleSource>
+      <SourceFilename relativeToVRT="0">data/quad-lzw-old-style.tif</SourceFilename>
+      <SourceBand>3</SourceBand>
+    </SimpleSource>
+    <SimpleSource>
+      <SourceFilename relativeToVRT="0">data/quad-lzw-old-style.tif</SourceFilename>
+      <SourceBand>1</SourceBand>
+    </SimpleSource>
+  </VRTRasterBand>
+</VRTDataset>"""
+    )
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256, 64, gdal.GRIORA_NearestNeighbour)
+    assert res == (179.0 + 127.0j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256, 63, gdal.GRIORA_NearestNeighbour)
+    assert res == (182.0 + 127.0j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(255, 64, gdal.GRIORA_NearestNeighbour)
+    assert res == (179.0 + 123.0j)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(255, 63, gdal.GRIORA_NearestNeighbour)
+    assert res == (182.0 + 122.0j)
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256, 64, gdal.GRIORA_Bilinear)
+    assert (
+        res
+        == ((179.0 + 127.0j) + (182.0 + 127.0j) + (179.0 + 123.0j) + (182.0 + 122.0j))
+        / 4
+    )
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256.2, 64.3, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx((179.6 + 125.74j), 1e-6)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256.2, 64.3, gdal.GRIORA_Cubic)
+    assert res == pytest.approx((179.088 + 125.90542j), 1e-6)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(256.2, 64.3, gdal.GRIORA_CubicSpline)
+    assert res == pytest.approx((179.482666 + 125.512282j), 1e-6)
+
+    res = ds.GetRasterBand(1).InterpolateAtPoint(255.5, 63.5, gdal.GRIORA_Bilinear)
+    assert res == pytest.approx((182 + 122j), 1e-6)
+    res = ds.GetRasterBand(1).InterpolateAtPoint(255.5, 63.5, gdal.GRIORA_Cubic)
+    assert res == pytest.approx((182 + 122j), 1e-6)
diff --git a/gcore/gdalrasterband.cpp b/gcore/gdalrasterband.cpp
index 7ac8127b327e..f8a6cb5b2189 100644
--- a/gcore/gdalrasterband.cpp
+++ b/gcore/gdalrasterband.cpp
@@ -8912,9 +8912,7 @@ CPLErr GDALRasterBand::InterpolateAtPoint(double dfPixel, double dfLine,
 
     const bool res =
         GDALInterpolateAtPoint(pBand, eInterpolation, m_oPointsCache->cache,
-                               dfPixel, dfLine, pdfRealValue);
-    if (pdfImagValue)
-        *pdfImagValue = 0;
+                               dfPixel, dfLine, pdfRealValue, pdfImagValue);
 
     return res ? CE_None : CE_Failure;
 }

From f57495c5f1e613df7f43813625e8f81562785f8a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 10 Aug 2024 17:13:24 +0200
Subject: [PATCH 81/94] ossfuzz: fix sqlite build

---
 fuzzers/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fuzzers/build.sh b/fuzzers/build.sh
index a704d4b2f7b2..c6fa8c7f1332 100755
--- a/fuzzers/build.sh
+++ b/fuzzers/build.sh
@@ -157,7 +157,7 @@ git clone --depth 1 https://github.com/sqlite/sqlite sqlite
 
 # libxerces-c-dev${ARCH_SUFFIX}
 # libsqlite3-dev${ARCH_SUFFIX}
-PACKAGES="zlib1g-dev${ARCH_SUFFIX} libexpat-dev${ARCH_SUFFIX} liblzma-dev${ARCH_SUFFIX} \
+PACKAGES="tcl-dev${ARCH_SUFFIX} zlib1g-dev${ARCH_SUFFIX} libexpat-dev${ARCH_SUFFIX} liblzma-dev${ARCH_SUFFIX} \
           libpng-dev${ARCH_SUFFIX} libgif-dev${ARCH_SUFFIX} \
           libjpeg-dev${ARCH_SUFFIX} \
           libwebp-dev${ARCH_SUFFIX} \
@@ -181,7 +181,7 @@ NON_FUZZING_CXXFLAGS="$NON_FUZZING_CFLAGS -stdlib=libc++"
 
 # build sqlite
 cd sqlite
-CFLAGS="$NON_FUZZING_CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA" ./configure --prefix=$SRC/install --enable-rtree --disable-tcl
+CFLAGS="$NON_FUZZING_CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA" ./configure --prefix=$SRC/install --enable-rtree --with-tcl=/usr/lib/$ARCHITECTURE-linux-gnu/tcl8.6
 make clean -s
 make -j$(nproc) -s
 make install

From 1879b880571af1f2cfbc5b5d27ef7d2efd96c872 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Jul 2024 16:52:01 +0200
Subject: [PATCH 82/94] Implement GDALProxyRasterBand::IGetDataCoverageStatus()

---
 gcore/gdal_proxy.h         |  3 +++
 gcore/gdalproxydataset.cpp | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/gcore/gdal_proxy.h b/gcore/gdal_proxy.h
index 1f83781a4ed2..518deb4b2d32 100644
--- a/gcore/gdal_proxy.h
+++ b/gcore/gdal_proxy.h
@@ -129,6 +129,9 @@ class CPL_DLL GDALProxyRasterBand : public GDALRasterBand
                      GDALDataType, GSpacing, GSpacing,
                      GDALRasterIOExtraArg *psExtraArg) override;
 
+    int IGetDataCoverageStatus(int nXOff, int nYOff, int nXSize, int nYSize,
+                               int nMaskFlagStop, double *pdfDataPct) override;
+
   public:
     char **GetMetadataDomainList() override;
     char **GetMetadata(const char *pszDomain) override;
diff --git a/gcore/gdalproxydataset.cpp b/gcore/gdalproxydataset.cpp
index 4209c8aad2da..cb6fb251653d 100644
--- a/gcore/gdalproxydataset.cpp
+++ b/gcore/gdalproxydataset.cpp
@@ -339,6 +339,25 @@ CPLErr GDALProxyRasterBand::IRasterIO(GDALRWFlag eRWFlag, int nXOff, int nYOff,
     return ret;
 }
 
+int GDALProxyRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
+                                                int nXSize, int nYSize,
+                                                int nMaskFlagStop,
+                                                double *pdfDataPct)
+{
+    if (pdfDataPct)
+        *pdfDataPct = 0.0;
+    int ret = GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+              GDAL_DATA_COVERAGE_STATUS_EMPTY;
+    GDALRasterBand *poSrcBand = RefUnderlyingRasterBand();
+    if (poSrcBand)
+    {
+        ret = poSrcBand->GetDataCoverageStatus(nXOff, nYOff, nXSize, nYSize,
+                                               nMaskFlagStop, pdfDataPct);
+        UnrefUnderlyingRasterBand(poSrcBand);
+    }
+    return ret;
+}
+
 RB_PROXY_METHOD_WITH_RET(char **, nullptr, GetMetadataDomainList, (), ())
 RB_PROXY_METHOD_WITH_RET(char **, nullptr, GetMetadata, (const char *pszDomain),
                          (pszDomain))

From cbe9923cb9dec779f00b6ab9b4961c9bbb8f8581 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Jul 2024 16:52:44 +0200
Subject: [PATCH 83/94] VRT: GetDataCoverageStatus(): implement special case on
 a single source covering the whole dataset

---
 autotest/gcore/vrt_read.py         | 42 ++++++++++++++++++++
 frmts/vrt/vrtsourcedrasterband.cpp | 63 ++++++++++++++++++++++++------
 2 files changed, 93 insertions(+), 12 deletions(-)

diff --git a/autotest/gcore/vrt_read.py b/autotest/gcore/vrt_read.py
index 6a67274a971d..a7d586db9ec1 100755
--- a/autotest/gcore/vrt_read.py
+++ b/autotest/gcore/vrt_read.py
@@ -1071,6 +1071,48 @@ def test_vrt_read_25():
     )
 
 
+###############################################################################
+# Test GetDataCoverageStatus() on a single source covering the whole dataset
+
+
+def test_vrt_read_get_data_coverage_status_single_source(tmp_vsimem):
+
+    tmp_gtiff = str(tmp_vsimem / "tmp.tif")
+    ds = gdal.GetDriverByName("GTiff").Create(
+        tmp_gtiff,
+        512,
+        512,
+        1,
+        options=["TILED=YES", "BLOCKXSIZE=256", "BLOCKYSIZE=256", "SPARSE_OK=YES"],
+    )
+    ds.WriteRaster(256, 256, 256, 256, b"\x01" * (256 * 256))
+    ds = None
+
+    tmp_vrt = str(tmp_vsimem / "tmp.vrt")
+    gdal.Translate(tmp_vrt, tmp_gtiff, format="VRT")
+    ds = gdal.Open(tmp_vrt)
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 512, 512)
+    assert (
+        flags
+        == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY)
+        and pct == 25.0
+    )
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 256, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(256, 256, 256, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 256, 512, 256)
+    assert (
+        flags
+        == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY)
+        and pct == 50.0
+    )
+
+
 ###############################################################################
 # Test consistency of RasterIO() with resampling, that is extracting different
 # sub-windows give consistent results
diff --git a/frmts/vrt/vrtsourcedrasterband.cpp b/frmts/vrt/vrtsourcedrasterband.cpp
index dad40430aab3..5e493e05ccf8 100644
--- a/frmts/vrt/vrtsourcedrasterband.cpp
+++ b/frmts/vrt/vrtsourcedrasterband.cpp
@@ -646,17 +646,6 @@ void VRTSourcedRasterBand::RasterIOJob::Func(void *pData)
 /*                         IGetDataCoverageStatus()                     */
 /************************************************************************/
 
-#ifndef HAVE_GEOS
-int VRTSourcedRasterBand::IGetDataCoverageStatus(
-    int /* nXOff */, int /* nYOff */, int /* nXSize */, int /* nYSize */,
-    int /* nMaskFlagStop */, double *pdfDataPct)
-{
-    if (pdfDataPct)
-        *pdfDataPct = -1.0;
-    return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
-           GDAL_DATA_COVERAGE_STATUS_DATA;
-}
-#else
 int VRTSourcedRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
                                                  int nXSize, int nYSize,
                                                  int nMaskFlagStop,
@@ -664,6 +653,56 @@ int VRTSourcedRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
 {
     if (pdfDataPct)
         *pdfDataPct = -1.0;
+
+    // Particular case for a single simple source covering the whole dataset
+    if (nSources == 1 && papoSources[0]->IsSimpleSource() &&
+        papoSources[0]->GetType() == VRTSimpleSource::GetTypeStatic())
+    {
+        VRTSimpleSource *poSource =
+            static_cast<VRTSimpleSource *>(papoSources[0]);
+
+        GDALRasterBand *poBand = poSource->GetRasterBand();
+        if (!poBand)
+            poBand = poSource->GetMaskBandMainBand();
+        if (!poBand)
+        {
+            return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+                   GDAL_DATA_COVERAGE_STATUS_DATA;
+        }
+
+        /* Check that it uses the full source dataset */
+        double dfReqXOff = 0.0;
+        double dfReqYOff = 0.0;
+        double dfReqXSize = 0.0;
+        double dfReqYSize = 0.0;
+        int nReqXOff = 0;
+        int nReqYOff = 0;
+        int nReqXSize = 0;
+        int nReqYSize = 0;
+        int nOutXOff = 0;
+        int nOutYOff = 0;
+        int nOutXSize = 0;
+        int nOutYSize = 0;
+        bool bError = false;
+        if (poSource->GetSrcDstWindow(
+                0, 0, GetXSize(), GetYSize(), GetXSize(), GetYSize(),
+                &dfReqXOff, &dfReqYOff, &dfReqXSize, &dfReqYSize, &nReqXOff,
+                &nReqYOff, &nReqXSize, &nReqYSize, &nOutXOff, &nOutYOff,
+                &nOutXSize, &nOutYSize, bError) &&
+            nReqXOff == 0 && nReqYOff == 0 && nReqXSize == GetXSize() &&
+            nReqXSize == poBand->GetXSize() && nReqYSize == GetYSize() &&
+            nReqYSize == poBand->GetYSize() && nOutXOff == 0 && nOutYOff == 0 &&
+            nOutXSize == GetXSize() && nOutYSize == GetYSize())
+        {
+            return poBand->GetDataCoverageStatus(nXOff, nYOff, nXSize, nYSize,
+                                                 nMaskFlagStop, pdfDataPct);
+        }
+    }
+
+#ifndef HAVE_GEOS
+    return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+           GDAL_DATA_COVERAGE_STATUS_DATA;
+#else
     int nStatus = 0;
 
     auto poPolyNonCoveredBySources = std::make_unique<OGRPolygon>();
@@ -755,8 +794,8 @@ int VRTSourcedRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
                                              nXSize / nYSize);
     }
     return nStatus;
-}
 #endif  // HAVE_GEOS
+}
 
 /************************************************************************/
 /*                             IReadBlock()                             */

From 3074b612c5e5a18c08d968eda3a1a96866fef3e2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Jul 2024 16:53:26 +0200
Subject: [PATCH 84/94] GDALDatasetCopyWholeRaster(): fix SKIP_HOLES=YES in the
 interleaved case that failed to detect holes

---
 gcore/rasterio.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gcore/rasterio.cpp b/gcore/rasterio.cpp
index 62e3c7d88ccc..c2eae1398301 100644
--- a/gcore/rasterio.cpp
+++ b/gcore/rasterio.cpp
@@ -4864,6 +4864,7 @@ CPLErr CPL_STDCALL GDALDatasetCopyWholeRaster(GDALDatasetH hSrcDS,
                 int nStatus = GDAL_DATA_COVERAGE_STATUS_DATA;
                 if (bCheckHoles)
                 {
+                    nStatus = 0;
                     for (int iBand = 0; iBand < nBandCount; iBand++)
                     {
                         nStatus |= poSrcDS->GetRasterBand(iBand + 1)

From bc6a2de050dfbd2dec6fe915db3b513390bd42e9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Jul 2024 16:54:01 +0200
Subject: [PATCH 85/94] GDALDriver::DefaultCreateCopy(): recognize
 SKIP_HOLES=YES option and forward it to GDALDatasetCopyWholeRaster()

---
 gcore/gdaldriver.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/gcore/gdaldriver.cpp b/gcore/gdaldriver.cpp
index 17a5640dcc19..c1de9b891886 100644
--- a/gcore/gdaldriver.cpp
+++ b/gcore/gdaldriver.cpp
@@ -851,8 +851,16 @@ GDALDataset *GDALDriver::DefaultCreateCopy(const char *pszFilename,
     /*      Copy image data.                                                */
     /* -------------------------------------------------------------------- */
     if (eErr == CE_None && nDstBands > 0)
-        eErr = GDALDatasetCopyWholeRaster(poSrcDS, poDstDS, nullptr,
-                                          pfnProgress, pProgressData);
+    {
+        const char *const apszCopyRasterOptionsSkipHoles[] = {"SKIP_HOLES=YES",
+                                                              nullptr};
+        const bool bSkipHoles = CPLTestBool(
+            CSLFetchNameValueDef(papszOptions, "SKIP_HOLES", "FALSE"));
+        eErr = GDALDatasetCopyWholeRaster(
+            poSrcDS, poDstDS,
+            bSkipHoles ? apszCopyRasterOptionsSkipHoles : nullptr, pfnProgress,
+            pProgressData);
+    }
 
     /* -------------------------------------------------------------------- */
     /*      Should we copy some masks over?                                 */
@@ -2124,10 +2132,11 @@ int CPL_STDCALL GDALValidateCreationOptions(GDALDriverH hDriver,
     osDriver.Printf("driver %s",
                     GDALDriver::FromHandle(hDriver)->GetDescription());
     bool bFoundOptionToRemove = false;
+    constexpr const char *const apszExcludedOptions[] = {
+        "APPEND_SUBDATASET", "COPY_SRC_MDD", "SRC_MDD", "SKIP_HOLES"};
     for (const char *pszCO : cpl::Iterate(papszCreationOptions))
     {
-        for (const char *pszExcludedOptions :
-             {"APPEND_SUBDATASET", "COPY_SRC_MDD", "SRC_MDD"})
+        for (const char *pszExcludedOptions : apszExcludedOptions)
         {
             if (STARTS_WITH_CI(pszCO, pszExcludedOptions) &&
                 pszCO[strlen(pszExcludedOptions)] == '=')
@@ -2146,8 +2155,7 @@ int CPL_STDCALL GDALValidateCreationOptions(GDALDriverH hDriver,
         for (const char *pszCO : cpl::Iterate(papszCreationOptions))
         {
             bool bMatch = false;
-            for (const char *pszExcludedOptions :
-                 {"APPEND_SUBDATASET", "COPY_SRC_MDD", "SRC_MDD"})
+            for (const char *pszExcludedOptions : apszExcludedOptions)
             {
                 if (STARTS_WITH_CI(pszCO, pszExcludedOptions) &&
                     pszCO[strlen(pszExcludedOptions)] == '=')

From 46ab5522e19cf247519085e944f85cd3031c7033 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Jul 2024 16:54:39 +0200
Subject: [PATCH 86/94] GPKG raster: in CreateCopy() without resampling, use
 IGetDataCoverageStatus() on the source dataset

---
 ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
index 8f5ca7c1edc9..345df834a138 100644
--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
+++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp
@@ -6066,6 +6066,7 @@ GDALDataset *GDALGeoPackageDataset::CreateCopy(const char *pszFilename,
             reinterpret_cast<GDALDriver *>(GDALGetDriverByName("GPKG"));
         if (poThisDriver != nullptr)
         {
+            apszUpdatedOptions.SetNameValue("SKIP_HOLES", "YES");
             poDS = cpl::down_cast<GDALGeoPackageDataset *>(
                 poThisDriver->DefaultCreateCopy(pszFilename, poSrcDS, bStrict,
                                                 apszUpdatedOptions, pfnProgress,

From a7fff833701f806a2621c2bb14115b894b7a9bcc Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Jul 2024 16:55:58 +0200
Subject: [PATCH 87/94] GPKG raster: detect non-RGBA tiles fully at 0 and do
 not write them

---
 .../gpkg/gdalgeopackagerasterband.cpp         | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp b/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
index 352d75554677..bf5432b7b045 100644
--- a/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
+++ b/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
@@ -1643,6 +1643,29 @@ CPLErr GDALGPKGMBTilesLikePseudoDataset::WriteTileInternal()
         else
             bAllOpaque = false;
     }
+    else if (bAllDirty && m_eDT == GDT_Byte && m_poCT == nullptr &&
+             (!bHasNoData || dfNoDataValue == 0.0))
+    {
+        bool bAllEmpty = true;
+        const auto nPixels =
+            static_cast<GPtrDiff_t>(nBlockXSize) * nBlockYSize * nBands;
+        for (GPtrDiff_t i = 0; i < nPixels; i++)
+        {
+            if (m_pabyCachedTiles[i] != 0)
+            {
+                bAllEmpty = false;
+                break;
+            }
+        }
+        if (bAllEmpty)
+        {
+            // If tile is fully transparent, don't serialize it and remove it if
+            // it exists
+            DeleteTile(nRow, nCol);
+
+            return CE_None;
+        }
+    }
     else if (bAllDirty && m_eDT == GDT_Float32)
     {
         const float *pSrc = reinterpret_cast<float *>(m_pabyCachedTiles);

From c5c3299d25599ca8fce93ec68645bddf372fc02f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 20 Jul 2024 16:56:32 +0200
Subject: [PATCH 88/94] GPKG raster: implement IGetDataCoverageStatus()

---
 autotest/gdrivers/gpkg.py                     |  59 ++++++++
 .../gpkg/gdalgeopackagerasterband.cpp         | 140 ++++++++++++++++++
 ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h      |   3 +
 3 files changed, 202 insertions(+)

diff --git a/autotest/gdrivers/gpkg.py b/autotest/gdrivers/gpkg.py
index a0986fc5c85b..199483c328dc 100755
--- a/autotest/gdrivers/gpkg.py
+++ b/autotest/gdrivers/gpkg.py
@@ -4348,3 +4348,62 @@ def test_gpkg_rename_raster_table(data_type, tmp_vsimem):
     gdal.VSIFCloseL(f)
 
     assert "weird" not in content
+
+
+###############################################################################
+# Test GetDataCoverageStatus() is used on the source dataset
+
+
+def test_gpkg_copy_using_get_data_coverage_status(tmp_vsimem):
+
+    tmp_gtiff = str(tmp_vsimem / "tmp.tif")
+    src_ds = gdal.GetDriverByName("GTiff").Create(
+        tmp_gtiff,
+        1024,
+        768,
+        1,
+        options=["TILED=YES", "BLOCKXSIZE=256", "BLOCKYSIZE=256", "SPARSE_OK=YES"],
+    )
+    src_ds.SetGeoTransform([2, 0.001, 0, 49, 0, -0.001])
+    src_ds.WriteRaster(512, 256, 256, 256, b"\x01" * (256 * 256))
+
+    tmp_gpkg = str(tmp_vsimem / "tmp.gpkg")
+    gdaltest.gpkg_dr.CreateCopy(tmp_gpkg, src_ds)
+
+    ds = gdal.Open(tmp_gpkg)
+    assert ds.GetRasterBand(1).Checksum() == src_ds.GetRasterBand(1).Checksum()
+
+    with ds.ExecuteSQL("SELECT COUNT(*) FROM tmp") as sql_lyr:
+        assert sql_lyr.GetFeatureCount() == 1
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 1024, 768)
+    assert (
+        flags
+        == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY)
+        and pct == 100.0 / 12
+    )
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 1024, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 512, 1024, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(0, 0, 512, 768)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(768, 0, 256, 768)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY and pct == 0.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(512, 256, 256, 256)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(512 + 1, 256 + 2, 3, 4)
+    assert flags == gdal.GDAL_DATA_COVERAGE_STATUS_DATA and pct == 100.0
+
+    (flags, pct) = ds.GetRasterBand(1).GetDataCoverageStatus(512 - 1, 256 - 1, 2, 2)
+    assert (
+        flags
+        == (gdal.GDAL_DATA_COVERAGE_STATUS_DATA | gdal.GDAL_DATA_COVERAGE_STATUS_EMPTY)
+        and pct == 25.0
+    )
diff --git a/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp b/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
index bf5432b7b045..26fb858c4703 100644
--- a/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
+++ b/ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp
@@ -34,6 +34,8 @@
 
 #include <algorithm>
 #include <limits>
+#include <set>
+#include <utility>
 
 #if !defined(DEBUG_VERBOSE) && defined(DEBUG_VERBOSE_GPKG)
 #define DEBUG_VERBOSE
@@ -1229,6 +1231,144 @@ CPLErr GDALGPKGMBTilesLikeRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
     return CE_None;
 }
 
+/************************************************************************/
+/*                       IGetDataCoverageStatus()                       */
+/************************************************************************/
+
+int GDALGPKGMBTilesLikeRasterBand::IGetDataCoverageStatus(int nXOff, int nYOff,
+                                                          int nXSize,
+                                                          int nYSize,
+                                                          int nMaskFlagStop,
+                                                          double *pdfDataPct)
+{
+    if (eAccess == GA_Update)
+        FlushCache(false);
+
+    const int iColMin = nXOff / nBlockXSize + m_poTPD->m_nShiftXTiles;
+    const int iColMax = (nXOff + nXSize - 1) / nBlockXSize +
+                        m_poTPD->m_nShiftXTiles +
+                        (m_poTPD->m_nShiftXPixelsMod ? 1 : 0);
+    const int iRowMin = nYOff / nBlockYSize + m_poTPD->m_nShiftYTiles;
+    const int iRowMax = (nYOff + nYSize - 1) / nBlockYSize +
+                        m_poTPD->m_nShiftYTiles +
+                        (m_poTPD->m_nShiftYPixelsMod ? 1 : 0);
+
+    int iDBRowMin = m_poTPD->GetRowFromIntoTopConvention(iRowMin);
+    int iDBRowMax = m_poTPD->GetRowFromIntoTopConvention(iRowMax);
+    if (iDBRowMin > iDBRowMax)
+        std::swap(iDBRowMin, iDBRowMax);
+
+    char *pszSQL = sqlite3_mprintf(
+        "SELECT tile_row, tile_column FROM \"%w\" "
+        "WHERE zoom_level = %d AND "
+        "(tile_row BETWEEN %d AND %d) AND "
+        "(tile_column BETWEEN %d AND %d)"
+        "%s",
+        m_poTPD->m_osRasterTable.c_str(), m_poTPD->m_nZoomLevel, iDBRowMin,
+        iDBRowMax, iColMin, iColMax,
+        !m_poTPD->m_osWHERE.empty()
+            ? CPLSPrintf(" AND (%s)", m_poTPD->m_osWHERE.c_str())
+            : "");
+
+#ifdef DEBUG_VERBOSE
+    CPLDebug("GPKG", "%s", pszSQL);
+#endif
+
+    sqlite3_stmt *hStmt = nullptr;
+    int rc = sqlite3_prepare_v2(m_poTPD->IGetDB(), pszSQL, -1, &hStmt, nullptr);
+    if (rc != SQLITE_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "failed to prepare SQL %s: %s",
+                 pszSQL, sqlite3_errmsg(m_poTPD->IGetDB()));
+        sqlite3_free(pszSQL);
+        return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+               GDAL_DATA_COVERAGE_STATUS_DATA;
+    }
+    sqlite3_free(pszSQL);
+    rc = sqlite3_step(hStmt);
+    std::set<std::pair<int, int>> oSetTiles;  // (row, col)
+    while (rc == SQLITE_ROW)
+    {
+        oSetTiles.insert(std::pair(
+            m_poTPD->GetRowFromIntoTopConvention(sqlite3_column_int(hStmt, 0)),
+            sqlite3_column_int(hStmt, 1)));
+        rc = sqlite3_step(hStmt);
+    }
+    sqlite3_finalize(hStmt);
+    if (rc != SQLITE_DONE)
+    {
+        return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+               GDAL_DATA_COVERAGE_STATUS_DATA;
+    }
+    if (oSetTiles.empty())
+    {
+        if (pdfDataPct)
+            *pdfDataPct = 0.0;
+        return GDAL_DATA_COVERAGE_STATUS_EMPTY;
+    }
+
+    if (m_poTPD->m_nShiftXPixelsMod == 0 && m_poTPD->m_nShiftYPixelsMod == 0 &&
+        oSetTiles.size() == static_cast<size_t>(iRowMax - iRowMin + 1) *
+                                (iColMax - iColMin + 1))
+    {
+        if (pdfDataPct)
+            *pdfDataPct = 100.0;
+        return GDAL_DATA_COVERAGE_STATUS_DATA;
+    }
+
+    if (m_poTPD->m_nShiftXPixelsMod == 0 && m_poTPD->m_nShiftYPixelsMod == 0)
+    {
+        int nStatus = 0;
+        GIntBig nPixelsData = 0;
+        for (int iY = iRowMin; iY <= iRowMax; ++iY)
+        {
+            for (int iX = iColMin; iX <= iColMax; ++iX)
+            {
+                if (oSetTiles.find(std::pair(iY, iX)) == oSetTiles.end())
+                {
+                    nStatus |= GDAL_DATA_COVERAGE_STATUS_EMPTY;
+                }
+                else
+                {
+                    const int iXGDAL = iX - m_poTPD->m_nShiftXTiles;
+                    const int iYGDAL = iY - m_poTPD->m_nShiftYTiles;
+                    const int nXBlockRight =
+                        (iXGDAL * nBlockXSize > INT_MAX - nBlockXSize)
+                            ? INT_MAX
+                            : (iXGDAL + 1) * nBlockXSize;
+                    const int nYBlockBottom =
+                        (iYGDAL * nBlockYSize > INT_MAX - nBlockYSize)
+                            ? INT_MAX
+                            : (iYGDAL + 1) * nBlockYSize;
+
+                    nPixelsData += (static_cast<GIntBig>(std::min(
+                                        nXBlockRight, nXOff + nXSize)) -
+                                    std::max(iXGDAL * nBlockXSize, nXOff)) *
+                                   (std::min(nYBlockBottom, nYOff + nYSize) -
+                                    std::max(iYGDAL * nBlockYSize, nYOff));
+                    nStatus |= GDAL_DATA_COVERAGE_STATUS_DATA;
+                }
+                if (nMaskFlagStop != 0 && (nMaskFlagStop & nStatus) != 0)
+                {
+                    if (pdfDataPct)
+                        *pdfDataPct = -1.0;
+                    return nStatus;
+                }
+            }
+        }
+
+        if (pdfDataPct)
+        {
+            *pdfDataPct =
+                100.0 * nPixelsData / (static_cast<GIntBig>(nXSize) * nYSize);
+        }
+        return nStatus;
+    }
+
+    return GDAL_DATA_COVERAGE_STATUS_UNIMPLEMENTED |
+           GDAL_DATA_COVERAGE_STATUS_DATA;
+}
+
 /************************************************************************/
 /*                       WEBPSupports4Bands()                           */
 /************************************************************************/
diff --git a/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h b/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h
index 841ec4977679..74307e7b01e2 100644
--- a/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h
+++ b/ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h
@@ -182,6 +182,9 @@ class GDALGPKGMBTilesLikeRasterBand : public GDALPamRasterBand
                                void *pData) override;
     virtual CPLErr FlushCache(bool bAtClosing) override;
 
+    int IGetDataCoverageStatus(int nXOff, int nYOff, int nXSize, int nYSize,
+                               int nMaskFlagStop, double *pdfDataPct) override;
+
     virtual GDALColorTable *GetColorTable() override;
     virtual CPLErr SetColorTable(GDALColorTable *poCT) override;
 

From c1cd8175771b29a8df635bd4c23b7728af4aea1e Mon Sep 17 00:00:00 2001
From: Javier Jimenez Shaw <j1@jimenezshaw.com>
Date: Wed, 31 Jul 2024 10:11:26 +0200
Subject: [PATCH 89/94] use std::complex<double> for complex bands.

---
 alg/gdal_interpolateatpoint.cpp | 244 ++++++++++++++------------------
 1 file changed, 108 insertions(+), 136 deletions(-)

diff --git a/alg/gdal_interpolateatpoint.cpp b/alg/gdal_interpolateatpoint.cpp
index 0ba1d93e2db3..c96ca3a7dab7 100644
--- a/alg/gdal_interpolateatpoint.cpp
+++ b/alg/gdal_interpolateatpoint.cpp
@@ -34,10 +34,26 @@
 #include "gdalresamplingkernels.h"
 
 #include <algorithm>
+#include <complex>
 
-static bool GDALInterpExtractValuesWindow(
-    GDALRasterBand *pBand, std::unique_ptr<DoublePointsCache> &cache, int nX,
-    int nY, int nWidth, int nHeight, double *padfOutReal, double *padfOutImag)
+template <typename T> bool areEqualReal(double dfNoDataValue, T dfOut);
+
+template <> bool areEqualReal(double dfNoDataValue, double dfOut)
+{
+    return ARE_REAL_EQUAL(dfNoDataValue, dfOut);
+}
+
+template <> bool areEqualReal(double dfNoDataValue, std::complex<double> dfOut)
+{
+    return ARE_REAL_EQUAL(dfNoDataValue, dfOut.real());
+}
+
+// Only valid for T = double or std::complex<double>
+template <typename T>
+bool GDALInterpExtractValuesWindow(GDALRasterBand *pBand,
+                                   std::unique_ptr<DoublePointsCache> &cache,
+                                   int nX, int nY, int nWidth, int nHeight,
+                                   T *padfOut)
 {
     constexpr int BLOCK_SIZE = 64;
 
@@ -93,21 +109,14 @@ static bool GDALInterpExtractValuesWindow(
                      nFirstColInCachedBlock, nFirstColInOutput, nColsToCopy);
 #endif
 
+            constexpr int nTypeFactor = sizeof(T) / sizeof(double);
             std::shared_ptr<std::vector<double>> poValue;
             if (!cache->tryGet(nKey, poValue))
             {
-                GDALDataType eDataType = GDT_Float64;
-                size_t nVectorSize{0};
-                if (bIsComplex)
-                {
-                    eDataType = GDT_CFloat64;
-                    nVectorSize = nReqXSize * nReqYSize * 2;
-                }
-                else
-                {
-                    eDataType = GDT_Float64;
-                    nVectorSize = nReqXSize * nReqYSize;
-                }
+                const GDALDataType eDataType =
+                    bIsComplex ? GDT_CFloat64 : GDT_Float64;
+                const size_t nVectorSize =
+                    size_t(nReqXSize) * nReqYSize * nTypeFactor;
                 poValue = std::make_shared<std::vector<double>>(nVectorSize);
                 CPLErr eErr = pBand->RasterIO(
                     GF_Read, nBlockX * BLOCK_SIZE, nBlockY * BLOCK_SIZE,
@@ -120,36 +129,18 @@ static bool GDALInterpExtractValuesWindow(
                 cache->insert(nKey, poValue);
             }
 
-            auto composeToFinalBuffer =
-                [&](double *padfOut, const std::vector<double> &vect)
+            double *padfAsDouble = reinterpret_cast<double *>(padfOut);
+            // Compose the cached block to the final buffer
+            for (int j = 0; j < nLinesToCopy; j++)
             {
-                // Compose the cached block to the final buffer
-                for (int j = 0; j < nLinesToCopy; j++)
-                {
-                    memcpy(padfOut + (nFirstLineInOutput + j) * nWidth +
-                               nFirstColInOutput,
-                           vect.data() +
-                               (nFirstLineInCachedBlock + j) * nReqXSize +
-                               nFirstColInCachedBlock,
-                           nColsToCopy * sizeof(double));
-                }
-            };
-
-            if (bIsComplex)
-            {
-                std::vector<double> vReal(nReqXSize * nReqYSize);
-                std::vector<double> vImag(nReqXSize * nReqYSize);
-                for (size_t i = 0; i < vReal.size(); i++)
-                {
-                    vReal[i] = (*poValue)[2 * i];
-                    vImag[i] = (*poValue)[2 * i + 1];
-                }
-                composeToFinalBuffer(padfOutReal, vReal);
-                composeToFinalBuffer(padfOutImag, vImag);
-            }
-            else
-            {
-                composeToFinalBuffer(padfOutReal, *poValue);
+                memcpy(padfAsDouble + ((nFirstLineInOutput + j) * nWidth +
+                                       nFirstColInOutput) *
+                                          nTypeFactor,
+                       poValue->data() +
+                           ((nFirstLineInCachedBlock + j) * nReqXSize +
+                            nFirstColInCachedBlock) *
+                               nTypeFactor,
+                       nColsToCopy * sizeof(T));
             }
         }
     }
@@ -172,22 +163,16 @@ static bool GDALInterpExtractValuesWindow(
     return true;
 }
 
-/************************************************************************/
-/*                        GDALInterpolateAtPoint()                      */
-/************************************************************************/
-
-bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
-                            GDALRIOResampleAlg eResampleAlg,
-                            std::unique_ptr<DoublePointsCache> &cache,
-                            const double dfXIn, const double dfYIn,
-                            double *pdfOutputReal, double *pdfOutputImag)
+template <typename T>
+bool GDALInterpolateAtPointImpl(GDALRasterBand *pBand,
+                                GDALRIOResampleAlg eResampleAlg,
+                                std::unique_ptr<DoublePointsCache> &cache,
+                                const double dfXIn, const double dfYIn, T &out)
 {
     const int nRasterXSize = pBand->GetXSize();
     const int nRasterYSize = pBand->GetYSize();
     int bGotNoDataValue = FALSE;
     const double dfNoDataValue = pBand->GetNoDataValue(&bGotNoDataValue);
-    const bool bIsComplex =
-        CPL_TO_BOOL(GDALDataTypeIsComplex(pBand->GetRasterDataType()));
 
     if (dfXIn < 0 || dfXIn > nRasterXSize || dfYIn < 0 || dfYIn > nRasterYSize)
     {
@@ -221,7 +206,7 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
     };
 
     auto dragReadDataInBorder =
-        [](double *adfElevData, int dOutOfBorder, int nKernelSize, bool bIsX)
+        [](T *adfElevData, int dOutOfBorder, int nKernelSize, bool bIsX)
     {
         while (dOutOfBorder < 0)
         {
@@ -255,7 +240,7 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
     };
 
     auto applyBilinearKernel = [&](double dfDeltaX, double dfDeltaY,
-                                   double *adfValues, double *pdfRes) -> bool
+                                   T *adfValues, T &pdfRes) -> bool
     {
         if (bGotNoDataValue)
         {
@@ -263,7 +248,7 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
             bool bFoundNoDataElev = false;
             for (int k_i = 0; k_i < 4; k_i++)
             {
-                if (ARE_REAL_EQUAL(dfNoDataValue, adfValues[k_i]))
+                if (areEqualReal(dfNoDataValue, adfValues[k_i]))
                     bFoundNoDataElev = true;
             }
             if (bFoundNoDataElev)
@@ -274,22 +259,19 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
         const double dfDeltaX1 = 1.0 - dfDeltaX;
         const double dfDeltaY1 = 1.0 - dfDeltaY;
 
-        const double dfXZ1 = adfValues[0] * dfDeltaX1 + adfValues[1] * dfDeltaX;
-        const double dfXZ2 = adfValues[2] * dfDeltaX1 + adfValues[3] * dfDeltaX;
-        const double dfYZ = dfXZ1 * dfDeltaY1 + dfXZ2 * dfDeltaY;
+        const T dfXZ1 = adfValues[0] * dfDeltaX1 + adfValues[1] * dfDeltaX;
+        const T dfXZ2 = adfValues[2] * dfDeltaX1 + adfValues[3] * dfDeltaX;
+        const T dfYZ = dfXZ1 * dfDeltaY1 + dfXZ2 * dfDeltaY;
 
-        *pdfRes = dfYZ;
+        pdfRes = dfYZ;
         return TRUE;
     };
 
-    auto apply4x4Kernel = [&](double dfDeltaX, double dfDeltaY,
-                              double *adfValues, double *pdfRes) -> bool
+    auto apply4x4Kernel = [&](double dfDeltaX, double dfDeltaY, T *adfValues,
+                              T &pdfRes) -> bool
     {
-        if (!pdfRes)
-            return TRUE;
-
-        double dfSumH = 0.0;
-        double dfSumWeight = 0.0;
+        T dfSumH = 0.0;
+        T dfSumWeight = 0.0;
         for (int k_i = 0; k_i < 4; k_i++)
         {
             // Loop across the X axis.
@@ -309,8 +291,8 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
 
                 // Create a sum of all values
                 // adjusted for the pixel's calculated weight.
-                const double dfElev = adfValues[k_j + k_i * 4];
-                if (bGotNoDataValue && ARE_REAL_EQUAL(dfNoDataValue, dfElev))
+                const T dfElev = adfValues[k_j + k_i * 4];
+                if (bGotNoDataValue && areEqualReal(dfNoDataValue, dfElev))
                     continue;
 
                 dfSumH += dfElev * dfPixelWeight;
@@ -322,7 +304,7 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
             return FALSE;
         }
 
-        *pdfRes = dfSumH / dfSumWeight;
+        pdfRes = dfSumH / dfSumWeight;
 
         return TRUE;
     };
@@ -348,38 +330,18 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
             outOfBorderCorrection(dYNew, nRasterYSize, nKernelSize);
 
         // CubicSpline interpolation.
-        double adfReadDataReal[16] = {0.0};
-        double adfReadDataImag[16] = {0.0};
-        if (!GDALInterpExtractValuesWindow(
-                pBand, cache, dXNew - dXOutOfBorder, dYNew - dYOutOfBorder,
-                nKernelSize, nKernelSize, adfReadDataReal, adfReadDataImag))
+        T adfReadData[16] = {0.0};
+        if (!GDALInterpExtractValuesWindow(pBand, cache, dXNew - dXOutOfBorder,
+                                           dYNew - dYOutOfBorder, nKernelSize,
+                                           nKernelSize, adfReadData))
         {
             return FALSE;
         }
-        dragReadDataInBorder(adfReadDataReal, dXOutOfBorder, nKernelSize, true);
-        dragReadDataInBorder(adfReadDataReal, dYOutOfBorder, nKernelSize,
-                             false);
-        if (!apply4x4Kernel(dfDeltaX, dfDeltaY, adfReadDataReal, pdfOutputReal))
+        dragReadDataInBorder(adfReadData, dXOutOfBorder, nKernelSize, true);
+        dragReadDataInBorder(adfReadData, dYOutOfBorder, nKernelSize, false);
+        if (!apply4x4Kernel(dfDeltaX, dfDeltaY, adfReadData, out))
             return FALSE;
 
-        if (pdfOutputImag)
-        {
-            if (bIsComplex)
-            {
-                dragReadDataInBorder(adfReadDataImag, dXOutOfBorder,
-                                     nKernelSize, true);
-                dragReadDataInBorder(adfReadDataImag, dYOutOfBorder,
-                                     nKernelSize, false);
-                if (!apply4x4Kernel(dfDeltaX, dfDeltaY, adfReadDataImag,
-                                    pdfOutputImag))
-                    return FALSE;
-            }
-            else
-            {
-                *pdfOutputImag = 0.0;
-            }
-        }
-
         return TRUE;
     }
     else if (eResampleAlg == GDALRIOResampleAlg::GRIORA_Bilinear)
@@ -400,58 +362,68 @@ bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
             outOfBorderCorrection(dY, nRasterYSize, nKernelSize);
 
         // Bilinear interpolation.
-        double adfReadDataReal[4] = {0.0, 0.0, 0.0, 0.0};
-        double adfReadDataImag[4] = {0.0, 0.0, 0.0, 0.0};
-        if (!GDALInterpExtractValuesWindow(
-                pBand, cache, dX - dXOutOfBorder, dY - dYOutOfBorder,
-                nKernelSize, nKernelSize, adfReadDataReal, adfReadDataImag))
+        T adfReadData[4] = {0.0};
+        if (!GDALInterpExtractValuesWindow(pBand, cache, dX - dXOutOfBorder,
+                                           dY - dYOutOfBorder, nKernelSize,
+                                           nKernelSize, adfReadData))
         {
             return FALSE;
         }
-        dragReadDataInBorder(adfReadDataReal, dXOutOfBorder, nKernelSize, true);
-        dragReadDataInBorder(adfReadDataReal, dYOutOfBorder, nKernelSize,
-                             false);
-        if (!applyBilinearKernel(dfDeltaX, dfDeltaY, adfReadDataReal,
-                                 pdfOutputReal))
+        dragReadDataInBorder(adfReadData, dXOutOfBorder, nKernelSize, true);
+        dragReadDataInBorder(adfReadData, dYOutOfBorder, nKernelSize, false);
+        if (!applyBilinearKernel(dfDeltaX, dfDeltaY, adfReadData, out))
             return FALSE;
 
-        if (pdfOutputImag)
-        {
-            if (bIsComplex)
-            {
-                dragReadDataInBorder(adfReadDataImag, dXOutOfBorder,
-                                     nKernelSize, true);
-                dragReadDataInBorder(adfReadDataImag, dYOutOfBorder,
-                                     nKernelSize, false);
-
-                if (!applyBilinearKernel(dfDeltaX, dfDeltaY, adfReadDataImag,
-                                         pdfOutputImag))
-                    return FALSE;
-            }
-            else
-            {
-                *pdfOutputImag = 0.0;
-            }
-        }
         return TRUE;
     }
     else
     {
         const int dX = static_cast<int>(dfXIn);
         const int dY = static_cast<int>(dfYIn);
-        double dfReal = 0.0;
-        double dfImag = 0.0;
-        if (!GDALInterpExtractValuesWindow(pBand, cache, dX, dY, 1, 1, &dfReal,
-                                           &dfImag) ||
-            (bGotNoDataValue && ARE_REAL_EQUAL(dfNoDataValue, dfReal)))
+        T dfOut{};
+        if (!GDALInterpExtractValuesWindow(pBand, cache, dX, dY, 1, 1,
+                                           &dfOut) ||
+            (bGotNoDataValue && areEqualReal(dfNoDataValue, dfOut)))
         {
             return FALSE;
         }
 
-        *pdfOutputReal = dfReal;
-        if (pdfOutputImag)
-            *pdfOutputImag = dfImag;
+        out = dfOut;
 
         return TRUE;
     }
-}
\ No newline at end of file
+}
+
+/************************************************************************/
+/*                        GDALInterpolateAtPoint()                      */
+/************************************************************************/
+
+bool GDALInterpolateAtPoint(GDALRasterBand *pBand,
+                            GDALRIOResampleAlg eResampleAlg,
+                            std::unique_ptr<DoublePointsCache> &cache,
+                            const double dfXIn, const double dfYIn,
+                            double *pdfOutputReal, double *pdfOutputImag)
+{
+    const bool bIsComplex =
+        CPL_TO_BOOL(GDALDataTypeIsComplex(pBand->GetRasterDataType()));
+    bool res = TRUE;
+    if (bIsComplex)
+    {
+        std::complex<double> out{};
+        res = GDALInterpolateAtPointImpl(pBand, eResampleAlg, cache, dfXIn,
+                                         dfYIn, out);
+        *pdfOutputReal = out.real();
+        if (pdfOutputImag)
+            *pdfOutputImag = out.imag();
+    }
+    else
+    {
+        double out{};
+        res = GDALInterpolateAtPointImpl(pBand, eResampleAlg, cache, dfXIn,
+                                         dfYIn, out);
+        *pdfOutputReal = out;
+        if (pdfOutputImag)
+            *pdfOutputImag = 0;
+    }
+    return res;
+}

From 5b0d5ad549e089417b6e2685303711ab0b9cd425 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 11 Aug 2024 15:25:42 +0200
Subject: [PATCH 90/94] Internal libtiff: test
 https://gitlab.com/libtiff/libtiff/-/merge_requests/634 (Fix cases where
 tif_curdir is set incorrectly)

---
 frmts/gtiff/libtiff/tif_dir.c      |  44 +++++++---
 frmts/gtiff/libtiff/tif_dir.h      |   3 +
 frmts/gtiff/libtiff/tif_dirread.c  |   8 +-
 frmts/gtiff/libtiff/tif_dirwrite.c | 135 ++++++++++++++++++++++++-----
 frmts/gtiff/libtiff/tif_open.c     |   4 +
 frmts/gtiff/libtiff/tiffiop.h      |  32 +++++--
 6 files changed, 187 insertions(+), 39 deletions(-)

diff --git a/frmts/gtiff/libtiff/tif_dir.c b/frmts/gtiff/libtiff/tif_dir.c
index de246d413c21..a31a596b1821 100644
--- a/frmts/gtiff/libtiff/tif_dir.c
+++ b/frmts/gtiff/libtiff/tif_dir.c
@@ -1662,6 +1662,7 @@ void TIFFFreeDirectory(TIFF *tif)
         tif->tif_dir.td_dirdatasize_offsets = NULL;
         tif->tif_dir.td_dirdatasize_Noffsets = 0;
     }
+    tif->tif_dir.td_iswrittentofile = FALSE;
 }
 #undef CleanupField
 
@@ -1694,6 +1695,7 @@ int TIFFCreateDirectory(TIFF *tif)
     tif->tif_curoff = 0;
     tif->tif_row = (uint32_t)-1;
     tif->tif_curstrip = (uint32_t)-1;
+    tif->tif_dir.td_iswrittentofile = FALSE;
 
     return 0;
 }
@@ -2032,6 +2034,8 @@ tdir_t TIFFNumberOfDirectories(TIFF *tif)
     {
         ++n;
     }
+    /* Update number of main-IFDs in file. */
+    tif->tif_curdircount = n;
     return (n);
 }
 
@@ -2114,7 +2118,19 @@ int TIFFSetDirectory(TIFF *tif, tdir_t dirn)
         tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
     else
         tif->tif_curdir--;
-    return (TIFFReadDirectory(tif));
+
+    tdir_t curdir = tif->tif_curdir;
+
+    int retval = TIFFReadDirectory(tif);
+
+    if (!retval && tif->tif_curdir == curdir)
+    {
+        /* If tif_curdir has not be incremented, TIFFFetchDirectory() in
+         * TIFFReadDirectory() has failed and tif_curdir shall be set
+         * specifically. */
+        tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
+    }
+    return (retval);
 }
 
 /*
@@ -2139,8 +2155,11 @@ int TIFFSetSubDirectory(TIFF *tif, uint64_t diroff)
     int8_t probablySubIFD = 0;
     if (diroff == 0)
     {
-        /* Special case to invalidate the tif_lastdiroff member. */
+        /* Special case to set tif_diroff=0, which is done in
+         * TIFFReadDirectory() below to indicate that the currently read IFD is
+         * treated as a new, fresh IFD. */
         tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
+        tif->tif_dir.td_iswrittentofile = FALSE;
     }
     else
     {
@@ -2153,24 +2172,25 @@ int TIFFSetSubDirectory(TIFF *tif, uint64_t diroff)
         tif->tif_curdir =
             curdir == 0 ? TIFF_NON_EXISTENT_DIR_NUMBER : curdir - 1;
     }
+    curdir = tif->tif_curdir;
 
     tif->tif_nextdiroff = diroff;
     retval = TIFFReadDirectory(tif);
-    /* If failed, curdir was not incremented in TIFFReadDirectory(), so set it
-     * back, but leave it for diroff==0. */
-    if (!retval && diroff != 0)
+
+    /* tif_curdir is incremented in TIFFReadDirectory(), but if it has not been
+     * incremented, TIFFFetchDirectory() has failed there and tif_curdir shall
+     * be set specifically. */
+    if (!retval && diroff != 0 && tif->tif_curdir == curdir)
     {
-        if (tif->tif_curdir == TIFF_NON_EXISTENT_DIR_NUMBER)
-            tif->tif_curdir = 0;
-        else
-            tif->tif_curdir++;
+        tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
     }
+
     if (probablySubIFD)
     {
         if (retval)
         {
             /* Reset IFD list to start new one for SubIFD chain and also start
-             * SubIFD chain with tif_curdir=0. */
+             * SubIFD chain with tif_curdir=0 for IFD loop checking. */
             /* invalidate IFD loop lists */
             _TIFFCleanupIFDOffsetAndNumberMaps(tif);
             tif->tif_curdir = 0; /* first directory of new chain */
@@ -2324,6 +2344,10 @@ int TIFFUnlinkDirectory(TIFF *tif, tdir_t dirn)
     tif->tif_row = (uint32_t)-1;
     tif->tif_curstrip = (uint32_t)-1;
     tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER;
+    if (tif->tif_curdircount > 0)
+        tif->tif_curdircount--;
+    else
+        tif->tif_curdircount = TIFF_NON_EXISTENT_DIR_NUMBER;
     _TIFFCleanupIFDOffsetAndNumberMaps(tif); /* invalidate IFD loop lists */
     return (1);
 }
diff --git a/frmts/gtiff/libtiff/tif_dir.h b/frmts/gtiff/libtiff/tif_dir.h
index f9558b623703..f4182a2cb7a5 100644
--- a/frmts/gtiff/libtiff/tif_dir.h
+++ b/frmts/gtiff/libtiff/tif_dir.h
@@ -145,6 +145,9 @@ typedef struct
     unsigned char
         td_deferstrilearraywriting; /* see TIFFDeferStrileArrayWriting() */
 
+    unsigned char
+        td_iswrittentofile; /* indicates if current IFD is present on file */
+
     /* LibTIFF writes all data that does not fit into the IFD entries directly
      * after the IFD tag entry part. When reading, only the IFD data directly
      * and continuously behind the IFD tags is taken into account for the IFD
diff --git a/frmts/gtiff/libtiff/tif_dirread.c b/frmts/gtiff/libtiff/tif_dirread.c
index 4305a512d1d0..b360deaeaa4c 100644
--- a/frmts/gtiff/libtiff/tif_dirread.c
+++ b/frmts/gtiff/libtiff/tif_dirread.c
@@ -4281,6 +4281,7 @@ int TIFFReadDirectory(TIFF *tif)
         tif->tif_curdir = 0;
     else
         tif->tif_curdir++;
+
     (*tif->tif_cleanup)(tif); /* cleanup any previous compression state */
 
     TIFFReadDirectoryCheckOrder(tif, dir, dircount);
@@ -4314,6 +4315,11 @@ int TIFFReadDirectory(TIFF *tif)
     TIFFFreeDirectory(tif);
     TIFFDefaultDirectory(tif);
 
+    /* After setup a fresh directory indicate that now active IFD is also
+     * present on file, even if its entries could not be read successfully
+     * below.  */
+    tif->tif_dir.td_iswrittentofile = TRUE;
+
     /* Allocate arrays for offset values outside IFD entry for IFD data size
      * checking. Note: Counter are reset within TIFFFreeDirectory(). */
     tif->tif_dir.td_dirdatasize_offsets =
@@ -5191,7 +5197,7 @@ int TIFFReadDirectory(TIFF *tif)
     if (dir)
         _TIFFfreeExt(tif, dir);
     return (0);
-}
+} /*-- TIFFReadDirectory() --*/
 
 static void TIFFReadDirectoryCheckOrder(TIFF *tif, TIFFDirEntry *dir,
                                         uint16_t dircount)
diff --git a/frmts/gtiff/libtiff/tif_dirwrite.c b/frmts/gtiff/libtiff/tif_dirwrite.c
index d7781fc86b10..546fb48ad696 100644
--- a/frmts/gtiff/libtiff/tif_dirwrite.c
+++ b/frmts/gtiff/libtiff/tif_dirwrite.c
@@ -1185,17 +1185,12 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
         }
         if (tif->tif_dataoff & 1)
             tif->tif_dataoff++;
-        if (isimage)
-        {
-            if (tif->tif_curdir == TIFF_NON_EXISTENT_DIR_NUMBER)
-                tif->tif_curdir = 0;
-            else
-                tif->tif_curdir++;
-        }
     } /* while() */
     if (isimage)
     {
-        /* For SubIFDs remember offset of SubIFD tag within main IFD. */
+        /* For SubIFDs remember offset of SubIFD tag within main IFD.
+         * However, might be already done in TIFFWriteDirectoryTagSubifd() if
+         * there are more than one SubIFD. */
         if (TIFFFieldSet(tif, FIELD_SUBIFD) && (tif->tif_subifdoff == 0))
         {
             uint32_t na;
@@ -1297,7 +1292,8 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
     dir = NULL;
     if (!SeekOK(tif, tif->tif_diroff))
     {
-        TIFFErrorExtR(tif, module, "IO error writing directory");
+        TIFFErrorExtR(tif, module,
+                      "IO error writing directory at seek to offset");
         goto bad;
     }
     if (!WriteOK(tif, dirmem, (tmsize_t)dirsize))
@@ -1306,6 +1302,68 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
         goto bad;
     }
     _TIFFfreeExt(tif, dirmem);
+
+    /* Increment tif_curdir if IFD wasn't already written to file and no error
+     * occurred during IFD writing above. */
+    if (isimage && !tif->tif_dir.td_iswrittentofile)
+    {
+        if (!((tif->tif_flags & TIFF_INSUBIFD) &&
+              !(TIFFFieldSet(tif, FIELD_SUBIFD))))
+        {
+            /*-- Normal main-IFD case --*/
+            if (tif->tif_curdircount != TIFF_NON_EXISTENT_DIR_NUMBER)
+            {
+                tif->tif_curdir = tif->tif_curdircount;
+            }
+            else
+            {
+                /*ToDo SU: NEW_IFD_CURDIR_INCREMENTING:  Delete this
+                 * unexpected case after some testing time. */
+                /* Attention: tif->tif_curdircount is already set within
+                 * TIFFNumberOfDirectories() */
+                tif->tif_curdircount = TIFFNumberOfDirectories(tif);
+                tif->tif_curdir = tif->tif_curdircount;
+                TIFFErrorExtR(
+                    tif, module,
+                    "tif_curdircount is TIFF_NON_EXISTENT_DIR_NUMBER, "
+                    "not expected !! Line %d",
+                    __LINE__);
+                goto bad;
+            }
+        }
+        else
+        {
+            /*-- SubIFD case -- */
+            /* tif_curdir is always set to 0 for all SubIFDs. */
+            tif->tif_curdir = 0;
+        }
+    }
+    /* Increment tif_curdircount only if main-IFD of an image was not already
+     * present on file. */
+    /* Check in combination with (... && !(TIFFFieldSet(tif, FIELD_SUBIFD)))
+     * is necessary here because TIFF_INSUBIFD was already set above for the
+     * next SubIFD when this main-IFD (with FIELD_SUBIFD) is currently being
+     * written. */
+    if (isimage && !tif->tif_dir.td_iswrittentofile &&
+        !((tif->tif_flags & TIFF_INSUBIFD) &&
+          !(TIFFFieldSet(tif, FIELD_SUBIFD))))
+        tif->tif_curdircount++;
+
+    tif->tif_dir.td_iswrittentofile = TRUE;
+
+    /* Reset SubIFD writing stage after last SubIFD has been written. */
+    if (imagedone && (tif->tif_flags & TIFF_INSUBIFD) && tif->tif_nsubifd == 0)
+        tif->tif_flags &= ~TIFF_INSUBIFD;
+
+    /* Add or update this directory to the IFD list. */
+    if (!_TIFFCheckDirNumberAndOffset(tif, tif->tif_curdir, tif->tif_diroff))
+    {
+        TIFFErrorExtR(tif, module,
+                      "Starting directory %u at offset 0x%" PRIx64 " (%" PRIu64
+                      ") might cause an IFD loop",
+                      tif->tif_curdir, tif->tif_diroff, tif->tif_diroff);
+    }
+
     if (imagedone)
     {
         TIFFFreeDirectory(tif);
@@ -1317,9 +1375,8 @@ static int TIFFWriteDirectorySec(TIFF *tif, int isimage, int imagedone,
     }
     else
     {
-        /* IFD is only checkpointed to file, thus set IFD data size written to
-         * file.
-         */
+        /* IFD is only checkpointed to file (or a custom IFD like EXIF is
+         * written), thus set IFD data size written to file. */
         tif->tif_dir.td_dirdatasize_read = tif->tif_dir.td_dirdatasize_write;
     }
     return (1);
@@ -3073,15 +3130,15 @@ static int TIFFLinkDirectory(TIFF *tif)
                               "Error writing SubIFD directory link");
                 return (0);
             }
+
             /*
              * Advance to the next SubIFD or, if this is
-             * the last one configured, revert back to the
-             * normal directory linkage.
+             * the last one configured, reverting back to the
+             * normal directory linkage is done in TIFFWriteDirectorySec()
+             * by tif->tif_flags &= ~TIFF_INSUBIFD;.
              */
             if (--tif->tif_nsubifd)
                 tif->tif_subifdoff += 4;
-            else
-                tif->tif_flags &= ~TIFF_INSUBIFD;
             return (1);
         }
         else
@@ -3097,19 +3154,23 @@ static int TIFFLinkDirectory(TIFF *tif)
                               "Error writing SubIFD directory link");
                 return (0);
             }
+
             /*
              * Advance to the next SubIFD or, if this is
-             * the last one configured, revert back to the
-             * normal directory linkage.
+             * the last one configured, reverting back to the
+             * normal directory linkage is done in TIFFWriteDirectorySec()
+             * by tif->tif_flags &= ~TIFF_INSUBIFD;.
              */
             if (--tif->tif_nsubifd)
                 tif->tif_subifdoff += 8;
-            else
-                tif->tif_flags &= ~TIFF_INSUBIFD;
             return (1);
         }
     }
 
+    /*
+     * Handle main-IFDs
+     */
+    tdir_t ndir = 1; /* count current number of main-IFDs */
     if (!(tif->tif_flags & TIFF_BIGTIFF))
     {
         uint32_t m;
@@ -3130,18 +3191,26 @@ static int TIFFLinkDirectory(TIFF *tif)
                 TIFFErrorExtR(tif, tif->tif_name, "Error writing TIFF header");
                 return (0);
             }
+            if (!tif->tif_dir.td_iswrittentofile)
+                tif->tif_curdircount = 0;
             return (1);
         }
         /*
          * Not the first directory, search to the last and append.
          */
-        if (tif->tif_lastdiroff != 0)
+        tdir_t dirn = -1;
+        if (tif->tif_lastdiroff != 0 &&
+            _TIFFGetDirNumberFromOffset(tif, tif->tif_lastdiroff, &dirn))
         {
+            /* Start searching from the lastely written IFD. Thus get its IFD
+             * number. */
             nextdir = (uint32_t)tif->tif_lastdiroff;
+            ndir = dirn + 1;
         }
         else
         {
             nextdir = tif->tif_header.classic.tiff_diroff;
+            ndir = 1; /* start searching from the first IFD */
         }
 
         while (1)
@@ -3176,10 +3245,12 @@ static int TIFFLinkDirectory(TIFF *tif)
                 break;
             }
             nextdir = nextnextdir;
+            ndir++;
         }
     }
     else
     {
+        /*- BigTIFF -*/
         uint64_t m;
         uint64_t nextdir;
         m = tif->tif_diroff;
@@ -3198,18 +3269,26 @@ static int TIFFLinkDirectory(TIFF *tif)
                 TIFFErrorExtR(tif, tif->tif_name, "Error writing TIFF header");
                 return (0);
             }
+            if (!tif->tif_dir.td_iswrittentofile)
+                tif->tif_curdircount = 0;
             return (1);
         }
         /*
          * Not the first directory, search to the last and append.
          */
-        if (tif->tif_lastdiroff != 0)
+        tdir_t dirn = -1;
+        if (tif->tif_lastdiroff != 0 &&
+            _TIFFGetDirNumberFromOffset(tif, tif->tif_lastdiroff, &dirn))
         {
+            /* Start searching from the lastely written IFD. Thus get its IFD
+             * number. */
             nextdir = tif->tif_lastdiroff;
+            ndir = dirn + 1;
         }
         else
         {
             nextdir = tif->tif_header.big.tiff_diroff;
+            ndir = 1; /* start searching from the first IFD */
         }
         while (1)
         {
@@ -3252,8 +3331,20 @@ static int TIFFLinkDirectory(TIFF *tif)
                 break;
             }
             nextdir = nextnextdir;
+            ndir++;
         }
     }
+    /* Offset of next IFD is written to file.
+     * Update number of main-IFDs in file.
+     * However, tif_curdircount shall count only newly written main-IFDs with
+     * entries and not only number of linked offsets! Thus, tif_curdircount is
+     * incremented at the end of TIFFWriteDirectorySec().
+     * TIFF_NON_EXISTENT_DIR_NUMBER means 'dont know number of IFDs'
+     * 0 means 'empty file opened for writing, but no IFD written yet' */
+    if (!tif->tif_dir.td_iswrittentofile && !(tif->tif_flags & TIFF_INSUBIFD))
+    {
+        tif->tif_curdircount = ndir;
+    }
     return (1);
 }
 
diff --git a/frmts/gtiff/libtiff/tif_open.c b/frmts/gtiff/libtiff/tif_open.c
index b18e8948a734..56330d771a96 100644
--- a/frmts/gtiff/libtiff/tif_open.c
+++ b/frmts/gtiff/libtiff/tif_open.c
@@ -366,6 +366,7 @@ TIFF *TIFFClientOpenExt(const char *name, const char *mode,
     strcpy(tif->tif_name, name);
     tif->tif_mode = m & ~(O_CREAT | O_TRUNC);
     tif->tif_curdir = TIFF_NON_EXISTENT_DIR_NUMBER; /* non-existent directory */
+    tif->tif_curdircount = TIFF_NON_EXISTENT_DIR_NUMBER;
     tif->tif_curoff = 0;
     tif->tif_curstrip = (uint32_t)-1; /* invalid strip */
     tif->tif_row = (uint32_t)-1;      /* read/write pre-increment */
@@ -607,6 +608,9 @@ TIFF *TIFFClientOpenExt(const char *name, const char *mode,
         tif->tif_diroff = 0;
         tif->tif_lastdiroff = 0;
         tif->tif_setdirectory_force_absolute = FALSE;
+        /* tif_curdircount = 0 means 'empty file opened for writing, but no IFD
+         * written yet' */
+        tif->tif_curdircount = 0;
         return (tif);
     }
 
diff --git a/frmts/gtiff/libtiff/tiffiop.h b/frmts/gtiff/libtiff/tiffiop.h
index 803ca98ce851..c4348206df56 100644
--- a/frmts/gtiff/libtiff/tiffiop.h
+++ b/frmts/gtiff/libtiff/tiffiop.h
@@ -163,12 +163,32 @@ struct tiff
     TIFFHeaderUnion tif_header; /* file's header block Classic/BigTIFF union */
     uint16_t tif_header_size;   /* file's header block and its length */
     uint32_t tif_row;           /* current scanline */
-    tdir_t tif_curdir;          /* current directory (index) */
-    uint32_t tif_curstrip;      /* current strip for read/write */
-    uint64_t tif_curoff;        /* current offset for read/write */
-    uint64_t tif_lastvalidoff;  /* last valid offset allowed for rewrite in
-                                   place. Used only by TIFFAppendToStrip() */
-    uint64_t tif_dataoff;       /* current offset for writing dir (IFD) */
+
+    /* There are IFDs in the file and an "active" IFD in memory,
+     * from which fields are "set" and "get".
+     * tif_curdir is set to:
+     *   a) TIFF_NON_EXISTENT_DIR_NUMBER if there is no IFD in the file
+     *      or the state is unknown,
+     *      or the last read (i.e. TIFFFetchDirectory()) failed,
+     *      or a custom directory was written.
+     *   b) IFD index of last IFD written in the file. In this case the
+     *      active IFD is a new (empty) one and tif_diroff is zero.
+     *      If writing fails, tif_curdir is not changed.
+     *   c) IFD index of IFD read from file into memory (=active IFD),
+     *      even if IFD is corrupt and TIFFReadDirectory() returns 0.
+     *      Then tif_diroff contains the offset of the IFD in the file.
+     *   d) IFD index 0, whenever a custom directory or an unchained SubIFD
+     *      was read. */
+    tdir_t tif_curdir; /* current directory (index) */
+    /* tif_curdircount: number of directories (main-IFDs) in file:
+     * - TIFF_NON_EXISTENT_DIR_NUMBER means 'dont know number of IFDs'.
+     * - 0 means 'empty file opened for writing, but no IFD written yet' */
+    tdir_t tif_curdircount;
+    uint32_t tif_curstrip;     /* current strip for read/write */
+    uint64_t tif_curoff;       /* current offset for read/write */
+    uint64_t tif_lastvalidoff; /* last valid offset allowed for rewrite in
+                                  place. Used only by TIFFAppendToStrip() */
+    uint64_t tif_dataoff;      /* current offset for writing dir (IFD) */
     /* SubIFD support */
     uint16_t tif_nsubifd;   /* remaining subifds to write */
     uint64_t tif_subifdoff; /* offset for patching SubIFD link */

From 7e816010cdbe7556516e72bd7b3413585a56b372 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 11 Aug 2024 17:44:39 +0200
Subject: [PATCH 91/94] Skip test_vsicurl_test_CPL_VSIL_CURL_USE_HEAD_NO() with
 buggy curl 8.9.1

It turns out that curl 8.9.1 has a bug related to SIGPIPE handling which
caused SIGPIPE to no longer being ignored.
Cf https://github.com/curl/curl/issues/14344 / https://github.com/curl/curl/pull/14390
Fixes #10540
---
 autotest/gcore/vsicurl.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/autotest/gcore/vsicurl.py b/autotest/gcore/vsicurl.py
index dd6f3e08dcb5..099da1e57c5c 100755
--- a/autotest/gcore/vsicurl.py
+++ b/autotest/gcore/vsicurl.py
@@ -48,13 +48,7 @@ def curl_version():
     return actual_version
 
 
-pytestmark = [
-    pytest.mark.require_curl(),
-    pytest.mark.skipif(
-        curl_version() >= [8, 9, 1],
-        reason="fail with SIGPIPE",
-    ),
-]
+pytestmark = pytest.mark.require_curl()
 
 ###############################################################################
 #
@@ -1160,6 +1154,11 @@ def test_vsicurl_GDAL_HTTP_HEADERS(server):
 # Test CPL_VSIL_CURL_USE_HEAD=NO
 
 
+# Cf fix of https://github.com/curl/curl/pull/14390
+@pytest.mark.skipif(
+    curl_version() == [8, 9, 1],
+    reason="fail with SIGPIPE with curl 8.9.1",
+)
 def test_vsicurl_test_CPL_VSIL_CURL_USE_HEAD_NO(server):
 
     gdal.VSICurlClearCache()

From c9c4e09c457a9407873ff4d947a131ea4d1bc9b5 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 11 Aug 2024 20:27:03 +0200
Subject: [PATCH 92/94] Conda: fix numpy detection for python 3.12.5 + numpy
 2.0

---
 ci/travis/conda/install_python.sh.patch | 16 ++++++++++++++++
 ci/travis/conda/setup.sh                |  1 +
 2 files changed, 17 insertions(+)
 create mode 100644 ci/travis/conda/install_python.sh.patch

diff --git a/ci/travis/conda/install_python.sh.patch b/ci/travis/conda/install_python.sh.patch
new file mode 100644
index 000000000000..05b98587bd94
--- /dev/null
+++ b/ci/travis/conda/install_python.sh.patch
@@ -0,0 +1,16 @@
+diff --git a/recipe/install_python.sh b/recipe/install_python.sh
+index 9cdaa2c..48d4ad2 100644
+--- a/recipe/install_python.sh
++++ b/recipe/install_python.sh
+@@ -10,8 +10,11 @@ rm -rf swig/python
+ 
+ Python_LOOKUP_VERSION=$($PYTHON -c "import sys; print(str(sys.version_info.major)+'.'+str(sys.version_info.minor)+'.'+str(sys.version_info.micro))")
+ 
++Python_NumPy_INCLUDE_DIR=$($PYTHON -c "import numpy; print(numpy.get_include())")
++
+ cmake "-UPython*" "-U*LATER_PLUGIN" \
+       -DPython_LOOKUP_VERSION=${Python_LOOKUP_VERSION} \
++      -DPython_NumPy_INCLUDE_DIR=${Python_NumPy_INCLUDE_DIR} \
+       -DBUILD_PYTHON_BINDINGS:BOOL=ON \
+       ${SRC_DIR} || (cat CMakeFiles/CMakeError.log;false)
+ 
diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh
index 44da66498178..7101ef18cb11 100755
--- a/ci/travis/conda/setup.sh
+++ b/ci/travis/conda/setup.sh
@@ -20,6 +20,7 @@ git clone  https://github.com/conda-forge/gdal-feedstock.git
 cd gdal-feedstock
 
 patch -p1 < ../ci/travis/conda/meta.yaml.patch
+patch -p1 < ../ci/travis/conda/install_python.sh.patch
 
 cat > recipe/recipe_clobber.yaml <<EOL
 source:

From 7c833383778f9c63f42c3cafdf33934b846c289a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Aug 2024 10:07:20 +0200
Subject: [PATCH 93/94] Conda: remove setuptools hack

---
 ci/travis/conda/meta.yaml.patch | 28 ----------------------------
 ci/travis/conda/setup.sh        |  1 -
 2 files changed, 29 deletions(-)
 delete mode 100644 ci/travis/conda/meta.yaml.patch

diff --git a/ci/travis/conda/meta.yaml.patch b/ci/travis/conda/meta.yaml.patch
deleted file mode 100644
index 96047817d95b..000000000000
--- a/ci/travis/conda/meta.yaml.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/recipe/meta.yaml b/recipe/meta.yaml
-index f3afcef..eb825ae 100644
---- a/recipe/meta.yaml
-+++ b/recipe/meta.yaml
-@@ -31,6 +31,7 @@ requirements:
-     - {{ stdlib("c") }}
-     - {{ compiler('cxx') }}
-     - swig
-+    - setuptools
-   host:
-     - blosc
-     - expat
-@@ -614,6 +615,7 @@ outputs:
-         - python                                 # [build_platform != target_platform]
-         - cross-python_{{ target_platform }}     # [build_platform != target_platform]
-         - numpy                                  # [build_platform != target_platform]
-+        - setuptools
-         - swig
-       host:
-         - python
-@@ -623,6 +625,7 @@ outputs:
-         - libkml-devel
-         - libxml2
-         - expat
-+        - setuptools
-       run:
-         - python
-         - libgdal-core {{ version }}.*
diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh
index 7101ef18cb11..2989fe47ef37 100755
--- a/ci/travis/conda/setup.sh
+++ b/ci/travis/conda/setup.sh
@@ -19,7 +19,6 @@ git clone  https://github.com/conda-forge/gdal-feedstock.git
 
 cd gdal-feedstock
 
-patch -p1 < ../ci/travis/conda/meta.yaml.patch
 patch -p1 < ../ci/travis/conda/install_python.sh.patch
 
 cat > recipe/recipe_clobber.yaml <<EOL

From 6339b46c60e2ef8c408fe33eb38a9ecbb9f1e131 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 12 Aug 2024 16:38:05 +0200
Subject: [PATCH 94/94] Revert "Conda: fix numpy detection for python 3.12.5 +
 numpy 2.0"

This reverts commit c9c4e09c457a9407873ff4d947a131ea4d1bc9b5.

No longer necessary since this has been upstreamed per https://github.com/conda-forge/gdal-feedstock/pull/972
---
 ci/travis/conda/install_python.sh.patch | 16 ----------------
 ci/travis/conda/setup.sh                |  2 --
 2 files changed, 18 deletions(-)
 delete mode 100644 ci/travis/conda/install_python.sh.patch

diff --git a/ci/travis/conda/install_python.sh.patch b/ci/travis/conda/install_python.sh.patch
deleted file mode 100644
index 05b98587bd94..000000000000
--- a/ci/travis/conda/install_python.sh.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/recipe/install_python.sh b/recipe/install_python.sh
-index 9cdaa2c..48d4ad2 100644
---- a/recipe/install_python.sh
-+++ b/recipe/install_python.sh
-@@ -10,8 +10,11 @@ rm -rf swig/python
- 
- Python_LOOKUP_VERSION=$($PYTHON -c "import sys; print(str(sys.version_info.major)+'.'+str(sys.version_info.minor)+'.'+str(sys.version_info.micro))")
- 
-+Python_NumPy_INCLUDE_DIR=$($PYTHON -c "import numpy; print(numpy.get_include())")
-+
- cmake "-UPython*" "-U*LATER_PLUGIN" \
-       -DPython_LOOKUP_VERSION=${Python_LOOKUP_VERSION} \
-+      -DPython_NumPy_INCLUDE_DIR=${Python_NumPy_INCLUDE_DIR} \
-       -DBUILD_PYTHON_BINDINGS:BOOL=ON \
-       ${SRC_DIR} || (cat CMakeFiles/CMakeError.log;false)
- 
diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh
index 2989fe47ef37..b4cd637babee 100755
--- a/ci/travis/conda/setup.sh
+++ b/ci/travis/conda/setup.sh
@@ -19,8 +19,6 @@ git clone  https://github.com/conda-forge/gdal-feedstock.git
 
 cd gdal-feedstock
 
-patch -p1 < ../ci/travis/conda/install_python.sh.patch
-
 cat > recipe/recipe_clobber.yaml <<EOL
 source:
   path: ../../../gdal