From df71b418157c69a3f20356d9956bd6a21ffae72d Mon Sep 17 00:00:00 2001
From: Momtchil Momtchev <momtchil@momtchev.com>
Date: Sat, 21 Mar 2026 18:13:24 +0100
Subject: [PATCH] update GDAL to 3.12.3

---
 CHANGELOG.md                                  |   5 +
 deps/libgdal.sh                               |   2 +-
 deps/libgdal/gdal/CITATION.cff                |   4 +-
 deps/libgdal/gdal/VERSION                     |   2 +-
 deps/libgdal/gdal/alg/gdal_homography.cpp     |   4 +-
 deps/libgdal/gdal/alg/gdalwarper.cpp          |  26 ++-
 deps/libgdal/gdal/alg/gdalwarpkernel.cpp      |   9 +
 deps/libgdal/gdal/alg/viewshed/viewshed.cpp   |  11 +-
 deps/libgdal/gdal/apps/gdal_grid_lib.cpp      |   2 +-
 deps/libgdal/gdal/apps/gdal_translate_lib.cpp |   2 +-
 .../gdal/apps/gdalalg_abstract_pipeline.h     |   3 +
 deps/libgdal/gdal/apps/gdalalg_pipeline.cpp   |  20 +-
 .../libgdal/gdal/apps/gdalalg_raster_calc.cpp |   8 +-
 .../gdal/apps/gdalalg_raster_contour.cpp      |   5 +
 .../libgdal/gdal/apps/gdalalg_raster_edit.cpp |   1 +
 .../gdal/apps/gdalalg_raster_polygonize.cpp   |   5 +
 .../gdal/apps/gdalalg_raster_viewshed.cpp     |   4 +-
 .../gdal/apps/gdalalg_vector_select.cpp       |  18 +-
 deps/libgdal/gdal/apps/gdalbuildvrt_lib.cpp   |   2 +-
 deps/libgdal/gdal/apps/gdalinfo_lib.cpp       |   5 +-
 deps/libgdal/gdal/apps/gdaltindex_lib.cpp     |  60 +++++-
 deps/libgdal/gdal/apps/ogr2ogr_lib.cpp        |   2 +-
 .../gdal/frmts/georaster/cpl_vsil_ocilob.cpp  |   8 +-
 .../frmts/georaster/georaster_wrapper.cpp     |   6 +-
 deps/libgdal/gdal/frmts/gif/giflib/dgif_lib.c |   6 +-
 .../gdal/frmts/gti/gdaltileindexdataset.cpp   | 141 ++++++++++++--
 .../gdal/frmts/gtiff/gtiffdataset_read.cpp    |  22 ++-
 .../gdal/frmts/gtiff/gtiffdataset_write.cpp   |  32 ++-
 .../gdal/frmts/gtiff/gtiffrasterband_read.cpp |   9 +-
 deps/libgdal/gdal/frmts/hdf5/CMakeLists.txt   |   8 +
 .../gdal/frmts/libertiff/libertiffdataset.cpp |  15 +-
 .../gdal/frmts/netcdf/netcdfdataset.cpp       |  56 +++++-
 .../gdal/frmts/netcdf/netcdfdrivercore.cpp    |  17 ++
 .../libgdal/gdal/frmts/nitf/rpftocdataset.cpp | 112 ++++++-----
 deps/libgdal/gdal/frmts/pdf/pdfdataset.cpp    |  58 ++++--
 deps/libgdal/gdal/frmts/pdf/pdfio.cpp         |   9 +
 deps/libgdal/gdal/frmts/pdf/pdfio.h           |   5 +
 deps/libgdal/gdal/frmts/pds/pds4dataset.cpp   |  10 +-
 deps/libgdal/gdal/frmts/vrt/vrtdataset.h      |   4 +
 .../gdal/frmts/vrt/vrtderivedrasterband.cpp   | 182 +++++++++++-------
 .../gdal/frmts/vrt/vrtsourcedrasterband.cpp   | 123 ++++++------
 deps/libgdal/gdal/frmts/vrt/vrtwarped.cpp     |   4 +-
 .../libgdal/gdal/frmts/zarr/zarr_v2_array.cpp |  36 ++--
 deps/libgdal/gdal/gcore/gdal_misc.cpp         |   4 +-
 deps/libgdal/gdal/gcore/gdal_version.h        |   6 +-
 .../gcore/gdal_version_full/gdal_version.h    |   6 +-
 deps/libgdal/gdal/gcore/gdalalgorithm.cpp     |  54 ++++--
 deps/libgdal/gdal/gcore/gdaldriver.cpp        |  95 ++++++---
 deps/libgdal/gdal/gcore/gdalmultidim.cpp      |   6 +-
 .../gdal/gcore/mdreader/reader_eros.cpp       |   5 +
 deps/libgdal/gdal/gcore/overview.cpp          |   2 +-
 deps/libgdal/gdal/ogr/ogr_srs_api.h           |   2 +-
 .../gdal/ogr/ogrsf_frmts/adbc/ogr_adbc.h      |   4 +-
 .../ogrsf_frmts/adbc/ogradbcbigquerylayer.cpp |   2 +-
 .../ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp   |   2 +
 .../ogr/ogrsf_frmts/adbc/ogradbclayer.cpp     | 134 ++++++++++---
 .../ogr/ogrsf_frmts/generic/ogr_gensql.cpp    |  47 +++--
 .../gdal/ogr/ogrsf_frmts/generic/ogr_gensql.h |   1 +
 .../gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp   |  69 ++++---
 .../gpkg/ogrgeopackagetablelayer.cpp          |   8 +
 deps/libgdal/gdal/port/cpl_conv.cpp           |   8 +-
 deps/libgdal/gdal/port/cpl_conv.h             |   8 +-
 .../gdal/port/cpl_known_config_options.h      |   1 +
 deps/libgdal/gdal/port/cpl_path.cpp           | 132 ++++++++++++-
 deps/libgdal/gdal/port/cpl_vsil_s3.cpp        | 178 ++++++++++-------
 65 files changed, 1342 insertions(+), 495 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a9680a74b..8974a43cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.12.3] 2026-03-21
+
+### Added
+ - GDAL 3.12.3
+
 ## [3.12.2] 2026-02-11
 
 ### Added
diff --git a/deps/libgdal.sh b/deps/libgdal.sh
index ceefe2a2c..261fc7170 100755
--- a/deps/libgdal.sh
+++ b/deps/libgdal.sh
@@ -5,7 +5,7 @@ set -eu
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd "$DIR/libgdal"
 
-GDAL_VERSION=3.12.2
+GDAL_VERSION=3.12.3
 GDAL_VERSION_SUFFIX=
 dir_gdal=./gdal
 dir_formats_gyp=./gyp-formats
diff --git a/deps/libgdal/gdal/CITATION.cff b/deps/libgdal/gdal/CITATION.cff
index c0263237c..928f8702f 100644
--- a/deps/libgdal/gdal/CITATION.cff
+++ b/deps/libgdal/gdal/CITATION.cff
@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: Please cite this software using these metadata or in the CITATION file.
 type: software
 title: GDAL
-version: 3.12.2
-date-released: 2026-02-03
+version: 3.12.3
+date-released: 2026-03-17
 doi: 10.5281/zenodo.5884351
 abstract: GDAL is a translator library for raster and vector geospatial data
   formats that is released under an MIT style Open Source License by the Open
diff --git a/deps/libgdal/gdal/VERSION b/deps/libgdal/gdal/VERSION
index 8531a3b7e..871f80a34 100644
--- a/deps/libgdal/gdal/VERSION
+++ b/deps/libgdal/gdal/VERSION
@@ -1 +1 @@
-3.12.2
+3.12.3
diff --git a/deps/libgdal/gdal/alg/gdal_homography.cpp b/deps/libgdal/gdal/alg/gdal_homography.cpp
index 332326352..f8f35b814 100644
--- a/deps/libgdal/gdal/alg/gdal_homography.cpp
+++ b/deps/libgdal/gdal/alg/gdal_homography.cpp
@@ -62,8 +62,8 @@ static void *GDALCreateSimilarHomographyTransformer(void *hTransformArg,
         double homography[9];
         for (int i = 0; i < 3; i++)
         {
-            homography[3 * i + 1] = psInfo->padfForward[3 * i + 1] / dfRatioX;
-            homography[3 * i + 2] = psInfo->padfForward[3 * i + 2] / dfRatioY;
+            homography[3 * i + 1] = psInfo->padfForward[3 * i + 1] * dfRatioX;
+            homography[3 * i + 2] = psInfo->padfForward[3 * i + 2] * dfRatioY;
             homography[3 * i] = psInfo->padfForward[3 * i];
         }
         psInfo = static_cast<HomographyTransformInfo *>(
diff --git a/deps/libgdal/gdal/alg/gdalwarper.cpp b/deps/libgdal/gdal/alg/gdalwarper.cpp
index 32b0cb573..dec1307e5 100644
--- a/deps/libgdal/gdal/alg/gdalwarper.cpp
+++ b/deps/libgdal/gdal/alg/gdalwarper.cpp
@@ -265,13 +265,15 @@ CPLErr CPL_STDCALL GDALCreateAndReprojectImage(
     int nPixels = 0;
     int nLines = 0;
 
-    if (GDALSuggestedWarpOutput(hSrcDS, GDALGenImgProjTransform, hTransformArg,
-                                adfDstGeoTransform, &nPixels,
-                                &nLines) != CE_None)
-        return CE_Failure;
+    CPLErr eErr =
+        GDALSuggestedWarpOutput(hSrcDS, GDALGenImgProjTransform, hTransformArg,
+                                adfDstGeoTransform, &nPixels, &nLines);
 
     GDALDestroyGenImgProjTransformer(hTransformArg);
 
+    if (eErr != CE_None)
+        return eErr;
+
     /* -------------------------------------------------------------------- */
     /*      Create the output file.                                         */
     /* -------------------------------------------------------------------- */
@@ -292,9 +294,9 @@ CPLErr CPL_STDCALL GDALCreateAndReprojectImage(
     /* -------------------------------------------------------------------- */
     /*      Perform the reprojection.                                       */
     /* -------------------------------------------------------------------- */
-    CPLErr eErr = GDALReprojectImage(
-        hSrcDS, pszSrcWKT, hDstDS, pszDstWKT, eResampleAlg, dfWarpMemoryLimit,
-        dfMaxError, pfnProgress, pProgressArg, psOptions);
+    eErr = GDALReprojectImage(hSrcDS, pszSrcWKT, hDstDS, pszDstWKT,
+                              eResampleAlg, dfWarpMemoryLimit, dfMaxError,
+                              pfnProgress, pProgressArg, psOptions);
 
     GDALClose(hDstDS);
 
@@ -371,6 +373,11 @@ CPLErr GDALWarpNoDataMasker(void *pMaskFuncArg, int nBandCount,
                                          *ppImageData,  // Already a GByte *.
                                          panValidityMask, pbOutAllValid);
 
+        case GDT_Int8:
+            return GDALWarpNoDataMaskerT(
+                padfNoData, nPixels, reinterpret_cast<int8_t *>(*ppImageData),
+                panValidityMask, pbOutAllValid);
+
         case GDT_Int16:
             return GDALWarpNoDataMaskerT(
                 padfNoData, nPixels, reinterpret_cast<GInt16 *>(*ppImageData),
@@ -1756,8 +1763,6 @@ void CPL_STDCALL GDALWarpResolveWorkingDataType(GDALWarpOptions *psOptions)
         return;
     }
 
-    psOptions->eWorkingDataType = GDT_Byte;
-
     // If none of the provided input nodata values can be represented in the
     // data type of the corresponding source band, ignore them.
     if (psOptions->hSrcDS && psOptions->padfSrcNoDataReal)
@@ -1843,6 +1848,9 @@ void CPL_STDCALL GDALWarpResolveWorkingDataType(GDALWarpOptions *psOptions)
         }
     }
 
+    if (psOptions->eWorkingDataType == GDT_Unknown)
+        psOptions->eWorkingDataType = GDT_Byte;
+
     const bool bApplyVerticalShift = CPLFetchBool(
         psOptions->papszWarpOptions, "APPLY_VERTICAL_SHIFT", false);
     if (bApplyVerticalShift &&
diff --git a/deps/libgdal/gdal/alg/gdalwarpkernel.cpp b/deps/libgdal/gdal/alg/gdalwarpkernel.cpp
index 78e8aece9..6b4b7c62e 100644
--- a/deps/libgdal/gdal/alg/gdalwarpkernel.cpp
+++ b/deps/libgdal/gdal/alg/gdalwarpkernel.cpp
@@ -186,6 +186,7 @@ static CPLErr GWKBilinearNoMasksOrDstDensityOnlyDouble(GDALWarpKernel *poWK);
 #endif
 static CPLErr GWKCubicNoMasksOrDstDensityOnlyShort(GDALWarpKernel *poWK);
 static CPLErr GWKCubicSplineNoMasksOrDstDensityOnlyShort(GDALWarpKernel *poWK);
+static CPLErr GWKNearestInt8(GDALWarpKernel *poWK);
 static CPLErr GWKNearestShort(GDALWarpKernel *poWK);
 static CPLErr GWKNearestUnsignedShort(GDALWarpKernel *poWK);
 static CPLErr GWKNearestNoMasksOrDstDensityOnlyFloat(GDALWarpKernel *poWK);
@@ -1253,6 +1254,9 @@ CPLErr GDALWarpKernel::PerformWarp()
         bNoMasksOrDstDensityOnly)
         return GWKBilinearNoMasksOrDstDensityOnlyUShort(this);
 
+    if (eWorkingDataType == GDT_Int8 && eResample == GRA_NearestNeighbour)
+        return GWKNearestInt8(this);
+
     if (eWorkingDataType == GDT_Int16 && eResample == GRA_NearestNeighbour)
         return GWKNearestShort(this);
 
@@ -6660,6 +6664,11 @@ static CPLErr GWKCubicSplineNoMasksOrDstDensityOnlyUShort(GDALWarpKernel *poWK)
         GWKResampleNoMasksOrDstDensityOnlyThread<GUInt16, GRA_CubicSpline>);
 }
 
+static CPLErr GWKNearestInt8(GDALWarpKernel *poWK)
+{
+    return GWKRun(poWK, "GWKNearestInt8", GWKNearestThread<int8_t>);
+}
+
 static CPLErr GWKNearestShort(GDALWarpKernel *poWK)
 {
     return GWKRun(poWK, "GWKNearestShort", GWKNearestThread<GInt16>);
diff --git a/deps/libgdal/gdal/alg/viewshed/viewshed.cpp b/deps/libgdal/gdal/alg/viewshed/viewshed.cpp
index 6cfe6bd42..ad039439d 100644
--- a/deps/libgdal/gdal/alg/viewshed/viewshed.cpp
+++ b/deps/libgdal/gdal/alg/viewshed/viewshed.cpp
@@ -178,11 +178,14 @@ GDALDatasetH GDALViewshedGenerate(
                  "dfInvisibleVal out of range. Must be [0, 255].");
         return nullptr;
     }
-    if (!GDALIsValueInRange<uint8_t>(dfOutOfRangeVal))
+    if (oOpts.outputMode == viewshed::OutputMode::Normal)
     {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "dfOutOfRangeVal out of range. Must be [0, 255].");
-        return nullptr;
+        if (!GDALIsValueInRange<uint8_t>(dfOutOfRangeVal))
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "dfOutOfRangeVal out of range. Must be [0, 255].");
+            return nullptr;
+        }
     }
     oOpts.visibleVal = dfVisibleVal;
     oOpts.invisibleVal = dfInvisibleVal;
diff --git a/deps/libgdal/gdal/apps/gdal_grid_lib.cpp b/deps/libgdal/gdal/apps/gdal_grid_lib.cpp
index 93104b03a..d0260035c 100644
--- a/deps/libgdal/gdal/apps/gdal_grid_lib.cpp
+++ b/deps/libgdal/gdal/apps/gdal_grid_lib.cpp
@@ -973,7 +973,7 @@ GDALGridOptionsGetParser(GDALGridOptions *psOptions,
         .help(_("Set the size of the output file."));
 
     argParser->add_argument("-tr")
-        .metavar("<xres> <yes>")
+        .metavar("<xres> <yres>")
         .nargs(2)
         .scan<'g', double>()
         .help(_("Set target resolution."));
diff --git a/deps/libgdal/gdal/apps/gdal_translate_lib.cpp b/deps/libgdal/gdal/apps/gdal_translate_lib.cpp
index 4f3516355..685af7b55 100644
--- a/deps/libgdal/gdal/apps/gdal_translate_lib.cpp
+++ b/deps/libgdal/gdal/apps/gdal_translate_lib.cpp
@@ -2944,7 +2944,7 @@ GDALTranslateOptionsGetParser(GDALTranslateOptions *psOptions,
         .help(_("Set the size of the output file."));
 
     argParser->add_argument("-tr")
-        .metavar("<xres> <yes>")
+        .metavar("<xres> <yres>")
         .nargs(2)
         .scan<'g', double>()
         .help(_("Set target resolution."));
diff --git a/deps/libgdal/gdal/apps/gdalalg_abstract_pipeline.h b/deps/libgdal/gdal/apps/gdalalg_abstract_pipeline.h
index 7a7542849..e2ed89a86 100644
--- a/deps/libgdal/gdal/apps/gdalalg_abstract_pipeline.h
+++ b/deps/libgdal/gdal/apps/gdalalg_abstract_pipeline.h
@@ -351,6 +351,9 @@ class GDALPipelineStepAlgorithm /* non final */ : public GDALAlgorithm
     void AddVectorInputArgs(bool hiddenForCLI);
     void AddVectorOutputArgs(bool hiddenForCLI,
                              bool shortNameOutputLayerAllowed);
+    using GDALAlgorithm::AddOutputLayerNameArg;
+    void AddOutputLayerNameArg(bool hiddenForCLI,
+                               bool shortNameOutputLayerAllowed);
 
   private:
     bool RunImpl(GDALProgressFunc pfnProgress, void *pProgressData) override;
diff --git a/deps/libgdal/gdal/apps/gdalalg_pipeline.cpp b/deps/libgdal/gdal/apps/gdalalg_pipeline.cpp
index 1bc52229a..19e508f49 100644
--- a/deps/libgdal/gdal/apps/gdalalg_pipeline.cpp
+++ b/deps/libgdal/gdal/apps/gdalalg_pipeline.cpp
@@ -221,11 +221,7 @@ void GDALPipelineStepAlgorithm::AddVectorOutputArgs(
     }
     if (m_constructorOptions.addOutputLayerNameArgument)
     {
-        AddArg(GDAL_ARG_NAME_OUTPUT_LAYER,
-               shortNameOutputLayerAllowed ? 'l' : 0, _("Output layer name"),
-               &m_outputLayerName)
-            .AddHiddenAlias("nln")  // For ogr2ogr nostalgic people
-            .SetHiddenForCLI(hiddenForCLI);
+        AddOutputLayerNameArg(hiddenForCLI, shortNameOutputLayerAllowed);
     }
     if (m_constructorOptions.addSkipErrorsArgument)
     {
@@ -235,6 +231,20 @@ void GDALPipelineStepAlgorithm::AddVectorOutputArgs(
     }
 }
 
+/************************************************************************/
+/*          GDALPipelineStepAlgorithm::AddOutputLayerNameArg()          */
+/************************************************************************/
+
+void GDALPipelineStepAlgorithm::AddOutputLayerNameArg(
+    bool hiddenForCLI, bool shortNameOutputLayerAllowed)
+{
+    AddArg(GDAL_ARG_NAME_OUTPUT_LAYER, shortNameOutputLayerAllowed ? 'l' : 0,
+           _("Output layer name"),
+           &m_outputLayerName)
+        .AddHiddenAlias("nln")  // For ogr2ogr nostalgic people
+        .SetHiddenForCLI(hiddenForCLI);
+}
+
 /************************************************************************/
 /*                 GDALPipelineStepAlgorithm::RunImpl()                 */
 /************************************************************************/
diff --git a/deps/libgdal/gdal/apps/gdalalg_raster_calc.cpp b/deps/libgdal/gdal/apps/gdalalg_raster_calc.cpp
index 49c8887cb..cf1726ad8 100644
--- a/deps/libgdal/gdal/apps/gdalalg_raster_calc.cpp
+++ b/deps/libgdal/gdal/apps/gdalalg_raster_calc.cpp
@@ -183,6 +183,7 @@ struct SourceProperties
     int nBands{0};
     int nX{0};
     int nY{0};
+    bool hasGT{false};
     GDALGeoTransform gt{};
     std::unique_ptr<OGRSpatialReference, OGRSpatialReferenceReleaser> srs{
         nullptr};
@@ -777,7 +778,7 @@ static std::unique_ptr<GDALDataset> GDALCalcCreateVRTDerived(
         out.nBands = 1;
         out.srs.reset(ds->GetSpatialRef() ? ds->GetSpatialRef()->Clone()
                                           : nullptr);
-        ds->GetGeoTransform(out.gt);
+        out.hasGT = ds->GetGeoTransform(out.gt) == CE_None;
     }
 
     CPLXMLTreeCloser root(CPLCreateXMLNode(nullptr, CXT_Element, "VRTDataset"));
@@ -847,7 +848,10 @@ static std::unique_ptr<GDALDataset> GDALCalcCreateVRTDerived(
     {
         return nullptr;
     };
-    ds->SetGeoTransform(out.gt);
+    if (out.hasGT)
+    {
+        ds->SetGeoTransform(out.gt);
+    }
     if (out.srs)
     {
         ds->SetSpatialRef(out.srs.get());
diff --git a/deps/libgdal/gdal/apps/gdalalg_raster_contour.cpp b/deps/libgdal/gdal/apps/gdalalg_raster_contour.cpp
index e089755ac..e63154803 100644
--- a/deps/libgdal/gdal/apps/gdalalg_raster_contour.cpp
+++ b/deps/libgdal/gdal/apps/gdalalg_raster_contour.cpp
@@ -50,6 +50,11 @@ GDALRasterContourAlgorithm::GDALRasterContourAlgorithm(bool standaloneStep)
         AddRasterInputArgs(false, false);
         AddVectorOutputArgs(false, false);
     }
+    else
+    {
+        AddOutputLayerNameArg(/* hiddenForCLI = */ false,
+                              /* shortNameOutputLayerAllowed = */ false);
+    }
 
     // gdal_contour specific options
     AddBandArg(&m_band).SetDefault(1);
diff --git a/deps/libgdal/gdal/apps/gdalalg_raster_edit.cpp b/deps/libgdal/gdal/apps/gdalalg_raster_edit.cpp
index 93afd14a1..4b2714607 100644
--- a/deps/libgdal/gdal/apps/gdalalg_raster_edit.cpp
+++ b/deps/libgdal/gdal/apps/gdalalg_raster_edit.cpp
@@ -53,6 +53,7 @@ GDALRasterEditAlgorithm::GDALRasterEditAlgorithm(bool standaloneStep)
                &m_dataset, GDAL_OF_RASTER | GDAL_OF_UPDATE)
             .SetPositional()
             .SetRequired();
+        AddOpenOptionsArg(&m_openOptions);
         AddArg("auxiliary", 0,
                _("Ask for an auxiliary .aux.xml file to be edited"),
                &m_readOnly)
diff --git a/deps/libgdal/gdal/apps/gdalalg_raster_polygonize.cpp b/deps/libgdal/gdal/apps/gdalalg_raster_polygonize.cpp
index cb178fadb..95984f044 100644
--- a/deps/libgdal/gdal/apps/gdalalg_raster_polygonize.cpp
+++ b/deps/libgdal/gdal/apps/gdalalg_raster_polygonize.cpp
@@ -46,6 +46,11 @@ GDALRasterPolygonizeAlgorithm::GDALRasterPolygonizeAlgorithm(
         AddRasterInputArgs(false, false);
         AddVectorOutputArgs(false, false);
     }
+    else
+    {
+        AddOutputLayerNameArg(/* hiddenForCLI = */ false,
+                              /* shortNameOutputLayerAllowed = */ false);
+    }
 
     // gdal_polygonize specific options
     AddBandArg(&m_band).SetDefault(m_band);
diff --git a/deps/libgdal/gdal/apps/gdalalg_raster_viewshed.cpp b/deps/libgdal/gdal/apps/gdalalg_raster_viewshed.cpp
index f3a1a3270..d26641a14 100644
--- a/deps/libgdal/gdal/apps/gdalalg_raster_viewshed.cpp
+++ b/deps/libgdal/gdal/apps/gdalalg_raster_viewshed.cpp
@@ -121,9 +121,7 @@ GDALRasterViewshedAlgorithm::GDALRasterViewshedAlgorithm(bool standaloneStep)
            _("Pixel value to set for the cells that fall outside of the range "
              "specified by the observer location and the maximum distance"),
            &m_opts.outOfRangeVal)
-        .SetDefault(m_opts.outOfRangeVal)
-        .SetMinValueIncluded(0)
-        .SetMaxValueIncluded(255);
+        .SetDefault(m_opts.outOfRangeVal);
     AddArg("dst-nodata", 0,
            _("The value to be set for the cells in the output raster that have "
              "no data."),
diff --git a/deps/libgdal/gdal/apps/gdalalg_vector_select.cpp b/deps/libgdal/gdal/apps/gdalalg_vector_select.cpp
index 605f7f26b..5f9853d31 100644
--- a/deps/libgdal/gdal/apps/gdalalg_vector_select.cpp
+++ b/deps/libgdal/gdal/apps/gdalalg_vector_select.cpp
@@ -32,6 +32,11 @@ GDALVectorSelectAlgorithm::GDALVectorSelectAlgorithm(bool standaloneStep)
     : GDALVectorPipelineStepAlgorithm(NAME, DESCRIPTION, HELP_URL,
                                       standaloneStep)
 {
+    if (!standaloneStep)
+    {
+        AddOutputLayerNameArg(/* hiddenForCLI = */ false,
+                              /* shortNameOutputLayerAllowed = */ false);
+    }
     AddActiveLayerArg(&m_activeLayer);
     AddArg("fields", 0, _("Fields to select (or exclude if --exclude)"),
            &m_fields)
@@ -90,11 +95,14 @@ class GDALVectorSelectAlgorithmLayer final
     }
 
   public:
-    explicit GDALVectorSelectAlgorithmLayer(OGRLayer &oSrcLayer)
+    explicit GDALVectorSelectAlgorithmLayer(
+        OGRLayer &oSrcLayer, const std::string &osOutputLayerName)
         : GDALVectorPipelineOutputLayer(oSrcLayer),
-          m_poFeatureDefn(new OGRFeatureDefn(oSrcLayer.GetName()))
+          m_poFeatureDefn(new OGRFeatureDefn(osOutputLayerName.empty()
+                                                 ? oSrcLayer.GetName()
+                                                 : osOutputLayerName.c_str()))
     {
-        SetDescription(oSrcLayer.GetDescription());
+        SetDescription(m_poFeatureDefn->GetName());
         SetMetadata(oSrcLayer.GetMetadata());
         m_poFeatureDefn->SetGeomType(wkbNone);
         m_poFeatureDefn->Reference();
@@ -301,8 +309,8 @@ bool GDALVectorSelectAlgorithm::RunStep(GDALPipelineStepRunContext &)
         if (m_activeLayer.empty() ||
             m_activeLayer == poSrcLayer->GetDescription())
         {
-            auto poLayer =
-                std::make_unique<GDALVectorSelectAlgorithmLayer>(*poSrcLayer);
+            auto poLayer = std::make_unique<GDALVectorSelectAlgorithmLayer>(
+                *poSrcLayer, m_outputLayerName);
             if (m_exclude)
             {
                 poLayer->ExcludeFields(m_fields);
diff --git a/deps/libgdal/gdal/apps/gdalbuildvrt_lib.cpp b/deps/libgdal/gdal/apps/gdalbuildvrt_lib.cpp
index de8eed036..9a05db230 100644
--- a/deps/libgdal/gdal/apps/gdalbuildvrt_lib.cpp
+++ b/deps/libgdal/gdal/apps/gdalbuildvrt_lib.cpp
@@ -2202,7 +2202,7 @@ GDALBuildVRTOptionsGetParser(GDALBuildVRTOptions *psOptions,
         .help(_("Control the way the output resolution is computed."));
 
     argParser->add_argument("-tr")
-        .metavar("<xres> <yes>")
+        .metavar("<xres> <yres>")
         .nargs(2)
         .scan<'g', double>()
         .help(_("Set target resolution."));
diff --git a/deps/libgdal/gdal/apps/gdalinfo_lib.cpp b/deps/libgdal/gdal/apps/gdalinfo_lib.cpp
index 174ace799..bca8a6805 100644
--- a/deps/libgdal/gdal/apps/gdalinfo_lib.cpp
+++ b/deps/libgdal/gdal/apps/gdalinfo_lib.cpp
@@ -298,8 +298,9 @@ GDALInfoAppOptionsGetParser(GDALInfoOptions *psOptions,
                 "system."));
 
     argParser->add_argument("-wkt_format")
-        .metavar("<WKT1|WKT2|WKT2_2015|WKT2_2018|WKT2_2019>")
-        .choices("WKT1", "WKT2", "WKT2_2015", "WKT2_2018", "WKT2_2019")
+        .metavar("<WKT1|WKT1_ESRI|WKT2|WKT2_2015|WKT2_2018|WKT2_2019>")
+        .choices("WKT1", "WKT1_ESRI", "WKT2", "WKT2_2015", "WKT2_2018",
+                 "WKT2_2019")
         .store_into(psOptions->osWKTFormat)
         .help(_("WKT format used for SRS."));
 
diff --git a/deps/libgdal/gdal/apps/gdaltindex_lib.cpp b/deps/libgdal/gdal/apps/gdaltindex_lib.cpp
index 932d2d317..f843fcaa1 100644
--- a/deps/libgdal/gdal/apps/gdaltindex_lib.cpp
+++ b/deps/libgdal/gdal/apps/gdaltindex_lib.cpp
@@ -1126,19 +1126,44 @@ GDALDatasetH GDALTileIndexInternal(const char *pszDest,
         adfX[4] = gt[0] + 0 * gt[1] + 0 * gt[2];
         adfY[4] = gt[3] + 0 * gt[4] + 0 * gt[5];
 
-        // If set target srs, do the forward transformation of all points.
+        // If set target srs, compute the reprojected extent.
+        // Use GDALWarp() with VRT output so the stored bounding box matches
+        // what the GTI reader computes in its Pass 1 (GetSourceDesc).
+        // A plain 4-corner transform or standalone GDALSuggestedWarpOutput2()
+        // can underestimate the extent because GDALWarp() may adjust the
+        // resolution after calling GDALSuggestedWarpOutput2(), producing a
+        // different pixel count and thus a different extent.
         if (!oTargetSRS.IsEmpty() && poSrcSRS)
         {
             if (!poSrcSRS->IsSame(&oTargetSRS))
             {
-                auto poCT = std::unique_ptr<OGRCoordinateTransformation>(
-                    OGRCreateCoordinateTransformation(poSrcSRS, &oTargetSRS));
-                if (!poCT || !poCT->Transform(5, adfX, adfY, nullptr))
+                char *pszDstWKT = nullptr;
+                oTargetSRS.exportToWkt(&pszDstWKT);
+
+                CPLStringList aosWarpArgs;
+                aosWarpArgs.AddString("-of");
+                aosWarpArgs.AddString("VRT");
+                aosWarpArgs.AddString("-t_srs");
+                aosWarpArgs.AddString(pszDstWKT);
+                CPLFree(pszDstWKT);
+
+                GDALWarpAppOptions *psWarpOptions =
+                    GDALWarpAppOptionsNew(aosWarpArgs.List(), nullptr);
+                GDALDatasetH hSrcDS = GDALDataset::ToHandle(poSrcDS.get());
+                GDALDatasetH ahSrcDS[] = {hSrcDS};
+                int bUsageError = false;
+                auto poWarpDS = std::unique_ptr<GDALDataset>(
+                    GDALDataset::FromHandle(GDALWarp(
+                        "", nullptr, 1, ahSrcDS, psWarpOptions, &bUsageError)));
+                GDALWarpAppOptionsFree(psWarpOptions);
+
+                if (!poWarpDS)
                 {
                     CPLError(bFailOnErrors ? CE_Failure : CE_Warning,
                              CPLE_AppDefined,
-                             "unable to transform points from source "
-                             "SRS `%s' to target SRS `%s' for file `%s'%s",
+                             "unable to compute reprojected extent from "
+                             "source SRS `%s' to target SRS `%s' for "
+                             "file `%s'%s",
                              poSrcDS->GetProjectionRef(),
                              psOptions->osTargetSRS.c_str(),
                              osFileNameToWrite.c_str(),
@@ -1147,6 +1172,29 @@ GDALDatasetH GDALTileIndexInternal(const char *pszDest,
                         return nullptr;
                     continue;
                 }
+
+                GDALGeoTransform warpGT;
+                poWarpDS->GetGeoTransform(warpGT);
+                const int nDstPixels = poWarpDS->GetRasterXSize();
+                const int nDstLines = poWarpDS->GetRasterYSize();
+
+                const double dfDstMinX = warpGT.xorig;
+                const double dfDstMaxY = warpGT.yorig;
+                const double dfDstMaxX =
+                    warpGT.xorig + nDstPixels * warpGT.xscale;
+                const double dfDstMinY =
+                    warpGT.yorig + nDstLines * warpGT.yscale;
+
+                adfX[0] = dfDstMinX;
+                adfY[0] = dfDstMaxY;
+                adfX[1] = dfDstMaxX;
+                adfY[1] = dfDstMaxY;
+                adfX[2] = dfDstMaxX;
+                adfY[2] = dfDstMinY;
+                adfX[3] = dfDstMinX;
+                adfY[3] = dfDstMinY;
+                adfX[4] = dfDstMinX;
+                adfY[4] = dfDstMaxY;
             }
         }
         else if (bIsGTIContext && !oAlreadyExistingSRS.IsEmpty() &&
diff --git a/deps/libgdal/gdal/apps/ogr2ogr_lib.cpp b/deps/libgdal/gdal/apps/ogr2ogr_lib.cpp
index f0332867c..9c37be71c 100644
--- a/deps/libgdal/gdal/apps/ogr2ogr_lib.cpp
+++ b/deps/libgdal/gdal/apps/ogr2ogr_lib.cpp
@@ -2970,7 +2970,7 @@ GDALDatasetH GDALVectorTranslate(const char *pszDest, GDALDatasetH hDstDS,
     // method.
     GDALDatasetUniquePtr poODSUniquePtr(hDstDS == nullptr ? poODS : nullptr);
 
-    // Some syntaxic sugar to make "ogr2ogr [-f PostgreSQL] PG:dbname=....
+    // Some syntactic sugar to make "ogr2ogr [-f PostgreSQL] PG:dbname=....
     // source [srclayer] -lco OVERWRITE=YES" work like "ogr2ogr -overwrite
     // PG:dbname=.... source [srclayer]" The former syntax used to work at
     // GDAL 1.1.8 time when it was documented in the PG driver, but was broken
diff --git a/deps/libgdal/gdal/frmts/georaster/cpl_vsil_ocilob.cpp b/deps/libgdal/gdal/frmts/georaster/cpl_vsil_ocilob.cpp
index 720254277..bb9848b20 100644
--- a/deps/libgdal/gdal/frmts/georaster/cpl_vsil_ocilob.cpp
+++ b/deps/libgdal/gdal/frmts/georaster/cpl_vsil_ocilob.cpp
@@ -94,10 +94,10 @@ char **WSIOCILobFSHandle::ParseIdentificator(const char *pszFilename)
         return nullptr;
     }
 
-    char **papszParam =
-        CSLTokenizeString2(&pszFilename[strlen("/vsiocilob/")], ",",
-                           CSLT_HONOURSTRINGS | CSLT_ALLOWEMPTYTOKENS |
-                               CSLT_STRIPLEADSPACES | CSLT_STRIPENDSPACES);
+    char **papszParam = CSLTokenizeString2(
+        &pszFilename[strlen("/vsiocilob/")], ",",
+        CSLT_HONOURSTRINGS | CSLT_ALLOWEMPTYTOKENS | CSLT_STRIPLEADSPACES |
+            CSLT_STRIPENDSPACES | CSLT_PRESERVEQUOTES);
 
     if (CSLCount(papszParam) < 6)
     {
diff --git a/deps/libgdal/gdal/frmts/georaster/georaster_wrapper.cpp b/deps/libgdal/gdal/frmts/georaster/georaster_wrapper.cpp
index be3130f8a..35986123f 100644
--- a/deps/libgdal/gdal/frmts/georaster/georaster_wrapper.cpp
+++ b/deps/libgdal/gdal/frmts/georaster/georaster_wrapper.cpp
@@ -214,7 +214,8 @@ char **GeoRasterWrapper::ParseIdentificator(const char *pszStringID)
     if (CSLCount(papszParam) > 0)
     {
         char **papszFirst2 = CSLTokenizeString2(
-            papszParam[0], "/", CSLT_HONOURSTRINGS | CSLT_ALLOWEMPTYTOKENS);
+            papszParam[0], "/",
+            CSLT_HONOURSTRINGS | CSLT_ALLOWEMPTYTOKENS | CSLT_PRESERVEQUOTES);
         if (CSLCount(papszFirst2) == 2)
         {
             papszParam = CSLInsertStrings(papszParam, 0, papszFirst2);
@@ -328,7 +329,8 @@ GeoRasterWrapper *GeoRasterWrapper::Open(const char *pszStringId, bool bUpdate,
     else
     {
         char **papszSchema = CSLTokenizeString2(
-            papszParam[3], ".", CSLT_HONOURSTRINGS | CSLT_ALLOWEMPTYTOKENS);
+            papszParam[3], ".",
+            CSLT_HONOURSTRINGS | CSLT_ALLOWEMPTYTOKENS | CSLT_PRESERVEQUOTES);
 
         if (CSLCount(papszSchema) == 2)
         {
diff --git a/deps/libgdal/gdal/frmts/gif/giflib/dgif_lib.c b/deps/libgdal/gdal/frmts/gif/giflib/dgif_lib.c
index 8713df20e..e634d4bc5 100644
--- a/deps/libgdal/gdal/frmts/gif/giflib/dgif_lib.c
+++ b/deps/libgdal/gdal/frmts/gif/giflib/dgif_lib.c
@@ -427,9 +427,7 @@ DGifGetImageDesc(GifFileType * GifFile) {
     Private->PixelCount = (long)GifFile->Image.Width *
        (long)GifFile->Image.Height;
 
-    DGifSetupDecompress(GifFile);  /* Reset decompress algorithm parameters. */
-
-    return GIF_OK;
+    return DGifSetupDecompress(GifFile);  /* Reset decompress algorithm parameters. */
 }
 
 /******************************************************************************
@@ -727,6 +725,8 @@ DGifSetupDecompress(GifFileType * GifFile) {
         return GIF_ERROR;    /* Failed to read Code size. */
     }
     BitsPerPixel = CodeSize;
+    if (BitsPerPixel > 8)
+        return GIF_ERROR;
 
     Private->Buf[0] = 0;    /* Input Buffer empty. */
     Private->BitsPerPixel = BitsPerPixel;
diff --git a/deps/libgdal/gdal/frmts/gti/gdaltileindexdataset.cpp b/deps/libgdal/gdal/frmts/gti/gdaltileindexdataset.cpp
index 2ad467321..550ba73e3 100644
--- a/deps/libgdal/gdal/frmts/gti/gdaltileindexdataset.cpp
+++ b/deps/libgdal/gdal/frmts/gti/gdaltileindexdataset.cpp
@@ -238,12 +238,21 @@ class GDALTileIndexDataset final : public GDALPamDataset
     //! SRS of the tile index.
     OGRSpatialReference m_oSRS{};
 
+    struct SharedDataset
+    {
+        //! Source dataset (possibly warped).
+        std::shared_ptr<GDALDataset> poDS{};
+
+        //! Source dataset, raw/unwarped
+        GDALDataset *poUnreprojectedDS = nullptr;
+    };
+
     //! Cache from dataset name to dataset handle.
     //! Note that the dataset objects are ultimately GDALProxyPoolDataset,
     //! and that the GDALProxyPoolDataset limits the number of simultaneously
     //! opened real datasets (controlled by GDAL_MAX_DATASET_POOL_SIZE). Hence 500 is not too big.
-    lru11::Cache<std::string, std::shared_ptr<GDALDataset>> m_oMapSharedSources{
-        500};
+    lru11::Cache<std::string, std::shared_ptr<SharedDataset>>
+        m_oMapSharedSources{500};
 
     //! Mask band (e.g. for JPEG compressed + mask band)
     std::unique_ptr<GDALTileIndexBand> m_poMaskBand{};
@@ -310,9 +319,12 @@ class GDALTileIndexDataset final : public GDALPamDataset
         //! Source dataset name.
         std::string osName{};
 
-        //! Source dataset handle.
+        //! Source dataset (possibly warped).
         std::shared_ptr<GDALDataset> poDS{};
 
+        //! Source dataset, raw/unwarped
+        GDALDataset *poUnreprojectedDS = nullptr;
+
         //! VRTSimpleSource or VRTComplexSource for the source.
         std::unique_ptr<VRTSimpleSource> poSource{};
 
@@ -350,6 +362,8 @@ class GDALTileIndexDataset final : public GDALPamDataset
     //! Whether the GTI file is a STAC collection
     bool m_bSTACCollection = false;
 
+    std::string m_osWarpMemory{};
+
     //! From a source dataset name, return its SourceDesc description structure.
     bool GetSourceDesc(const std::string &osTileName, SourceDesc &oSourceDesc,
                        std::mutex *pMutex);
@@ -2414,6 +2428,9 @@ bool GDALTileIndexDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     oOvManager.Initialize(this, poOpenInfo->pszFilename);
 
+    m_osWarpMemory = CSLFetchNameValueDef(poOpenInfo->papszOpenOptions,
+                                          "WARPING_MEMORY_SIZE", "");
+
     return true;
 }
 
@@ -3494,15 +3511,23 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
                                          SourceDesc &oSourceDesc,
                                          std::mutex *pMutex)
 {
-    std::shared_ptr<GDALDataset> poTileDS;
 
     if (pMutex)
         pMutex->lock();
-    const bool bTileKnown = m_oMapSharedSources.tryGet(osTileName, poTileDS);
+    std::shared_ptr<SharedDataset> sharedDS;
+    m_oMapSharedSources.tryGet(osTileName, sharedDS);
     if (pMutex)
         pMutex->unlock();
 
-    if (!bTileKnown)
+    std::shared_ptr<GDALDataset> poTileDS;
+    GDALDataset *poUnreprojectedDS = nullptr;
+
+    if (sharedDS)
+    {
+        poTileDS = sharedDS->poDS;
+        poUnreprojectedDS = sharedDS->poUnreprojectedDS;
+    }
+    else
     {
         poTileDS = std::shared_ptr<GDALDataset>(
             GDALProxyPoolDataset::Create(
@@ -3515,6 +3540,7 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
                      osTileName.c_str());
             return false;
         }
+        poUnreprojectedDS = poTileDS.get();
         if (poTileDS->GetRasterCount() == 0)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
@@ -3540,7 +3566,13 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
                      osTileName.c_str());
             bWarpVRT = true;
             bExportSRS = true;
-            bAddAlphaToVRT = true;
+            if (poTileDS->GetRasterBand(poTileDS->GetRasterCount())
+                        ->GetColorInterpretation() != GCI_AlphaBand &&
+                GetRasterBand(nBands)->GetColorInterpretation() ==
+                    GCI_AlphaBand)
+            {
+                bAddAlphaToVRT = true;
+            }
         }
         else if (poTileDS->GetGeoTransform(tileGT) == CE_None &&
                  tileGT[GT_NS_RES] > 0 &&
@@ -3654,6 +3686,12 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
             if (bAddAlphaToVRT)
                 aosOptions.AddString("-dstalpha");
 
+            if (!m_osWarpMemory.empty())
+            {
+                aosOptions.AddString("-wm");
+                aosOptions.AddString(m_osWarpMemory.c_str());
+            }
+
             psWarpOptions = GDALWarpAppOptionsNew(aosOptions.List(), nullptr);
             poWarpDS.reset(GDALDataset::FromHandle(GDALWarp(
                 "", nullptr, 1, ahSrcDS, psWarpOptions, &bUsageError)));
@@ -3666,9 +3704,13 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
             poTileDS.reset(poWarpDS.release());
         }
 
+        sharedDS = std::make_shared<SharedDataset>();
+        sharedDS->poDS = poTileDS;
+        sharedDS->poUnreprojectedDS = poUnreprojectedDS;
+
         if (pMutex)
             pMutex->lock();
-        m_oMapSharedSources.insert(osTileName, poTileDS);
+        m_oMapSharedSources.insert(osTileName, sharedDS);
         if (pMutex)
             pMutex->unlock();
     }
@@ -3733,6 +3775,7 @@ bool GDALTileIndexDataset::GetSourceDesc(const std::string &osTileName,
 
     oSourceDesc.osName = osTileName;
     oSourceDesc.poDS = std::move(poTileDS);
+    oSourceDesc.poUnreprojectedDS = poUnreprojectedDS;
     oSourceDesc.poSource = std::move(poSource);
     oSourceDesc.bHasNoData = bHasNoData;
     oSourceDesc.bSameNoData = bSameNoData;
@@ -3978,8 +4021,9 @@ bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
                         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)",
+                                 "is (%.15g, %.15g, %.15g, %.15g) does not "
+                                 "intersect at all bounding box from tile "
+                                 "(%.15g, %.15g, %.15g, %.15g)",
                                  osTileName.c_str(), sGeomTileExtent.MinX,
                                  sGeomTileExtent.MinY, sGeomTileExtent.MaxX,
                                  sGeomTileExtent.MaxY, sActualTileExtent.MinX,
@@ -3987,11 +4031,77 @@ bool GDALTileIndexDataset::CollectSources(double dfXOff, double dfYOff,
                                  sActualTileExtent.MaxY);
                         continue;
                     }
+
+                    // The above test assumes, in the case of reprojection, that
+                    // the reprojected geometry in the index is computed the
+                    // same way as we do here, that is using GDALWarp()
+                    // Which wasn't the case for example before GDAL 3.12.3 when
+                    // using "gdal raster index", which uses a simple 4-corner
+                    // reprojection logic. So also test using that method,
+                    // before emitting any warning.
+                    if (oSourceDesc.poUnreprojectedDS != oSourceDesc.poDS.get())
+                    {
+                        const int nXSize =
+                            oSourceDesc.poUnreprojectedDS->GetRasterXSize();
+                        const int nYSize =
+                            oSourceDesc.poUnreprojectedDS->GetRasterYSize();
+                        GDALGeoTransform gt;
+                        const auto poSrcSRS =
+                            oSourceDesc.poUnreprojectedDS->GetSpatialRef();
+                        if (poSrcSRS && !m_oSRS.IsEmpty() &&
+                            oSourceDesc.poUnreprojectedDS->GetGeoTransform(
+                                gt) == CE_None)
+                        {
+                            double adfX[4] = {0.0, 0.0, 0.0, 0.0};
+                            double adfY[4] = {0.0, 0.0, 0.0, 0.0};
+                            adfX[0] = gt.xorig + 0 * gt.xscale + 0 * gt.xrot;
+                            adfY[0] = gt.yorig + 0 * gt.yrot + 0 * gt.yscale;
+
+                            adfX[1] =
+                                gt.xorig + nXSize * gt.xscale + 0 * gt.xrot;
+                            adfY[1] =
+                                gt.yorig + nXSize * gt.yrot + 0 * gt.yscale;
+
+                            adfX[2] = gt.xorig + nXSize * gt.xscale +
+                                      nYSize * gt.xrot;
+                            adfY[2] = gt.yorig + nXSize * gt.yrot +
+                                      nYSize * gt.yscale;
+
+                            adfX[3] =
+                                gt.xorig + 0 * gt.xscale + nYSize * gt.xrot;
+                            adfY[3] =
+                                gt.yorig + 0 * gt.yrot + nYSize * gt.yscale;
+
+                            auto poCT =
+                                std::unique_ptr<OGRCoordinateTransformation>(
+                                    OGRCreateCoordinateTransformation(poSrcSRS,
+                                                                      &m_oSRS));
+                            if (poCT && poCT->Transform(4, adfX, adfY, nullptr))
+                            {
+                                OGREnvelope sActualTileExtent2;
+                                sActualTileExtent2.MinX = std::min(
+                                    {adfX[0], adfX[1], adfX[2], adfX[3]});
+                                sActualTileExtent2.MinY = std::min(
+                                    {adfY[0], adfY[1], adfY[2], adfY[3]});
+                                sActualTileExtent2.MaxX = std::max(
+                                    {adfX[0], adfX[1], adfX[2], adfX[3]});
+                                sActualTileExtent2.MaxY = std::max(
+                                    {adfY[0], adfY[1], adfY[2], adfY[3]});
+                                if (sGeomTileExtent.Contains(
+                                        sActualTileExtent2))
+                                {
+                                    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)",
+                             "of %s. Bounding box from tile index is "
+                             "(%.15g, %.15g, %.15g, %.15g) does not fully "
+                             "contain bounding box from tile "
+                             "(%.15g, %.15g, %.15g, %.15g)",
                              osTileName.c_str(), sGeomTileExtent.MinX,
                              sGeomTileExtent.MinY, sGeomTileExtent.MaxX,
                              sGeomTileExtent.MaxY, sActualTileExtent.MinX,
@@ -5249,9 +5359,12 @@ void GDALRegister_GTI()
         "  <Option name='MINY' type='float'/>"
         "  <Option name='MAXX' type='float'/>"
         "  <Option name='MAXY' type='float'/>"
-        "<Option name='NUM_THREADS' type='string' description="
+        "  <Option name='NUM_THREADS' type='string' description="
         "'Number of worker threads for reading. Can be set to ALL_CPUS' "
         "default='ALL_CPUS'/>"
+        "  <Option name='WARPING_MEMORY_SIZE' type='string' description="
+        "'Set the amount of memory that the warp API is allowed to use for "
+        "caching' default='64MB'/>"
         "</OpenOptionList>");
 
 #ifdef GDAL_ENABLE_ALGORITHMS
diff --git a/deps/libgdal/gdal/frmts/gtiff/gtiffdataset_read.cpp b/deps/libgdal/gdal/frmts/gtiff/gtiffdataset_read.cpp
index 764adafb2..c5c746ae7 100644
--- a/deps/libgdal/gdal/frmts/gtiff/gtiffdataset_read.cpp
+++ b/deps/libgdal/gdal/frmts/gtiff/gtiffdataset_read.cpp
@@ -3948,8 +3948,7 @@ GDALDataset *GTiffDataset::Open(GDALOpenInfo *poOpenInfo)
     }
 
     // In the case of GDAL_DISABLE_READDIR_ON_OPEN = NO / EMPTY_DIR
-    if (poOpenInfo->AreSiblingFilesLoaded() &&
-        CSLCount(poOpenInfo->GetSiblingFiles()) <= 1)
+    if (poOpenInfo->AreSiblingFilesLoaded())
     {
         poDS->oOvManager.TransferSiblingFiles(
             CSLDuplicate(poOpenInfo->GetSiblingFiles()));
@@ -4505,13 +4504,21 @@ void GTiffDataset::ApplyPamInfo()
          papszPamDomains && papszPamDomains[iDomain] != nullptr; ++iDomain)
     {
         const char *pszDomain = papszPamDomains[iDomain];
-        char **papszGT_MD = CSLDuplicate(m_oGTiffMDMD.GetMetadata(pszDomain));
-        char **papszPAM_MD = oMDMD.GetMetadata(pszDomain);
+        // We skip IMAGE_STRUCTURE as PAM content is not supposed to modify
+        // it and it could cause consistency issues if doing GetMetadata("IMAGE_STRUCTURE")
+        // which doesn't load PAM, then GetMetadata(other_domain) and
+        // GetMetadata("IMAGE_STRUCTURE")
+        if (!EQUAL(pszDomain, "IMAGE_STRUCTURE"))
+        {
+            char **papszGT_MD =
+                CSLDuplicate(m_oGTiffMDMD.GetMetadata(pszDomain));
+            char **papszPAM_MD = oMDMD.GetMetadata(pszDomain);
 
-        papszGT_MD = CSLMerge(papszGT_MD, papszPAM_MD);
+            papszGT_MD = CSLMerge(papszGT_MD, papszPAM_MD);
 
-        m_oGTiffMDMD.SetMetadata(papszGT_MD, pszDomain);
-        CSLDestroy(papszGT_MD);
+            m_oGTiffMDMD.SetMetadata(papszGT_MD, pszDomain);
+            CSLDestroy(papszGT_MD);
+        }
     }
 
     for (int i = 1; i <= GetRasterCount(); ++i)
@@ -5818,6 +5825,7 @@ CSLConstList GTiffDataset::GetSiblingFiles()
     const int nMaxFiles =
         atoi(CPLGetConfigOption("GDAL_READDIR_LIMIT_ON_OPEN", "1000"));
     const std::string osDirname = CPLGetDirnameSafe(m_osFilename.c_str());
+    CPLDebugOnly("GTiff", "Doing '%s' file listing", osDirname.c_str());
     CPLStringList aosSiblingFiles(VSIReadDirEx(osDirname.c_str(), nMaxFiles));
     if (nMaxFiles > 0 && aosSiblingFiles.size() > nMaxFiles)
     {
diff --git a/deps/libgdal/gdal/frmts/gtiff/gtiffdataset_write.cpp b/deps/libgdal/gdal/frmts/gtiff/gtiffdataset_write.cpp
index d09d7a832..4b8c25d06 100644
--- a/deps/libgdal/gdal/frmts/gtiff/gtiffdataset_write.cpp
+++ b/deps/libgdal/gdal/frmts/gtiff/gtiffdataset_write.cpp
@@ -4742,8 +4742,21 @@ bool GTiffDataset::WriteMetadata(GDALDataset *poSrcDS, TIFF *l_hTIFF,
     {
         for (int nBand = 1; nBand <= poSrcDS->GetRasterCount(); ++nBand)
         {
-            GDALRasterBand *poBand = poSrcDS->GetRasterBand(nBand);
-            const auto poRAT = poBand->GetDefaultRAT();
+            GDALRasterAttributeTable *poRAT = nullptr;
+            if (poSrcDSGTiff)
+            {
+                auto poBand = cpl::down_cast<GTiffRasterBand *>(
+                    poSrcDSGTiff->GetRasterBand(nBand));
+                // Scenario of https://github.com/OSGeo/gdal/issues/13930
+                // Do not try to fetch the RAT from auxiliary files if creating
+                // a new GeoTIFF file
+                if (poBand->m_bRATSet)
+                    poRAT = poBand->GetDefaultRAT();
+            }
+            else
+            {
+                poRAT = poSrcDS->GetRasterBand(nBand)->GetDefaultRAT();
+            }
             if (poRAT)
             {
                 auto psSerializedRAT = poRAT->Serialize();
@@ -5769,11 +5782,12 @@ TIFF *GTiffDataset::CreateLL(const char *pszFilename, int nXSize, int nYSize,
         }
         else if (nPredictor == 3)
         {
-            if (eType != GDT_Float32 && eType != GDT_Float64)
+            if (eType != GDT_Float16 && eType != GDT_Float32 &&
+                eType != GDT_Float64)
             {
-                ReportError(
-                    pszFilename, CE_Failure, CPLE_AppDefined,
-                    "PREDICTOR=3 is only supported with Float32 or Float64.");
+                ReportError(pszFilename, CE_Failure, CPLE_AppDefined,
+                            "PREDICTOR=3 is only supported with Float16, "
+                            "Float32 or Float64.");
                 return nullptr;
             }
         }
@@ -6839,6 +6853,12 @@ GDALDataset *GTiffDataset::Create(const char *pszFilename, int nXSize,
     poDS->nRasterYSize = nYSize;
     poDS->eAccess = GA_Update;
 
+    // This will avoid GTiffDataset::GetSiblingFiles() to trigger a directory
+    // listing, which is potentially costly and only makes sense when opening
+    // new files, not creating new ones. Helps for scenario like
+    // https://github.com/OSGeo/gdal/issues/13930
+    poDS->m_bHasGotSiblingFiles = true;
+
     poDS->m_nColorTableMultiplier = nColorTableMultiplier;
 
     poDS->m_bCrystalized = false;
diff --git a/deps/libgdal/gdal/frmts/gtiff/gtiffrasterband_read.cpp b/deps/libgdal/gdal/frmts/gtiff/gtiffrasterband_read.cpp
index 5d0a69f8f..bbfea4b97 100644
--- a/deps/libgdal/gdal/frmts/gtiff/gtiffrasterband_read.cpp
+++ b/deps/libgdal/gdal/frmts/gtiff/gtiffrasterband_read.cpp
@@ -1088,11 +1088,6 @@ const char *GTiffRasterBand::GetMetadataItem(const char *pszName,
                                              const char *pszDomain)
 
 {
-    if (pszDomain == nullptr || !EQUAL(pszDomain, "IMAGE_STRUCTURE"))
-    {
-        m_poGDS->LoadGeoreferencingAndPamIfNeeded();
-    }
-
     if (pszName != nullptr && pszDomain != nullptr && EQUAL(pszDomain, "TIFF"))
     {
         int nBlockXOff = 0;
@@ -1172,6 +1167,10 @@ const char *GTiffRasterBand::GetMetadataItem(const char *pszName,
         if (EQUAL(pszName, "HAS_BLOCK_CACHE"))
             return HasBlockCache() ? "1" : "0";
     }
+    else if (pszDomain == nullptr || !EQUAL(pszDomain, "IMAGE_STRUCTURE"))
+    {
+        m_poGDS->LoadGeoreferencingAndPamIfNeeded();
+    }
 
     const char *pszRet = m_oGTiffMDMD.GetMetadataItem(pszName, pszDomain);
 
diff --git a/deps/libgdal/gdal/frmts/hdf5/CMakeLists.txt b/deps/libgdal/gdal/frmts/hdf5/CMakeLists.txt
index a5b8706a5..b93bd6efb 100644
--- a/deps/libgdal/gdal/frmts/hdf5/CMakeLists.txt
+++ b/deps/libgdal/gdal/frmts/hdf5/CMakeLists.txt
@@ -93,6 +93,14 @@ elseif(NOT DEFINED GDAL_ENABLE_HDF5_GLOBAL_LOCK)
   target_compile_definitions(gdal_HDF5 PRIVATE -DENABLE_HDF5_GLOBAL_LOCK)
 endif()
 
+if (HDF5_ENABLE_PARALLEL)
+    find_package(MPI)
+    if (MPI_FOUND)
+        target_include_directories(gdal_HDF5 PRIVATE ${MPI_C_INCLUDE_DIRS})
+        target_link_libraries(gdal_HDF5 PRIVATE ${MPI_C_LIBRARIES})
+    endif ()
+endif ()
+
 # When build as plugin, initialize all drivers from Register_HDF5
 if (GDAL_ENABLE_DRIVER_HDF5_PLUGIN)
   target_compile_definitions(gdal_HDF5 PRIVATE -DHDF5_PLUGIN)
diff --git a/deps/libgdal/gdal/frmts/libertiff/libertiffdataset.cpp b/deps/libgdal/gdal/frmts/libertiff/libertiffdataset.cpp
index 6299fa29c..f98105959 100644
--- a/deps/libgdal/gdal/frmts/libertiff/libertiffdataset.cpp
+++ b/deps/libgdal/gdal/frmts/libertiff/libertiffdataset.cpp
@@ -2173,9 +2173,18 @@ bool LIBERTIFFDataset::Open(std::unique_ptr<const LIBERTIFF_NS::Image> image)
         m_image->height() == 0 ||
         m_image->height() > static_cast<uint32_t>(INT_MAX) ||
         m_image->samplesPerPixel() == 0 ||
-        m_image->samplesPerPixel() > static_cast<uint32_t>(INT_MAX))
-    {
-        CPLDebug("LIBERTIFF", "Invalid width, height, or samplesPerPixel");
+        m_image->samplesPerPixel() > static_cast<uint32_t>(INT_MAX) ||
+        // Consistency check to avoid issues in code that assume that the 2
+        // valid values are the only possibles ones and misbehave otherwise
+        // (e.g. Lerc codec)
+        (m_image->planarConfiguration() !=
+             LIBERTIFF_NS::PlanarConfiguration::Separate &&
+         m_image->planarConfiguration() !=
+             LIBERTIFF_NS::PlanarConfiguration::Contiguous))
+    {
+        CPLDebug(
+            "LIBERTIFF",
+            "Invalid width, height, samplesPerPixel or planarConfiguration");
         return false;
     }
 
diff --git a/deps/libgdal/gdal/frmts/netcdf/netcdfdataset.cpp b/deps/libgdal/gdal/frmts/netcdf/netcdfdataset.cpp
index 785bfb4ef..66877ad36 100644
--- a/deps/libgdal/gdal/frmts/netcdf/netcdfdataset.cpp
+++ b/deps/libgdal/gdal/frmts/netcdf/netcdfdataset.cpp
@@ -3971,8 +3971,6 @@ void netCDFDataset::SetProjectionFromVar(
             if (!bSwitchedXY)
             {
                 poDS->bBottomUp = (yMinMax[0] <= yMinMax[1]);
-                CPLDebug("GDAL_netCDF", "set bBottomUp = %d from Y axis",
-                         static_cast<int>(poDS->bBottomUp));
                 if (!poDS->bBottomUp)
                 {
                     std::swap(yMinMax[0], yMinMax[1]);
@@ -4155,12 +4153,35 @@ void netCDFDataset::SetProjectionFromVar(
                 CSLTokenizeString2(pszGeoTransform, " ", CSLT_HONOURSTRINGS));
             if (aosGeoTransform.size() == 6)
             {
+                bool bUseGeoTransformFromAttribute = true;
+
                 GDALGeoTransform gtFromAttribute;
                 for (int i = 0; i < 6; i++)
                 {
                     gtFromAttribute[i] = CPLAtof(aosGeoTransform[i]);
                 }
 
+                // When GDAL writes a raster that is north-up oriented, it
+                // writes the "GeoTransform" attribute unmodified, that is with
+                // gt.yscale < 0, but the first line is actually the southern-most
+                // one, consistently with the values of the "y" coordinate
+                // variable. This is wrong... but we have always done that, so
+                // this is hard to fix now.
+                // However there are datasets like
+                // https://public.hub.geosphere.at/datahub/resources/spartacus-v2-1d-1km/filelisting/TN/SPARTACUS2-DAILY_TN_2026.nc
+                // that correctly use a positive gt.yscale value. So make sure to not emit
+                // a warning when comparing against the geotransform derived from
+                // the x/y coordinates.
+                GDALGeoTransform gtFromAttributeNorthUp = gtFromAttribute;
+                if (gtFromAttributeNorthUp.yscale > 0 &&
+                    gtFromAttributeNorthUp.IsAxisAligned())
+                {
+                    gtFromAttributeNorthUp.yorig +=
+                        poDS->nRasterYSize * gtFromAttributeNorthUp.yscale;
+                    gtFromAttributeNorthUp.yscale =
+                        -gtFromAttributeNorthUp.yscale;
+                }
+
                 if (bGotCfGT)
                 {
                     constexpr double GT_RELERROR_WARN_THRESHOLD = 1e-6;
@@ -4168,9 +4189,9 @@ void netCDFDataset::SetProjectionFromVar(
                     for (int i = 0; i < 6; i++)
                     {
                         double dfAbsoluteError =
-                            std::abs(tmpGT[i] - gtFromAttribute[i]);
+                            std::abs(tmpGT[i] - gtFromAttributeNorthUp[i]);
                         if (dfAbsoluteError >
-                            std::abs(gtFromAttribute[i] *
+                            std::abs(gtFromAttributeNorthUp[i] *
                                      GT_RELERROR_WARN_THRESHOLD))
                         {
                             dfMaxAbsoluteError =
@@ -4180,17 +4201,32 @@ void netCDFDataset::SetProjectionFromVar(
 
                     if (dfMaxAbsoluteError > 0)
                     {
+                        bUseGeoTransformFromAttribute = false;
                         CPLError(CE_Warning, CPLE_AppDefined,
                                  "GeoTransform read from attribute of %s "
                                  "variable differs from value calculated from "
                                  "dimension variables (max diff = %g). Using "
-                                 "value from attribute.",
+                                 "value calculated from dimension variables.",
                                  pszGridMappingValue, dfMaxAbsoluteError);
                     }
                 }
 
-                tmpGT = std::move(gtFromAttribute);
-                bGotGdalGT = true;
+                if (bUseGeoTransformFromAttribute)
+                {
+                    if (bGotCfGT)
+                    {
+                        tmpGT = gtFromAttributeNorthUp;
+                        if (gtFromAttributeNorthUp.IsAxisAligned())
+                        {
+                            poDS->bBottomUp = true;
+                        }
+                    }
+                    else
+                    {
+                        tmpGT = gtFromAttribute;
+                    }
+                    bGotGdalGT = true;
+                }
             }
         }
         else
@@ -4235,6 +4271,12 @@ void netCDFDataset::SetProjectionFromVar(
             CPLDebug("GDAL_netCDF", "Got SRS but no geotransform from GDAL!");
     }
 
+    if (bGotCfGT || bGotGdalGT)
+    {
+        CPLDebug("GDAL_netCDF", "set bBottomUp = %d from Y axis",
+                 static_cast<int>(poDS->bBottomUp));
+    }
+
     if (!pszWKT && !bGotCfSRS)
     {
         // Some netCDF files have a srid attribute (#6613) like
diff --git a/deps/libgdal/gdal/frmts/netcdf/netcdfdrivercore.cpp b/deps/libgdal/gdal/frmts/netcdf/netcdfdrivercore.cpp
index b9362ff35..3a859b901 100644
--- a/deps/libgdal/gdal/frmts/netcdf/netcdfdrivercore.cpp
+++ b/deps/libgdal/gdal/frmts/netcdf/netcdfdrivercore.cpp
@@ -270,6 +270,23 @@ void NCDFDriverSubdatasetInfo::parseFileName()
             m_pathComponent.append(":");
             m_pathComponent.append(aosParts[2]);
             subdatasetIndex++;
+
+            // Check for a port number and add it to the path component.
+            if (hasProtocol && aosParts.size() > 3)
+            {
+                const auto nChars = strlen(aosParts[3]);
+                size_t i = 0;
+                while (i < nChars && std::isdigit(aosParts[3][i]))
+                {
+                    i++;
+                }
+                if (i > 0 && aosParts[3][i] == '/')
+                {
+                    m_pathComponent.append(":");
+                    m_pathComponent.append(aosParts[3]);
+                    subdatasetIndex++;
+                }
+            }
         }
 
         // Check for bogus paths
diff --git a/deps/libgdal/gdal/frmts/nitf/rpftocdataset.cpp b/deps/libgdal/gdal/frmts/nitf/rpftocdataset.cpp
index c0953c416..c175dfed0 100644
--- a/deps/libgdal/gdal/frmts/nitf/rpftocdataset.cpp
+++ b/deps/libgdal/gdal/frmts/nitf/rpftocdataset.cpp
@@ -213,8 +213,8 @@ class RPFTOCProxyRasterDataSet final : public GDALProxyPoolDataset
     /* The following parameters are only for sanity checking */
     bool checkDone = false;
     bool checkOK = false;
-    const double nwLong;
-    const double nwLat;
+    const double xOrig;
+    const double yOrig;
     GDALColorTable *colorTableRef = nullptr;
     int bHasNoDataValue = false;
     double noDataValue = 0;
@@ -226,8 +226,8 @@ class RPFTOCProxyRasterDataSet final : public GDALProxyPoolDataset
     RPFTOCProxyRasterDataSet(RPFTOCSubDataset *subdataset, const char *fileName,
                              int nRasterXSize, int nRasterYSize,
                              int nBlockXSize, int nBlockYSize,
-                             const char *projectionRef, double nwLong,
-                             double nwLat, int nBands);
+                             const char *projectionRef, double xOrig,
+                             double yOrig, int nBands);
 
     void SetNoDataValue(double noDataValueIn)
     {
@@ -573,12 +573,12 @@ CPLErr RPFTOCProxyRasterBandPalette::IReadBlock(int nBlockXOff, int nBlockYOff,
 RPFTOCProxyRasterDataSet::RPFTOCProxyRasterDataSet(
     RPFTOCSubDataset *subdatasetIn, const char *fileNameIn, int nRasterXSizeIn,
     int nRasterYSizeIn, int nBlockXSizeIn, int nBlockYSizeIn,
-    const char *projectionRefIn, double nwLongIn, double nwLatIn, int nBandsIn)
+    const char *projectionRefIn, double xOrigIn, double yOrigIn, int nBandsIn)
     :  // Mark as shared since the VRT will take several references if we are in
        // RGBA mode (4 bands for this dataset).
       GDALProxyPoolDataset(fileNameIn, nRasterXSizeIn, nRasterYSizeIn,
                            GA_ReadOnly, TRUE, projectionRefIn),
-      nwLong(nwLongIn), nwLat(nwLatIn), subdataset(subdatasetIn)
+      xOrig(xOrigIn), yOrig(yOrigIn), subdataset(subdatasetIn)
 {
     if (nBandsIn == 4)
     {
@@ -634,8 +634,8 @@ int RPFTOCProxyRasterDataSet::SanityCheckOK(GDALDataset *sourceDS)
     checkDone = TRUE;
 
     sourceDS->GetGeoTransform(l_gt);
-    WARN_ON_FAIL(fabs(l_gt[GEOTRSFRM_TOPLEFT_X] - nwLong) < l_gt[1]);
-    WARN_ON_FAIL(fabs(l_gt[GEOTRSFRM_TOPLEFT_Y] - nwLat) < fabs(l_gt[5]));
+    WARN_ON_FAIL(fabs(l_gt[GEOTRSFRM_TOPLEFT_X] - xOrig) < l_gt.xscale);
+    WARN_ON_FAIL(fabs(l_gt[GEOTRSFRM_TOPLEFT_Y] - yOrig) < fabs(l_gt.yscale));
     WARN_ON_FAIL(l_gt[GEOTRSFRM_ROTATION_PARAM1] == 0 &&
                  l_gt[GEOTRSFRM_ROTATION_PARAM2] == 0); /* No rotation */
     ERROR_ON_FAIL(sourceDS->GetRasterCount() == 1);     /* Just 1 band */
@@ -735,9 +735,6 @@ char **RPFTOCDataset::GetMetadata(const char *pszDomain)
             CPLError(CE_Failure, CPLE_AppDefined,                              \
                      "For %s, assert '" #x "' failed",                         \
                      entry->frameEntries[i].fullFilePath);                     \
-            if (poSrcDS)                                                       \
-                GDALClose(poSrcDS);                                            \
-            CPLFree(projectionRef);                                            \
             return nullptr;                                                    \
         }                                                                      \
     } while (false)
@@ -778,7 +775,7 @@ GDALDataset *RPFTOCSubDataset::CreateDataSetFromTocEntry(
     int nBlockXSize = 0;
     int nBlockYSize = 0;
     GDALGeoTransform gt;
-    char *projectionRef = nullptr;
+    OGRSpatialReference oSRS;
     int index = 0;
 
     for (int i = 0; i < N; i++)
@@ -796,54 +793,63 @@ GDALDataset *RPFTOCSubDataset::CreateDataSetFromTocEntry(
             /* for large datasets. So these sanity checks will be done at the
              * time we really need */
             /* to access the file (see SanityCheckOK method) */
-            GDALDataset *poSrcDS = GDALDataset::FromHandle(GDALOpenShared(
-                entry->frameEntries[i].fullFilePath, GA_ReadOnly));
+            auto poSrcDS = std::unique_ptr<GDALDataset>(
+                GDALDataset::FromHandle(GDALOpenShared(
+                    entry->frameEntries[i].fullFilePath, GA_ReadOnly)));
             ASSERT_CREATE_VRT(poSrcDS);
             poSrcDS->GetGeoTransform(gt);
-            projectionRef = CPLStrdup(poSrcDS->GetProjectionRef());
+            auto poSrcSRS = poSrcDS->GetSpatialRef();
+            ASSERT_CREATE_VRT(poSrcSRS);
+            oSRS = *poSrcSRS;
             ASSERT_CREATE_VRT(gt[GEOTRSFRM_ROTATION_PARAM1] == 0 &&
                               gt[GEOTRSFRM_ROTATION_PARAM2] ==
                                   0);                          /* No rotation */
             ASSERT_CREATE_VRT(poSrcDS->GetRasterCount() == 1); /* Just 1 band */
 
-            /* Tolerance of 1%... This is necessary for CADRG_L22/RPF/A.TOC for
-             * example */
-            ASSERT_CREATE_VRT((entry->horizInterval - gt[GEOTRSFRM_WE_RES]) /
-                                  entry->horizInterval <
-                              0.01); /* X interval same as in TOC */
-            ASSERT_CREATE_VRT((entry->vertInterval - (-gt[GEOTRSFRM_NS_RES])) /
-                                  entry->vertInterval <
-                              0.01); /* Y interval same as in TOC */
+            if (oSRS.IsGeographic())
+            {
+                /* Tolerance of 1%... This is necessary for CADRG_L22/RPF/A.TOC for
+                 * example */
+                ASSERT_CREATE_VRT(
+                    (entry->horizInterval - gt[GEOTRSFRM_WE_RES]) /
+                        entry->horizInterval <
+                    0.01); /* X interval same as in TOC */
+                ASSERT_CREATE_VRT(
+                    (entry->vertInterval - (-gt[GEOTRSFRM_NS_RES])) /
+                        entry->vertInterval <
+                    0.01); /* Y interval same as in TOC */
+            }
 
             const int ds_sizeX = poSrcDS->GetRasterXSize();
             const int ds_sizeY = poSrcDS->GetRasterYSize();
             /* for polar zone use the sizes from the dataset */
-            if ((entry->zone[0] == '9') || (entry->zone[0] == 'J'))
+            if (!oSRS.IsGeographic())
             {
                 sizeX = ds_sizeX;
                 sizeY = ds_sizeY;
             }
-
-            /* In the case the east longitude is 180, there's a great chance
-             * that it is in fact */
-            /* truncated in the A.TOC. Thus, the only reliable way to find out
-             * the tile width, is to */
-            /* read it from the tile dataset itself... */
-            /* This is the case for the GNCJNCN dataset that has world coverage
-             */
-            if (entry->seLong == 180.00)
-                sizeX = ds_sizeX;
             else
-                ASSERT_CREATE_VRT(sizeX == ds_sizeX);
+            {
+                /* In the case the east longitude is 180, there's a great chance
+                 * that it is in fact */
+                /* truncated in the A.TOC. Thus, the only reliable way to find out
+                 * the tile width, is to */
+                /* read it from the tile dataset itself... */
+                /* This is the case for the GNCJNCN dataset that has world coverage
+                 */
+                if (entry->seLong == 180.00)
+                    sizeX = ds_sizeX;
+                else
+                    ASSERT_CREATE_VRT(sizeX == ds_sizeX);
+                ASSERT_CREATE_VRT(sizeY == ds_sizeY);
+            }
 
-            ASSERT_CREATE_VRT(sizeY == ds_sizeY);
             poSrcDS->GetRasterBand(1)->GetBlockSize(&nBlockXSize, &nBlockYSize);
             ASSERT_CREATE_VRT(
                 poSrcDS->GetRasterBand(1)->GetColorInterpretation() ==
                 GCI_PaletteIndex);
             ASSERT_CREATE_VRT(poSrcDS->GetRasterBand(1)->GetRasterDataType() ==
                               GDT_Byte);
-            GDALClose(poSrcDS);
         }
 
         index++;
@@ -861,10 +867,23 @@ GDALDataset *RPFTOCSubDataset::CreateDataSetFromTocEntry(
     if (papszMetadataRPFTOCFile)
         poVirtualDS->SetMetadata(papszMetadataRPFTOCFile);
 
-    poVirtualDS->SetProjection(projectionRef);
+    poVirtualDS->SetSpatialRef(&oSRS);
 
     gt[GEOTRSFRM_TOPLEFT_X] = entry->nwLong;
     gt[GEOTRSFRM_TOPLEFT_Y] = entry->nwLat;
+
+    if (!oSRS.IsGeographic())
+    {
+        OGRSpatialReference oSRS_WGS84;
+        oSRS_WGS84.SetWellKnownGeogCS("WGS84");
+        oSRS_WGS84.SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
+        auto poCT = std::unique_ptr<OGRCoordinateTransformation>(
+            OGRCreateCoordinateTransformation(&oSRS_WGS84, &oSRS));
+        if (poCT)
+            poCT->Transform(1, &(gt[GEOTRSFRM_TOPLEFT_X]),
+                            &(gt[GEOTRSFRM_TOPLEFT_Y]));
+    }
+
     poVirtualDS->SetGeoTransform(gt);
 
     int nBands;
@@ -960,9 +979,6 @@ GDALDataset *RPFTOCSubDataset::CreateDataSetFromTocEntry(
         nBands = 4;
     }
 
-    CPLFree(projectionRef);
-    projectionRef = nullptr;
-
     /* -------------------------------------------------------------------- */
     /*      Check for overviews.                                            */
     /* -------------------------------------------------------------------- */
@@ -1001,10 +1017,16 @@ GDALDataset *RPFTOCSubDataset::CreateDataSetFromTocEntry(
             cpl::down_cast<RPFTOCSubDataset *>(poVirtualDS),
             entry->frameEntries[i].fullFilePath, sizeX, sizeY, nBlockXSize,
             nBlockYSize, poVirtualDS->GetProjectionRef(),
-            entry->nwLong +
-                entry->frameEntries[i].frameCol * entry->horizInterval * sizeX,
-            entry->nwLat -
-                entry->frameEntries[i].frameRow * entry->vertInterval * sizeY,
+            oSRS.IsGeographic()
+                ? entry->nwLong + entry->frameEntries[i].frameCol *
+                                      entry->horizInterval * sizeX
+                : gt.xorig +
+                      entry->frameEntries[i].frameCol * gt.xscale * sizeX,
+            oSRS.IsGeographic()
+                ? entry->nwLat - entry->frameEntries[i].frameRow *
+                                     entry->vertInterval * sizeY
+                : gt.yorig +
+                      entry->frameEntries[i].frameRow * gt.yscale * sizeY,
             nBands);
 
         if (nBands == 1)
diff --git a/deps/libgdal/gdal/frmts/pdf/pdfdataset.cpp b/deps/libgdal/gdal/frmts/pdf/pdfdataset.cpp
index 5588a4e34..693dfe440 100644
--- a/deps/libgdal/gdal/frmts/pdf/pdfdataset.cpp
+++ b/deps/libgdal/gdal/frmts/pdf/pdfdataset.cpp
@@ -38,6 +38,7 @@
 #include "pdfdrivercore.h"
 
 #include <algorithm>
+#include <array>
 #include <cassert>
 #include <limits>
 #include <set>
@@ -93,8 +94,13 @@ class GDALPDFOutputDev final : public SplashOutputDev
 
   public:
     GDALPDFOutputDev(SplashColorMode colorModeA, int bitmapRowPadA,
-                     bool reverseVideoA, SplashColorPtr paperColorA)
-        : SplashOutputDev(colorModeA, bitmapRowPadA, reverseVideoA,
+                     [[maybe_unused]] bool reverseVideoA,
+                     SplashColorPtr paperColorA)
+        : SplashOutputDev(colorModeA, bitmapRowPadA,
+#if POPPLER_MAJOR_VERSION < 26 ||                                              \
+    (POPPLER_MAJOR_VERSION == 26 && POPPLER_MINOR_VERSION < 2)
+                          reverseVideoA,
+#endif
                           paperColorA),
           bEnableVector(TRUE), bEnableText(TRUE), bEnableBitmap(TRUE)
     {
@@ -175,10 +181,17 @@ class GDALPDFOutputDev final : public SplashOutputDev
         }
     }
 
-    virtual void setSoftMaskFromImageMask(GfxState *state, Object *ref,
-                                          Stream *str, int width, int height,
-                                          bool invert, bool inlineImg,
-                                          double *baseMatrix) override
+#if POPPLER_MAJOR_VERSION > 26 ||                                              \
+    (POPPLER_MAJOR_VERSION == 26 && POPPLER_MINOR_VERSION >= 2)
+    void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str,
+                                  int width, int height, bool invert,
+                                  bool inlineImg,
+                                  std::array<double, 6> &baseMatrix) override
+#else
+    void setSoftMaskFromImageMask(GfxState *state, Object *ref, Stream *str,
+                                  int width, int height, bool invert,
+                                  bool inlineImg, double *baseMatrix) override
+#endif
     {
         if (bEnableBitmap)
             SplashOutputDev::setSoftMaskFromImageMask(
@@ -187,8 +200,14 @@ class GDALPDFOutputDev final : public SplashOutputDev
             str->close();
     }
 
-    virtual void unsetSoftMaskFromImageMask(GfxState *state,
-                                            double *baseMatrix) override
+#if POPPLER_MAJOR_VERSION > 26 ||                                              \
+    (POPPLER_MAJOR_VERSION == 26 && POPPLER_MINOR_VERSION >= 2)
+    void unsetSoftMaskFromImageMask(GfxState *state,
+                                    std::array<double, 6> &baseMatrix) override
+#else
+    void unsetSoftMaskFromImageMask(GfxState *state,
+                                    double *baseMatrix) override
+#endif
     {
         if (bEnableBitmap)
             SplashOutputDev::unsetSoftMaskFromImageMask(state, baseMatrix);
@@ -2458,6 +2477,8 @@ static void PDFFreeDoc(PDFDoc *poDoc)
 {
     if (poDoc)
     {
+#if POPPLER_MAJOR_VERSION < 26 ||                                              \
+    (POPPLER_MAJOR_VERSION == 26 && POPPLER_MINOR_VERSION < 2)
         /* hack to avoid potential cross heap issues on Win32 */
         /* str is the VSIPDFFileStream object passed in the constructor of
          * PDFDoc */
@@ -2465,6 +2486,7 @@ static void PDFFreeDoc(PDFDoc *poDoc)
         // VSIPDFFileStream::FillBuffer() */
         delete poDoc->str;
         poDoc->str = nullptr;
+#endif
 
         delete poDoc;
     }
@@ -4635,8 +4657,9 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
             if (globalParamsCreatedByGDAL)
                 registerErrorCallback();
             Object oObj;
-            auto poStream =
-                new VSIPDFFileStream(fp.get(), pszFilename, std::move(oObj));
+            auto poStream = std::make_unique<VSIPDFFileStream>(
+                fp.get(), pszFilename, std::move(oObj));
+            const bool bFoundLinearizedHint = poStream->FoundLinearizedHint();
 #if POPPLER_MAJOR_VERSION > 22 ||                                              \
     (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION > 2)
             std::optional<GooString> osUserPwd;
@@ -4644,8 +4667,14 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
                 osUserPwd = std::optional<GooString>(pszUserPwd);
             try
             {
-                poDocPoppler =
-                    new PDFDoc(poStream, std::optional<GooString>(), osUserPwd);
+#if POPPLER_MAJOR_VERSION > 26 ||                                              \
+    (POPPLER_MAJOR_VERSION == 26 && POPPLER_MINOR_VERSION >= 2)
+                poDocPoppler = new PDFDoc(
+                    std::move(poStream), std::optional<GooString>(), osUserPwd);
+#else
+                poDocPoppler = new PDFDoc(
+                    poStream.release(), std::optional<GooString>(), osUserPwd);
+#endif
             }
             catch (const std::exception &e)
             {
@@ -4657,7 +4686,7 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
             GooString *poUserPwd = nullptr;
             if (pszUserPwd)
                 poUserPwd = new GooString(pszUserPwd);
-            poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
+            poDocPoppler = new PDFDoc(poStream.release(), nullptr, poUserPwd);
             delete poUserPwd;
 #endif
             if (globalParamsCreatedByGDAL)
@@ -4707,8 +4736,7 @@ PDFDataset *PDFDataset::Open(GDALOpenInfo *poOpenInfo)
                 PDFFreeDoc(poDocPoppler);
                 return nullptr;
             }
-            else if (poDocPoppler->isLinearized() &&
-                     !poStream->FoundLinearizedHint())
+            else if (poDocPoppler->isLinearized() && !bFoundLinearizedHint)
             {
                 // This is a likely defect of poppler Linearization.cc file that
                 // recognizes a file as linearized if the /Linearized hint is
diff --git a/deps/libgdal/gdal/frmts/pdf/pdfio.cpp b/deps/libgdal/gdal/frmts/pdf/pdfio.cpp
index 32c3263e9..5ad0a3ede 100644
--- a/deps/libgdal/gdal/frmts/pdf/pdfio.cpp
+++ b/deps/libgdal/gdal/frmts/pdf/pdfio.cpp
@@ -68,11 +68,20 @@ VSIPDFFileStream::~VSIPDFFileStream()
 /*                                  copy()                              */
 /************************************************************************/
 
+#if POPPLER_MAJOR_VERSION > 26 ||                                              \
+    (POPPLER_MAJOR_VERSION == 26 && POPPLER_MINOR_VERSION >= 2)
+std::unique_ptr<BaseStream> VSIPDFFileStream::copy()
+{
+    return std::make_unique<VSIPDFFileStream>(poParent, nStart, bLimited,
+                                              nLength, dict.copy());
+}
+#else
 BaseStream *VSIPDFFileStream::copy()
 {
     return new VSIPDFFileStream(poParent, nStart, bLimited, nLength,
                                 dict.copy());
 }
+#endif
 
 /************************************************************************/
 /*                             makeSubStream()                          */
diff --git a/deps/libgdal/gdal/frmts/pdf/pdfio.h b/deps/libgdal/gdal/frmts/pdf/pdfio.h
index 1fe289211..41c5c8b30 100644
--- a/deps/libgdal/gdal/frmts/pdf/pdfio.h
+++ b/deps/libgdal/gdal/frmts/pdf/pdfio.h
@@ -29,7 +29,12 @@ class VSIPDFFileStream final : public BaseStream
                      bool limitedA, vsi_l_offset lengthA, Object &&dictA);
     ~VSIPDFFileStream() override;
 
+#if POPPLER_MAJOR_VERSION > 26 ||                                              \
+    (POPPLER_MAJOR_VERSION == 26 && POPPLER_MINOR_VERSION >= 2)
+    std::unique_ptr<BaseStream> copy() override;
+#else
     BaseStream *copy() override;
+#endif
 
 #if POPPLER_MAJOR_VERSION > 25 ||                                              \
     (POPPLER_MAJOR_VERSION == 25 && POPPLER_MINOR_VERSION >= 5)
diff --git a/deps/libgdal/gdal/frmts/pds/pds4dataset.cpp b/deps/libgdal/gdal/frmts/pds/pds4dataset.cpp
index 6611be037..cd0ea1152 100644
--- a/deps/libgdal/gdal/frmts/pds/pds4dataset.cpp
+++ b/deps/libgdal/gdal/frmts/pds/pds4dataset.cpp
@@ -2182,8 +2182,9 @@ std::unique_ptr<PDS4Dataset> PDS4Dataset::OpenInternal(GDALOpenInfo *poOpenInfo)
             {
                 if (dimSemantics[i] == 'S')
                 {
-                    if (nSpacing >
-                        static_cast<vsi_l_offset>(INT_MAX / nCountPreviousDim))
+                    if (nCountPreviousDim > 0 &&
+                        nSpacing > static_cast<vsi_l_offset>(INT_MAX /
+                                                             nCountPreviousDim))
                     {
                         CPLError(CE_Failure, CPLE_NotSupported,
                                  "Integer overflow");
@@ -2195,8 +2196,9 @@ std::unique_ptr<PDS4Dataset> PDS4Dataset::OpenInternal(GDALOpenInfo *poOpenInfo)
                 }
                 else if (dimSemantics[i] == 'L')
                 {
-                    if (nSpacing >
-                        static_cast<vsi_l_offset>(INT_MAX / nCountPreviousDim))
+                    if (nCountPreviousDim > 0 &&
+                        nSpacing > static_cast<vsi_l_offset>(INT_MAX /
+                                                             nCountPreviousDim))
                     {
                         CPLError(CE_Failure, CPLE_NotSupported,
                                  "Integer overflow");
diff --git a/deps/libgdal/gdal/frmts/vrt/vrtdataset.h b/deps/libgdal/gdal/frmts/vrt/vrtdataset.h
index dec35fc6d..98717a8cf 100644
--- a/deps/libgdal/gdal/frmts/vrt/vrtdataset.h
+++ b/deps/libgdal/gdal/frmts/vrt/vrtdataset.h
@@ -954,6 +954,10 @@ class CPL_DLL VRTSourcedRasterBand CPL_NON_FINAL : public VRTRasterBand
   protected:
     bool SkipBufferInitialization();
 
+    void InitializeOutputBuffer(void *pData, int nBufXSize, int nBufYSize,
+                                GDALDataType eBufType, GSpacing nPixelSpace,
+                                GSpacing nLineSpace) const;
+
   public:
     std::vector<std::unique_ptr<VRTSource>> m_papoSources{};
 
diff --git a/deps/libgdal/gdal/frmts/vrt/vrtderivedrasterband.cpp b/deps/libgdal/gdal/frmts/vrt/vrtderivedrasterband.cpp
index b1b6bdd4b..1f27ebaa3 100644
--- a/deps/libgdal/gdal/frmts/vrt/vrtderivedrasterband.cpp
+++ b/deps/libgdal/gdal/frmts/vrt/vrtderivedrasterband.cpp
@@ -968,6 +968,56 @@ CPLErr VRTDerivedRasterBand::GetPixelFunctionArguments(
     return CE_None;
 }
 
+/************************************************************************/
+/*                   CreateMapBufferIdxToSourceIdx()                    */
+/************************************************************************/
+
+static bool CreateMapBufferIdxToSourceIdx(
+    const std::vector<std::unique_ptr<VRTSource>> &apoSources,
+    bool bSkipNonContributingSources, int nXOff, int nYOff, int nXSize,
+    int nYSize, int nBufXSize, int nBufYSize, GDALRasterIOExtraArg *psExtraArg,
+    bool &bCreateMapBufferIdxToSourceIdxHasRun,
+    std::vector<int> &anMapBufferIdxToSourceIdx,
+    bool &bSkipOutputBufferInitialization)
+{
+    CPLAssert(!bCreateMapBufferIdxToSourceIdxHasRun);
+    bCreateMapBufferIdxToSourceIdxHasRun = true;
+    anMapBufferIdxToSourceIdx.reserve(apoSources.size());
+    for (int iSource = 0; iSource < static_cast<int>(apoSources.size());
+         iSource++)
+    {
+        if (bSkipNonContributingSources &&
+            apoSources[iSource]->IsSimpleSource())
+        {
+            bool bError = false;
+            double dfReqXOff, dfReqYOff, dfReqXSize, dfReqYSize;
+            int nReqXOff, nReqYOff, nReqXSize, nReqYSize;
+            int nOutXOff, nOutYOff, nOutXSize, nOutYSize;
+            auto poSource =
+                static_cast<VRTSimpleSource *>(apoSources[iSource].get());
+            if (!poSource->GetSrcDstWindow(
+                    nXOff, nYOff, nXSize, nYSize, nBufXSize, nBufYSize,
+                    psExtraArg->eResampleAlg, &dfReqXOff, &dfReqYOff,
+                    &dfReqXSize, &dfReqYSize, &nReqXOff, &nReqYOff, &nReqXSize,
+                    &nReqYSize, &nOutXOff, &nOutYOff, &nOutXSize, &nOutYSize,
+                    bError))
+            {
+                if (bError)
+                {
+                    return false;
+                }
+
+                // Skip non contributing source
+                bSkipOutputBufferInitialization = false;
+                continue;
+            }
+        }
+
+        anMapBufferIdxToSourceIdx.push_back(iSource);
+    }
+    return true;
+}
+
 /************************************************************************/
 /*                             IRasterIO()                              */
 /************************************************************************/
@@ -1128,6 +1178,10 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
     }
     const int nSrcTypeSize = GDALGetDataTypeSizeBytes(eSrcType);
 
+    std::vector<int> anMapBufferIdxToSourceIdx;
+    bool bSkipOutputBufferInitialization = !m_papoSources.empty();
+    bool bCreateMapBufferIdxToSourceIdxHasRun = false;
+
     // If acquiring the region of interest in a single time is going
     // to consume too much RAM, split in halves, and that recursively
     // until we get below m_nAllowedRAMUsage.
@@ -1137,11 +1191,34 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
             m_poPrivate->m_nAllowedRAMUsage /
                 (static_cast<int>(m_papoSources.size()) * nSrcTypeSize))
     {
-        CPLErr eErr = SplitRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
-                                    pData, nBufXSize, nBufYSize, eBufType,
-                                    nPixelSpace, nLineSpace, psExtraArg);
-        if (eErr != CE_Warning)
-            return eErr;
+        bool bSplit = true;
+        if (m_poPrivate->m_bSkipNonContributingSources)
+        {
+            // More accurate check by comparing against the number of
+            // actually contributing sources.
+            if (!CreateMapBufferIdxToSourceIdx(
+                    m_papoSources, m_poPrivate->m_bSkipNonContributingSources,
+                    nXOff, nYOff, nXSize, nYSize, nBufXSize, nBufYSize,
+                    psExtraArg, bCreateMapBufferIdxToSourceIdxHasRun,
+                    anMapBufferIdxToSourceIdx, bSkipOutputBufferInitialization))
+            {
+                return CE_Failure;
+            }
+            bSplit =
+                !anMapBufferIdxToSourceIdx.empty() &&
+                static_cast<GIntBig>(nBufXSize) * nBufYSize >
+                    m_poPrivate->m_nAllowedRAMUsage /
+                        (static_cast<int>(anMapBufferIdxToSourceIdx.size()) *
+                         nSrcTypeSize);
+        }
+        if (bSplit)
+        {
+            CPLErr eErr = SplitRasterIO(eRWFlag, nXOff, nYOff, nXSize, nYSize,
+                                        pData, nBufXSize, nBufYSize, eBufType,
+                                        nPixelSpace, nLineSpace, psExtraArg);
+            if (eErr != CE_Warning)
+                return eErr;
+        }
     }
 
     /* ---- Get pixel function for band ---- */
@@ -1182,51 +1259,32 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
     }
     const int nExtBufXSize = nBufXSize + 2 * nBufferRadius;
     const int nExtBufYSize = nBufYSize + 2 * nBufferRadius;
-    int nBufferCount = 0;
 
-    std::vector<std::unique_ptr<void, VSIFreeReleaser>> apBuffers(
-        m_papoSources.size());
-    std::vector<int> anMapBufferIdxToSourceIdx(m_papoSources.size());
-    bool bSkipOutputBufferInitialization = !m_papoSources.empty();
-    for (int iSource = 0; iSource < static_cast<int>(m_papoSources.size());
-         iSource++)
+    if (!bCreateMapBufferIdxToSourceIdxHasRun)
     {
-        if (m_poPrivate->m_bSkipNonContributingSources &&
-            m_papoSources[iSource]->IsSimpleSource())
+        if (!CreateMapBufferIdxToSourceIdx(
+                m_papoSources, m_poPrivate->m_bSkipNonContributingSources,
+                nXOff, nYOff, nXSize, nYSize, nBufXSize, nBufYSize, psExtraArg,
+                bCreateMapBufferIdxToSourceIdxHasRun, anMapBufferIdxToSourceIdx,
+                bSkipOutputBufferInitialization))
         {
-            bool bError = false;
-            double dfReqXOff, dfReqYOff, dfReqXSize, dfReqYSize;
-            int nReqXOff, nReqYOff, nReqXSize, nReqYSize;
-            int nOutXOff, nOutYOff, nOutXSize, nOutYSize;
-            auto poSource =
-                static_cast<VRTSimpleSource *>(m_papoSources[iSource].get());
-            if (!poSource->GetSrcDstWindow(
-                    nXOff, nYOff, nXSize, nYSize, nBufXSize, nBufYSize,
-                    psExtraArg->eResampleAlg, &dfReqXOff, &dfReqYOff,
-                    &dfReqXSize, &dfReqYSize, &nReqXOff, &nReqYOff, &nReqXSize,
-                    &nReqYSize, &nOutXOff, &nOutYOff, &nOutXSize, &nOutYSize,
-                    bError))
-            {
-                if (bError)
-                {
-                    return CE_Failure;
-                }
-
-                // Skip non contributing source
-                bSkipOutputBufferInitialization = false;
-                continue;
-            }
+            return CE_Failure;
         }
-
-        anMapBufferIdxToSourceIdx[nBufferCount] = iSource;
-        apBuffers[nBufferCount].reset(
+    }
+    std::vector<std::unique_ptr<void, VSIFreeReleaser>> apBuffers(
+        anMapBufferIdxToSourceIdx.size());
+    for (size_t iBuffer = 0; iBuffer < anMapBufferIdxToSourceIdx.size();
+         ++iBuffer)
+    {
+        apBuffers[iBuffer].reset(
             VSI_MALLOC3_VERBOSE(nSrcTypeSize, nExtBufXSize, nExtBufYSize));
-        if (apBuffers[nBufferCount] == nullptr)
+        if (apBuffers[iBuffer] == nullptr)
         {
             return CE_Failure;
         }
 
         bool bBufferInit = true;
+        const int iSource = anMapBufferIdxToSourceIdx[iBuffer];
         if (m_papoSources[iSource]->IsSimpleSource())
         {
             const auto poSS =
@@ -1265,53 +1323,36 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
             /* ------------------------------------------------------------ */
             if (!m_bNoDataValueSet || m_dfNoDataValue == 0)
             {
-                memset(apBuffers[nBufferCount].get(), 0,
+                memset(apBuffers[iBuffer].get(), 0,
                        static_cast<size_t>(nSrcTypeSize) * nExtBufXSize *
                            nExtBufYSize);
             }
             else
             {
-                GDALCopyWords64(
-                    &m_dfNoDataValue, GDT_Float64, 0,
-                    static_cast<GByte *>(apBuffers[nBufferCount].get()),
-                    eSrcType, nSrcTypeSize,
-                    static_cast<GPtrDiff_t>(nExtBufXSize) * nExtBufYSize);
+                GDALCopyWords64(&m_dfNoDataValue, GDT_Float64, 0,
+                                static_cast<GByte *>(apBuffers[iBuffer].get()),
+                                eSrcType, nSrcTypeSize,
+                                static_cast<GPtrDiff_t>(nExtBufXSize) *
+                                    nExtBufYSize);
             }
         }
-
-        ++nBufferCount;
     }
 
     /* -------------------------------------------------------------------- */
     /*      Initialize the buffer to some background value. Use the         */
     /*      nodata value if available.                                      */
     /* -------------------------------------------------------------------- */
-    if (bSkipOutputBufferInitialization)
-    {
-        // Do nothing
-    }
-    else if (nPixelSpace == nBufTypeSize &&
-             (!m_bNoDataValueSet || m_dfNoDataValue == 0))
+    if (!bSkipOutputBufferInitialization)
     {
-        memset(pData, 0,
-               static_cast<size_t>(nBufXSize) * nBufYSize * nBufTypeSize);
-    }
-    else if (m_bNoDataValueSet)
-    {
-        double dfWriteValue = m_dfNoDataValue;
-
-        for (int iLine = 0; iLine < nBufYSize; iLine++)
-        {
-            GDALCopyWords64(&dfWriteValue, GDT_Float64, 0,
-                            static_cast<GByte *>(pData) + nLineSpace * iLine,
-                            eBufType, static_cast<int>(nPixelSpace), nBufXSize);
-        }
+        InitializeOutputBuffer(pData, nBufXSize, nBufYSize, eBufType,
+                               nPixelSpace, nLineSpace);
     }
 
     // No contributing sources and SkipNonContributingSources mode ?
     // Do not call the pixel function and just return the 0/nodata initialized
     // output buffer.
-    if (nBufferCount == 0 && m_poPrivate->m_bSkipNonContributingSources)
+    if (anMapBufferIdxToSourceIdx.empty() &&
+        m_poPrivate->m_bSkipNonContributingSources)
     {
         return CE_None;
     }
@@ -1386,7 +1427,9 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
     // Load values for sources into packed buffers.
     CPLErr eErr = CE_None;
     VRTSource::WorkingState oWorkingState;
-    for (int iBuffer = 0; iBuffer < nBufferCount && eErr == CE_None; iBuffer++)
+    for (size_t iBuffer = 0;
+         iBuffer < anMapBufferIdxToSourceIdx.size() && eErr == CE_None;
+         iBuffer++)
     {
         const int iSource = anMapBufferIdxToSourceIdx[iBuffer];
         GByte *pabyBuffer = static_cast<GByte *>(apBuffers[iBuffer].get());
@@ -1472,6 +1515,7 @@ CPLErr VRTDerivedRasterBand::IRasterIO(
     }
 
     // Apply pixel function.
+    const int nBufferCount = static_cast<int>(anMapBufferIdxToSourceIdx.size());
     if (eErr == CE_None && EQUAL(m_poPrivate->m_osLanguage, "Python"))
     {
         // numpy doesn't have native cint16/cint32/cfloat16
diff --git a/deps/libgdal/gdal/frmts/vrt/vrtsourcedrasterband.cpp b/deps/libgdal/gdal/frmts/vrt/vrtsourcedrasterband.cpp
index f3145e06b..fcb8980ac 100644
--- a/deps/libgdal/gdal/frmts/vrt/vrtsourcedrasterband.cpp
+++ b/deps/libgdal/gdal/frmts/vrt/vrtsourcedrasterband.cpp
@@ -457,6 +457,71 @@ void VRTSourcedRasterBandRasterIOJob::Func(void *pData)
     ++(*psJob->pnCompletedJobs);
 }
 
+/************************************************************************/
+/*            VRTSourcedRasterBand::InitializeOutputBuffer()            */
+/************************************************************************/
+
+void VRTSourcedRasterBand::InitializeOutputBuffer(void *pData, int nBufXSize,
+                                                  int nBufYSize,
+                                                  GDALDataType eBufType,
+                                                  GSpacing nPixelSpace,
+                                                  GSpacing nLineSpace) const
+{
+    if (nPixelSpace == GDALGetDataTypeSizeBytes(eBufType) &&
+        !(m_bNoDataValueSet && m_dfNoDataValue != 0.0) &&
+        !(m_bNoDataSetAsInt64 && m_nNoDataValueInt64 != 0) &&
+        !(m_bNoDataSetAsUInt64 && m_nNoDataValueUInt64 != 0))
+    {
+        if (nLineSpace == nBufXSize * nPixelSpace)
+        {
+            memset(pData, 0, static_cast<size_t>(nBufYSize * nLineSpace));
+        }
+        else
+        {
+            for (int iLine = 0; iLine < nBufYSize; iLine++)
+            {
+                memset(static_cast<GByte *>(pData) +
+                           static_cast<GIntBig>(iLine) * nLineSpace,
+                       0, static_cast<size_t>(nBufXSize * nPixelSpace));
+            }
+        }
+    }
+    else if (m_bNoDataSetAsInt64)
+    {
+        for (int iLine = 0; iLine < nBufYSize; iLine++)
+        {
+            GDALCopyWords(&m_nNoDataValueInt64, GDT_Int64, 0,
+                          static_cast<GByte *>(pData) +
+                              static_cast<GIntBig>(nLineSpace) * iLine,
+                          eBufType, static_cast<int>(nPixelSpace), nBufXSize);
+        }
+    }
+    else if (m_bNoDataSetAsUInt64)
+    {
+        for (int iLine = 0; iLine < nBufYSize; iLine++)
+        {
+            GDALCopyWords(&m_nNoDataValueUInt64, GDT_UInt64, 0,
+                          static_cast<GByte *>(pData) +
+                              static_cast<GIntBig>(nLineSpace) * iLine,
+                          eBufType, static_cast<int>(nPixelSpace), nBufXSize);
+        }
+    }
+    else
+    {
+        double dfWriteValue = 0.0;
+        if (m_bNoDataValueSet)
+            dfWriteValue = m_dfNoDataValue;
+
+        for (int iLine = 0; iLine < nBufYSize; iLine++)
+        {
+            GDALCopyWords(&dfWriteValue, GDT_Float64, 0,
+                          static_cast<GByte *>(pData) +
+                              static_cast<GIntBig>(nLineSpace) * iLine,
+                          eBufType, static_cast<int>(nPixelSpace), nBufXSize);
+        }
+    }
+}
+
 /************************************************************************/
 /*                             IRasterIO()                              */
 /************************************************************************/
@@ -564,62 +629,10 @@ CPLErr VRTSourcedRasterBand::IRasterIO(
     /*      Initialize the buffer to some background value. Use the         */
     /*      nodata value if available.                                      */
     /* -------------------------------------------------------------------- */
-    if (SkipBufferInitialization())
-    {
-        // Do nothing
-    }
-    else if (nPixelSpace == GDALGetDataTypeSizeBytes(eBufType) &&
-             !(m_bNoDataValueSet && m_dfNoDataValue != 0.0) &&
-             !(m_bNoDataSetAsInt64 && m_nNoDataValueInt64 != 0) &&
-             !(m_bNoDataSetAsUInt64 && m_nNoDataValueUInt64 != 0))
-    {
-        if (nLineSpace == nBufXSize * nPixelSpace)
-        {
-            memset(pData, 0, static_cast<size_t>(nBufYSize * nLineSpace));
-        }
-        else
-        {
-            for (int iLine = 0; iLine < nBufYSize; iLine++)
-            {
-                memset(static_cast<GByte *>(pData) +
-                           static_cast<GIntBig>(iLine) * nLineSpace,
-                       0, static_cast<size_t>(nBufXSize * nPixelSpace));
-            }
-        }
-    }
-    else if (m_bNoDataSetAsInt64)
-    {
-        for (int iLine = 0; iLine < nBufYSize; iLine++)
-        {
-            GDALCopyWords(&m_nNoDataValueInt64, GDT_Int64, 0,
-                          static_cast<GByte *>(pData) +
-                              static_cast<GIntBig>(nLineSpace) * iLine,
-                          eBufType, static_cast<int>(nPixelSpace), nBufXSize);
-        }
-    }
-    else if (m_bNoDataSetAsUInt64)
-    {
-        for (int iLine = 0; iLine < nBufYSize; iLine++)
-        {
-            GDALCopyWords(&m_nNoDataValueUInt64, GDT_UInt64, 0,
-                          static_cast<GByte *>(pData) +
-                              static_cast<GIntBig>(nLineSpace) * iLine,
-                          eBufType, static_cast<int>(nPixelSpace), nBufXSize);
-        }
-    }
-    else
+    if (!SkipBufferInitialization())
     {
-        double dfWriteValue = 0.0;
-        if (m_bNoDataValueSet)
-            dfWriteValue = m_dfNoDataValue;
-
-        for (int iLine = 0; iLine < nBufYSize; iLine++)
-        {
-            GDALCopyWords(&dfWriteValue, GDT_Float64, 0,
-                          static_cast<GByte *>(pData) +
-                              static_cast<GIntBig>(nLineSpace) * iLine,
-                          eBufType, static_cast<int>(nPixelSpace), nBufXSize);
-        }
+        InitializeOutputBuffer(pData, nBufXSize, nBufYSize, eBufType,
+                               nPixelSpace, nLineSpace);
     }
 
     /* -------------------------------------------------------------------- */
diff --git a/deps/libgdal/gdal/frmts/vrt/vrtwarped.cpp b/deps/libgdal/gdal/frmts/vrt/vrtwarped.cpp
index d710ae0af..823d526ea 100644
--- a/deps/libgdal/gdal/frmts/vrt/vrtwarped.cpp
+++ b/deps/libgdal/gdal/frmts/vrt/vrtwarped.cpp
@@ -78,7 +78,7 @@
  *      GDALReleaseDataset(warped_ds); // or GDALClose(warped_ds);
  * \endcode
  *
- * Traditonal nested calls are also possible of course:
+ * Traditional nested calls are also possible of course:
  *
  * \code{.c}
  *      GDALDatasetH src_ds = GDALOpen("source.tif");
@@ -339,7 +339,7 @@ GDALDatasetH CPL_STDCALL GDALAutoCreateWarpedVRTEx(
  *      GDALReleaseDataset(warped_ds); // or GDALClose(warped_ds);
  * \endcode
  *
- * Traditonal nested calls are also possible of course:
+ * Traditional nested calls are also possible of course:
  *
  * \code{.c}
  *      GDALDatasetH src_ds = GDALOpen("source.tif");
diff --git a/deps/libgdal/gdal/frmts/zarr/zarr_v2_array.cpp b/deps/libgdal/gdal/frmts/zarr/zarr_v2_array.cpp
index 3096b1540..bfc48ca03 100644
--- a/deps/libgdal/gdal/frmts/zarr/zarr_v2_array.cpp
+++ b/deps/libgdal/gdal/frmts/zarr/zarr_v2_array.cpp
@@ -561,23 +561,31 @@ bool ZarrV2Array::LoadTileData(const uint64_t *tileIndices, bool bUseMutex,
     for (int i = m_oFiltersArray.Size(); i > 0;)
     {
         --i;
-        const auto &oFilter = m_oFiltersArray[i];
-        const auto osFilterId = oFilter["id"].ToString();
-        const auto psFilterDecompressor =
-            EQUAL(osFilterId.c_str(), "shuffle") ? ZarrGetShuffleDecompressor()
-            : EQUAL(osFilterId.c_str(), "quantize")
-                ? ZarrGetQuantizeDecompressor()
-            : EQUAL(osFilterId.c_str(), "fixedscaleoffset")
-                ? ZarrGetFixedScaleOffsetDecompressor()
-                : CPLGetDecompressor(osFilterId.c_str());
-        CPLAssert(psFilterDecompressor);
-
+        const CPLCompressor *psFilterDecompressor;
         CPLStringList aosOptions;
-        for (const auto &obj : oFilter.GetChildren())
+        std::string osFilterId;
         {
-            aosOptions.SetNameValue(obj.GetName().c_str(),
-                                    obj.ToString().c_str());
+            // Below CPLJSONObject/CPLJSONArray uses are not thread safe
+            std::lock_guard<std::mutex> oLock(m_oMutex);
+            const auto &oFilter = m_oFiltersArray[i];
+            osFilterId = oFilter["id"].ToString();
+            psFilterDecompressor =
+                EQUAL(osFilterId.c_str(), "shuffle")
+                    ? ZarrGetShuffleDecompressor()
+                : EQUAL(osFilterId.c_str(), "quantize")
+                    ? ZarrGetQuantizeDecompressor()
+                : EQUAL(osFilterId.c_str(), "fixedscaleoffset")
+                    ? ZarrGetFixedScaleOffsetDecompressor()
+                    : CPLGetDecompressor(osFilterId.c_str());
+            CPLAssert(psFilterDecompressor);
+
+            for (const auto &obj : oFilter.GetChildren())
+            {
+                aosOptions.SetNameValue(obj.GetName().c_str(),
+                                        obj.ToString().c_str());
+            }
         }
+
         void *out_buffer = &abyTmpRawTileData[0];
         size_t nOutSize = abyTmpRawTileData.size();
         if (!psFilterDecompressor->pfnFunc(
diff --git a/deps/libgdal/gdal/gcore/gdal_misc.cpp b/deps/libgdal/gdal/gcore/gdal_misc.cpp
index 2b9229b79..90dcd108a 100644
--- a/deps/libgdal/gdal/gcore/gdal_misc.cpp
+++ b/deps/libgdal/gdal/gcore/gdal_misc.cpp
@@ -2907,7 +2907,9 @@ const char *CPL_STDCALL GDALVersionInfo(const char *pszRequest)
 #ifdef USE_ONLY_EMBEDDED_RESOURCE_FILES
         osBuildInfo += "USE_ONLY_EMBEDDED_RESOURCE_FILES=YES\n";
 #endif
-
+#ifdef DEBUG
+        osBuildInfo += "DEBUG=YES\n";
+#endif
 #undef STRINGIFY_HELPER
 #undef STRINGIFY
 
diff --git a/deps/libgdal/gdal/gcore/gdal_version.h b/deps/libgdal/gdal/gcore/gdal_version.h
index d15468678..3cc975fab 100644
--- a/deps/libgdal/gdal/gcore/gdal_version.h
+++ b/deps/libgdal/gdal/gcore/gdal_version.h
@@ -6,7 +6,7 @@
 #ifndef GDAL_VERSION_MAJOR
 #  define GDAL_VERSION_MAJOR    3
 #  define GDAL_VERSION_MINOR    12
-#  define GDAL_VERSION_REV      2
+#  define GDAL_VERSION_REV      3
 #  define GDAL_VERSION_BUILD    0
 #endif
 
@@ -23,10 +23,10 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20260203
+#  define GDAL_RELEASE_DATE     20260317
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "3.12.2"
+#  define GDAL_RELEASE_NAME     "3.12.3"
 #endif
 
 #ifndef GDAL_RELEASE_NICKNAME
diff --git a/deps/libgdal/gdal/gcore/gdal_version_full/gdal_version.h b/deps/libgdal/gdal/gcore/gdal_version_full/gdal_version.h
index d15468678..3cc975fab 100644
--- a/deps/libgdal/gdal/gcore/gdal_version_full/gdal_version.h
+++ b/deps/libgdal/gdal/gcore/gdal_version_full/gdal_version.h
@@ -6,7 +6,7 @@
 #ifndef GDAL_VERSION_MAJOR
 #  define GDAL_VERSION_MAJOR    3
 #  define GDAL_VERSION_MINOR    12
-#  define GDAL_VERSION_REV      2
+#  define GDAL_VERSION_REV      3
 #  define GDAL_VERSION_BUILD    0
 #endif
 
@@ -23,10 +23,10 @@
 
 #if !defined(DO_NOT_DEFINE_GDAL_DATE_NAME)
 #ifndef GDAL_RELEASE_DATE
-#  define GDAL_RELEASE_DATE     20260203
+#  define GDAL_RELEASE_DATE     20260317
 #endif
 #ifndef GDAL_RELEASE_NAME
-#  define GDAL_RELEASE_NAME     "3.12.2"
+#  define GDAL_RELEASE_NAME     "3.12.3"
 #endif
 
 #ifndef GDAL_RELEASE_NICKNAME
diff --git a/deps/libgdal/gdal/gcore/gdalalgorithm.cpp b/deps/libgdal/gdal/gcore/gdalalgorithm.cpp
index 929dfaf2f..2ca0150fd 100644
--- a/deps/libgdal/gdal/gcore/gdalalgorithm.cpp
+++ b/deps/libgdal/gdal/gcore/gdalalgorithm.cpp
@@ -1710,19 +1710,27 @@ GDALAlgorithm::GDALAlgorithm(const std::string &name,
                         ? "https://gdal.org" + m_helpURL
                         : m_helpURL)
 {
-    AddArg("help", 'h', _("Display help message and exit"), &m_helpRequested)
-        .SetHiddenForAPI()
-        .SetCategory(GAAC_COMMON)
-        .AddAction([this]() { m_specialActionRequested = true; });
-    AddArg("help-doc", 0, _("Display help message for use by documentation"),
-           &m_helpDocRequested)
-        .SetHidden()
-        .AddAction([this]() { m_specialActionRequested = true; });
-    AddArg("json-usage", 0, _("Display usage as JSON document and exit"),
-           &m_JSONUsageRequested)
-        .SetHiddenForAPI()
-        .SetCategory(GAAC_COMMON)
-        .AddAction([this]() { m_specialActionRequested = true; });
+    auto &helpArg =
+        AddArg("help", 'h', _("Display help message and exit"),
+               &m_helpRequested)
+            .SetHiddenForAPI()
+            .SetCategory(GAAC_COMMON)
+            .AddAction([this]()
+                       { m_specialActionRequested = m_calledFromCommandLine; });
+    auto &helpDocArg =
+        AddArg("help-doc", 0,
+               _("Display help message for use by documentation"),
+               &m_helpDocRequested)
+            .SetHidden()
+            .AddAction([this]()
+                       { m_specialActionRequested = m_calledFromCommandLine; });
+    auto &jsonUsageArg =
+        AddArg("json-usage", 0, _("Display usage as JSON document and exit"),
+               &m_JSONUsageRequested)
+            .SetHiddenForAPI()
+            .SetCategory(GAAC_COMMON)
+            .AddAction([this]()
+                       { m_specialActionRequested = m_calledFromCommandLine; });
     AddArg("config", 0, _("Configuration option"), &m_dummyConfigOptions)
         .SetMetaVar("<KEY>=<VALUE>")
         .SetHiddenForAPI()
@@ -1735,6 +1743,26 @@ GDALAlgorithm::GDALAlgorithm(const std::string &name,
                     "Configuration options passed with the 'config' argument "
                     "are ignored");
             });
+
+    AddValidationAction(
+        [this, &helpArg, &helpDocArg, &jsonUsageArg]()
+        {
+            if (!m_calledFromCommandLine && m_specialActionRequested)
+            {
+                for (auto &arg : {&helpArg, &helpDocArg, &jsonUsageArg})
+                {
+                    if (arg->IsExplicitlySet())
+                    {
+                        ReportError(CE_Failure, CPLE_AppDefined,
+                                    "'%s' argument only available when called "
+                                    "from command line",
+                                    arg->GetName().c_str());
+                        return false;
+                    }
+                }
+            }
+            return true;
+        });
 }
 
 /************************************************************************/
diff --git a/deps/libgdal/gdal/gcore/gdaldriver.cpp b/deps/libgdal/gdal/gcore/gdaldriver.cpp
index a457fdf14..e959436cc 100644
--- a/deps/libgdal/gdal/gcore/gdaldriver.cpp
+++ b/deps/libgdal/gdal/gcore/gdaldriver.cpp
@@ -1804,9 +1804,11 @@ CPLErr GDALDriver::DefaultRename(const char *pszNewName, const char *pszOldName)
     /* -------------------------------------------------------------------- */
     /*      Collect file list.                                              */
     /* -------------------------------------------------------------------- */
-    GDALDatasetH hDS = GDALOpen(pszOldName, GA_ReadOnly);
+    auto poDS = std::unique_ptr<GDALDataset>(
+        GDALDataset::Open(pszOldName, GDAL_OF_ALL | GDAL_OF_VERBOSE_ERROR,
+                          nullptr, nullptr, nullptr));
 
-    if (hDS == nullptr)
+    if (!poDS)
     {
         if (CPLGetLastErrorNo() == 0)
             CPLError(CE_Failure, CPLE_OpenFailed,
@@ -1815,11 +1817,11 @@ CPLErr GDALDriver::DefaultRename(const char *pszNewName, const char *pszOldName)
         return CE_Failure;
     }
 
-    char **papszFileList = GDALGetFileList(hDS);
+    const CPLStringList aosFileList(poDS->GetFileList());
 
-    GDALClose(hDS);
+    poDS.reset();
 
-    if (CSLCount(papszFileList) == 0)
+    if (aosFileList.empty())
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "Unable to determine files associated with %s,\n"
@@ -1834,31 +1836,44 @@ CPLErr GDALDriver::DefaultRename(const char *pszNewName, const char *pszOldName)
     /*      names.                                                          */
     /* -------------------------------------------------------------------- */
     CPLErr eErr = CE_None;
-    char **papszNewFileList =
-        CPLCorrespondingPaths(pszOldName, pszNewName, papszFileList);
+    const CPLStringList aosNewFileList(
+        CPLCorrespondingPaths(pszOldName, pszNewName, aosFileList.List()));
 
-    if (papszNewFileList == nullptr)
+    if (aosNewFileList.empty())
         return CE_Failure;
 
-    for (int i = 0; papszFileList[i] != nullptr; ++i)
+    // Guaranteed by CPLCorrespondingPaths()
+    CPLAssert(aosNewFileList.size() == aosFileList.size());
+
+    VSIStatBufL sStatBuf;
+    if (VSIStatL(pszOldName, &sStatBuf) == 0 && VSI_ISDIR(sStatBuf.st_mode) &&
+        VSIStatL(pszNewName, &sStatBuf) != 0)
     {
-        if (CPLMoveFile(papszNewFileList[i], papszFileList[i]) != 0)
+        if (VSIMkdirRecursive(pszNewName, 0755) != 0)
         {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Cannot create directory '%s'", pszNewName);
+            return CE_Failure;
+        }
+    }
+
+    for (int i = 0; i < aosFileList.size(); ++i)
+    {
+        if (CPLMoveFile(aosNewFileList[i], aosFileList[i]) != 0)
+        {
+            // Above method will have emitted an error in case of failure.
             eErr = CE_Failure;
             // Try to put the ones we moved back.
             for (--i; i >= 0; i--)
             {
                 // Nothing we can do if the moving back doesn't work...
                 CPL_IGNORE_RET_VAL(
-                    CPLMoveFile(papszFileList[i], papszNewFileList[i]));
+                    CPLMoveFile(aosFileList[i], aosNewFileList[i]));
             }
             break;
         }
     }
 
-    CSLDestroy(papszNewFileList);
-    CSLDestroy(papszFileList);
-
     return eErr;
 }
 
@@ -1938,9 +1953,11 @@ CPLErr GDALDriver::DefaultCopyFiles(const char *pszNewName,
     /* -------------------------------------------------------------------- */
     /*      Collect file list.                                              */
     /* -------------------------------------------------------------------- */
-    GDALDatasetH hDS = GDALOpen(pszOldName, GA_ReadOnly);
+    auto poDS = std::unique_ptr<GDALDataset>(
+        GDALDataset::Open(pszOldName, GDAL_OF_ALL | GDAL_OF_VERBOSE_ERROR,
+                          nullptr, nullptr, nullptr));
 
-    if (hDS == nullptr)
+    if (!poDS)
     {
         if (CPLGetLastErrorNo() == 0)
             CPLError(CE_Failure, CPLE_OpenFailed,
@@ -1949,16 +1966,15 @@ CPLErr GDALDriver::DefaultCopyFiles(const char *pszNewName,
         return CE_Failure;
     }
 
-    char **papszFileList = GDALGetFileList(hDS);
+    const CPLStringList aosFileList(poDS->GetFileList());
 
-    GDALClose(hDS);
-    hDS = nullptr;
+    poDS.reset();
 
-    if (CSLCount(papszFileList) == 0)
+    if (aosFileList.empty())
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "Unable to determine files associated with %s,\n"
-                 "rename fails.",
+                 "copy fails.",
                  pszOldName);
 
         return CE_Failure;
@@ -1969,27 +1985,46 @@ CPLErr GDALDriver::DefaultCopyFiles(const char *pszNewName,
     /*      names.                                                          */
     /* -------------------------------------------------------------------- */
     CPLErr eErr = CE_None;
-    char **papszNewFileList =
-        CPLCorrespondingPaths(pszOldName, pszNewName, papszFileList);
+    const CPLStringList aosNewFileList(
+        CPLCorrespondingPaths(pszOldName, pszNewName, aosFileList.List()));
 
-    if (papszNewFileList == nullptr)
+    if (aosNewFileList.empty())
         return CE_Failure;
 
-    for (int i = 0; papszFileList[i] != nullptr; ++i)
+    // Guaranteed by CPLCorrespondingPaths()
+    CPLAssert(aosNewFileList.size() == aosFileList.size());
+
+    VSIStatBufL sStatBuf;
+    if (VSIStatL(pszOldName, &sStatBuf) == 0 && VSI_ISDIR(sStatBuf.st_mode) &&
+        VSIStatL(pszNewName, &sStatBuf) != 0)
     {
-        if (CPLCopyFile(papszNewFileList[i], papszFileList[i]) != 0)
+        if (VSIMkdirRecursive(pszNewName, 0755) != 0)
         {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Cannot create directory '%s'", pszNewName);
+            return CE_Failure;
+        }
+    }
+
+    for (int i = 0; i < aosFileList.size(); ++i)
+    {
+        if (CPLCopyFile(aosNewFileList[i], aosFileList[i]) != 0)
+        {
+            // Above method will have emitted an error in case of failure.
             eErr = CE_Failure;
             // Try to put the ones we moved back.
             for (--i; i >= 0; --i)
-                VSIUnlink(papszNewFileList[i]);
+            {
+                if (VSIUnlink(aosNewFileList[i]) != 0)
+                {
+                    CPLError(CE_Warning, CPLE_AppDefined, "Cannot delete '%s'",
+                             aosNewFileList[i]);
+                }
+            }
             break;
         }
     }
 
-    CSLDestroy(papszNewFileList);
-    CSLDestroy(papszFileList);
-
     return eErr;
 }
 
diff --git a/deps/libgdal/gdal/gcore/gdalmultidim.cpp b/deps/libgdal/gdal/gcore/gdalmultidim.cpp
index 755dea3e1..8fa1e2b60 100644
--- a/deps/libgdal/gdal/gcore/gdalmultidim.cpp
+++ b/deps/libgdal/gdal/gcore/gdalmultidim.cpp
@@ -816,7 +816,7 @@ GUInt64 GDALGroup::GetTotalCopyCost() const
  * @param nCurCost  Should be provided as a variable initially set to 0.
  * @param nTotalCost Total cost from GetTotalCopyCost().
  * @param pfnProgress Progress callback, or nullptr.
- * @param pProgressData Progress user data, or nulptr.
+ * @param pProgressData Progress user data, or nullptr.
  * @param papszOptions Creation options. Currently, only array creation
  *                     options are supported. They must be prefixed with
  * "ARRAY:" . The scope may be further restricted to arrays of a certain
@@ -1889,7 +1889,7 @@ bool GDALExtendedDataType::CopyValue(const void *pSrc,
 /*                             CopyValues()                             */
 /************************************************************************/
 
-/** Convert severals value from a source type to a destination type.
+/** Convert several values from a source type to a destination type.
  *
  * If dstType is GEDTC_STRING, the written value will be a pointer to a char*,
  * that must be freed with CPLFree().
@@ -4034,7 +4034,7 @@ bool GDALMDArray::CopyFromAllExceptValues(const GDALMDArray *poSrcArray,
  * @param nCurCost  Should be provided as a variable initially set to 0.
  * @param nTotalCost Total cost from GetTotalCopyCost().
  * @param pfnProgress Progress callback, or nullptr.
- * @param pProgressData Progress user data, or nulptr.
+ * @param pProgressData Progress user data, or nullptr.
  *
  * @return true in case of success (or partial success if bStrict == false).
  */
diff --git a/deps/libgdal/gdal/gcore/mdreader/reader_eros.cpp b/deps/libgdal/gdal/gcore/mdreader/reader_eros.cpp
index 021b6e8af..7da2e4a7b 100644
--- a/deps/libgdal/gdal/gcore/mdreader/reader_eros.cpp
+++ b/deps/libgdal/gdal/gcore/mdreader/reader_eros.cpp
@@ -36,6 +36,11 @@ GDALMDReaderEROS::GDALMDReaderEROS(const char *pszPath,
     size_t i;
     if (osBaseName.size() > 511)
         return;
+
+    // To shutdown HTTP 403 errors when trying to open .pass side-car file on
+    // gdalinfo /vsicurl/https://s3.opengeohub.org/global/dtm/v1.2/gedtm_rf_m_30m_s_20060101_20151231_go_epsg.4326.3855_v1.2.tif --debug on
+    CPLErrorStateBackuper oBackuper(CPLQuietErrorHandler);
+
     for (i = 0; i < osBaseName.size(); i++)
     {
         if (STARTS_WITH_CI(osBaseName + i, "."))
diff --git a/deps/libgdal/gdal/gcore/overview.cpp b/deps/libgdal/gdal/gcore/overview.cpp
index b5cb4e021..4214132e4 100644
--- a/deps/libgdal/gdal/gcore/overview.cpp
+++ b/deps/libgdal/gdal/gcore/overview.cpp
@@ -1072,7 +1072,7 @@ static int
 
         // Compute the maximum of each DEST_ELTS value to RMS-average
         const auto maxV = max_ps(max_ps(firstLineEven, firstLineOdd),
-                                 max_ps(secondLineEven, secondLineEven));
+                                 max_ps(secondLineEven, secondLineOdd));
 
         // Normalize each value by the maximum of the DEST_ELTS ones.
         // This step is important to avoid that the square evaluates to infinity
diff --git a/deps/libgdal/gdal/ogr/ogr_srs_api.h b/deps/libgdal/gdal/ogr/ogr_srs_api.h
index 28bba60a6..d5c27b1d2 100644
--- a/deps/libgdal/gdal/ogr/ogr_srs_api.h
+++ b/deps/libgdal/gdal/ogr/ogr_srs_api.h
@@ -713,7 +713,7 @@ OGRErr CPL_DLL OSRSetEquirectangular2(OGRSpatialReferenceH hSRS,
                                       double dfFalseEasting,
                                       double dfFalseNorthing);
 
-/** Gall Stereograpic */
+/** Gall Stereographic */
 OGRErr CPL_DLL OSRSetGS(OGRSpatialReferenceH hSRS, double dfCentralMeridian,
                         double dfFalseEasting, double dfFalseNorthing);
 
diff --git a/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogr_adbc.h b/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogr_adbc.h
index c1e87b7fe..db6657ee9 100644
--- a/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogr_adbc.h
+++ b/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogr_adbc.h
@@ -117,6 +117,8 @@ class OGRADBCLayer /* non final */ : public OGRLayer,
     std::unique_ptr<OGRArrowArrayStream> m_stream{};
     bool m_bInternalUse = false;
     bool m_bLayerDefinitionError = false;
+    bool m_bGetNextArrayHasRun = false;
+    bool m_bNextStreamUsageMaybeInvalid = false;
 
     struct ArrowSchema m_schema
     {
@@ -139,7 +141,7 @@ class OGRADBCLayer /* non final */ : public OGRLayer,
     GIntBig GetFeatureCountArrow();
     GIntBig GetFeatureCountParquet();
 
-    bool BuildLayerDefnInit();
+    bool BuildLayerDefnInit(bool bCreateStream);
     virtual void BuildLayerDefn();
     bool ReplaceStatement(const char *pszNewStatement);
     bool UpdateStatement();
diff --git a/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbcbigquerylayer.cpp b/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbcbigquerylayer.cpp
index 1d5f49c50..6a436a1db 100644
--- a/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbcbigquerylayer.cpp
+++ b/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbcbigquerylayer.cpp
@@ -67,7 +67,7 @@ bool OGRADBCBigQueryLayer::GetBigQueryDatasetAndTableId(
 
 void OGRADBCBigQueryLayer::BuildLayerDefn()
 {
-    if (!BuildLayerDefnInit())
+    if (!BuildLayerDefnInit(true))
         return;
 
     std::map<std::string, std::unique_ptr<OGRSpatialReference>> oMapGeomColumns;
diff --git a/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp b/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp
index b6f1b9b3c..c3a623809 100644
--- a/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp
+++ b/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp
@@ -386,6 +386,8 @@ bool OGRADBCDataset::Open(const GDALOpenInfo *poOpenInfo)
     // Load the driver
     if (m_bIsDuckDBDriver)
     {
+        pszADBCDriverName =
+            CPLGetConfigOption("OGR_ADBC_LIBDUCKDB", pszADBCDriverName);
         if (OGRADBCLoadDriver(pszADBCDriverName, "duckdb_adbc_init", &m_driver,
                               error) != ADBC_STATUS_OK)
         {
diff --git a/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp b/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp
index 12c8a24d7..0bbcfd846 100644
--- a/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp
+++ b/deps/libgdal/gdal/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp
@@ -339,7 +339,7 @@ static void ParseGeoParquetColumn(
 /*                         BuildLayerDefnInit()                         */
 /************************************************************************/
 
-bool OGRADBCLayer::BuildLayerDefnInit()
+bool OGRADBCLayer::BuildLayerDefnInit(bool bCreateStream)
 {
     CPLAssert(!m_poAdapterLayer);
 
@@ -368,7 +368,7 @@ bool OGRADBCLayer::BuildLayerDefnInit()
         }
     }
 
-    if (!m_stream)
+    if (!m_stream && bCreateStream)
     {
         OGRADBCError error;
         m_stream = std::make_unique<OGRArrowArrayStream>();
@@ -398,7 +398,11 @@ bool OGRADBCLayer::BuildLayerDefnInit()
 
 void OGRADBCLayer::BuildLayerDefn()
 {
-    if (!BuildLayerDefnInit())
+    const bool bIsUserLayerDuckDB =
+        !m_bInternalUse &&
+        STARTS_WITH_CI(m_osBaseStatement.c_str(), "SELECT ") &&
+        m_poDS->m_bIsDuckDBDriver;
+    if (!BuildLayerDefnInit(!bIsUserLayerDuckDB))
         return;
 
     // Identify geometry columns for Parquet files, and query them with
@@ -409,9 +413,7 @@ void OGRADBCLayer::BuildLayerDefn()
     std::map<std::string, OGREnvelope3D> oMapExtent;
     std::map<std::string, GeomColBBOX> oMapGeomColumnToCoveringBBOXColumn;
 
-    if (!m_bInternalUse &&
-        STARTS_WITH_CI(m_osBaseStatement.c_str(), "SELECT ") &&
-        m_poDS->m_bIsDuckDBDriver)
+    if (bIsUserLayerDuckDB)
     {
         // Try to read GeoParquet 'geo' metadata
         std::map<std::string, std::unique_ptr<OGRSpatialReference>>
@@ -486,7 +488,8 @@ void OGRADBCLayer::BuildLayerDefn()
                 {
                     oMapGeomColumns[pszColName] = std::move(oIter->second);
                 }
-                if (EQUAL(f->GetFieldAsString("column_type"), "GEOMETRY") &&
+                const char *pszColType = f->GetFieldAsString("column_type");
+                if (STARTS_WITH_CI(pszColType, "GEOMETRY") &&
                     m_poDS->m_bSpatialLoaded)
                 {
                     bNewStatement = true;
@@ -494,7 +497,23 @@ void OGRADBCLayer::BuildLayerDefn()
                     osNewStatement += OGRDuplicateCharacter(pszColName, '"');
                     osNewStatement += "\") AS ";
                     if (oIter == oMapGeomColumnsFromGeoParquet.end())
+                    {
                         oMapGeomColumns[pszColName] = nullptr;
+                        // Below is with DuckDB >= 1.5
+                        if (STARTS_WITH_CI(pszColType, "GEOMETRY('EPSG:"))
+                        {
+                            auto poSRS =
+                                std::make_unique<OGRSpatialReference>();
+                            poSRS->SetAxisMappingStrategy(
+                                OAMS_TRADITIONAL_GIS_ORDER);
+                            if (poSRS->importFromEPSG(atoi(
+                                    pszColType + strlen("GEOMETRY('EPSG:"))) ==
+                                OGRERR_NONE)
+                            {
+                                oMapGeomColumns[pszColName] = std::move(poSRS);
+                            }
+                        }
+                    }
                 }
                 osNewStatement += '"';
                 osNewStatement += OGRDuplicateCharacter(pszColName, '"');
@@ -519,6 +538,21 @@ void OGRADBCLayer::BuildLayerDefn()
                 oMapGeomColumns.clear();
             }
         }
+
+        if (!m_stream)
+        {
+            auto stream = std::make_unique<OGRArrowArrayStream>();
+            if (!GetArrowStreamInternal(stream->get()))
+            {
+                return;
+            }
+            m_stream = std::move(stream);
+            if (m_stream->get_schema(&m_schema) != 0)
+            {
+                CPLError(CE_Failure, CPLE_AppDefined, "get_schema() failed");
+                return;
+            }
+        }
     }
 
     for (int i = 0; i < m_schema.n_children; ++i)
@@ -639,24 +673,40 @@ OGRFeature *OGRADBCLayer::GetNextRawFeature()
         m_nIdx = 0;
         m_poAdapterLayer->m_apoFeatures.clear();
 
-        if (!m_stream)
+        struct ArrowArray array;
+        for (int i = 0; i < 2; ++i)
         {
-            auto stream = std::make_unique<OGRArrowArrayStream>();
-            if (!GetArrowStreamInternal(stream->get()))
+            if (!m_stream)
             {
-                m_bEOF = true;
-                return nullptr;
+                auto stream = std::make_unique<OGRArrowArrayStream>();
+                if (!GetArrowStreamInternal(stream->get()))
+                {
+                    m_bEOF = true;
+                    return nullptr;
+                }
+                m_stream = std::move(stream);
             }
-            m_stream = std::move(stream);
-        }
 
-        struct ArrowArray array;
-        memset(&array, 0, sizeof(array));
-        if (m_stream->get_next(&array) != 0)
-        {
-            m_bEOF = true;
-            return nullptr;
+            memset(&array, 0, sizeof(array));
+            if (m_stream->get_next(&array) != 0)
+            {
+                if (m_bNextStreamUsageMaybeInvalid)
+                {
+                    m_bNextStreamUsageMaybeInvalid = false;
+                    m_stream.reset();
+                }
+                else
+                {
+                    m_bEOF = true;
+                    return nullptr;
+                }
+            }
+            else
+            {
+                break;
+            }
         }
+        m_bGetNextArrayHasRun = true;
         const bool bOK =
             array.length
                 ? m_poAdapterLayer->WriteArrowBatch(&m_schema, &array, nullptr)
@@ -702,6 +752,7 @@ void OGRADBCLayer::ResetReading()
         m_bEOF = false;
         m_nIdx = 0;
         m_nFeatureID = 0;
+        m_bGetNextArrayHasRun = false;
     }
 }
 
@@ -985,6 +1036,11 @@ bool OGRADBCLayer::GetArrowStreamInternal(struct ArrowArrayStream *out_stream)
 GIntBig OGRADBCLayer::GetFeatureCountSelectCountStar()
 {
     const std::string osCurStatement = GetCurrentStatement();
+
+    // Cf https://github.com/duckdb/duckdb/issues/21384
+    // and https://github.com/apache/arrow-adbc/blob/da58c591ed89b29c9096e4ebc0fe99d369e2bc88/docs/source/cpp/concurrency.rst
+    m_bNextStreamUsageMaybeInvalid = true;
+
     auto poCountLayer =
         m_poDS->CreateInternalLayer(std::string("SELECT COUNT(*) FROM (")
                                         .append(osCurStatement)
@@ -998,6 +1054,12 @@ GIntBig OGRADBCLayer::GetFeatureCountSelectCountStar()
         if (poFeature)
             return poFeature->GetFieldAsInteger64(0);
     }
+    if (m_bGetNextArrayHasRun)
+    {
+        m_bGetNextArrayHasRun = false;
+        return GetFeatureCountSelectCountStar();
+    }
+
     return -1;
 }
 
@@ -1027,9 +1089,28 @@ GIntBig OGRADBCLayer::GetFeatureCountArrow()
         memset(&array, 0, sizeof(array));
         if (m_stream->get_next(&array) != 0)
         {
-            m_stream.reset();
-            return -1;
+            if (m_bNextStreamUsageMaybeInvalid)
+            {
+                m_bNextStreamUsageMaybeInvalid = false;
+                auto stream = std::make_unique<OGRArrowArrayStream>();
+                if (!GetArrowStreamInternal(stream->get()))
+                {
+                    return -1;
+                }
+                m_stream = std::move(stream);
+                if (m_stream->get_next(&array) != 0)
+                {
+                    m_stream.reset();
+                    return -1;
+                }
+            }
+            else
+            {
+                m_stream.reset();
+                return -1;
+            }
         }
+        m_bGetNextArrayHasRun = true;
         const bool bStop = array.length == 0;
         nTotal += array.length;
         if (array.release)
@@ -1082,6 +1163,10 @@ GIntBig OGRADBCLayer::GetFeatureCount(int bForce)
 
 GIntBig OGRADBCLayer::GetFeatureCountParquet()
 {
+    // Cf https://github.com/duckdb/duckdb/issues/21384
+    // and https://github.com/apache/arrow-adbc/blob/da58c591ed89b29c9096e4ebc0fe99d369e2bc88/docs/source/cpp/concurrency.rst
+    m_bNextStreamUsageMaybeInvalid = true;
+
     const std::string osSQL(CPLSPrintf(
         "SELECT CAST(SUM(num_rows) AS BIGINT) FROM parquet_file_metadata('%s')",
         OGRDuplicateCharacter(m_poDS->m_osParquetFilename, '\'').c_str()));
@@ -1094,6 +1179,11 @@ GIntBig OGRADBCLayer::GetFeatureCountParquet()
         if (poFeature)
             return poFeature->GetFieldAsInteger64(0);
     }
+    if (m_bGetNextArrayHasRun)
+    {
+        m_bGetNextArrayHasRun = false;
+        return GetFeatureCountParquet();
+    }
 
     return -1;
 }
diff --git a/deps/libgdal/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.cpp b/deps/libgdal/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
index fa7e7d88b..55cfff2e5 100644
--- a/deps/libgdal/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
+++ b/deps/libgdal/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
@@ -463,8 +463,19 @@ OGRGenSQLResultsLayer::OGRGenSQLResultsLayer(
     /*      if there is one.                                                */
     /* -------------------------------------------------------------------- */
     if (poSpatFilter)
-        OGRGenSQLResultsLayer::SetSpatialFilter(
-            0, const_cast<OGRGeometry *>(poSpatFilter));
+    {
+        if (m_poDefn->GetGeomFieldCount() > 0)
+        {
+            OGRGenSQLResultsLayer::SetSpatialFilter(
+                0, const_cast<OGRGeometry *>(poSpatFilter));
+        }
+        else
+        {
+            m_bSpatialFilterSetOnSourceLayer = true;
+            m_poSrcLayer->SetSpatialFilter(
+                0, const_cast<OGRGeometry *>(poSpatFilter));
+        }
+    }
 
     OGRGenSQLResultsLayer::ResetReading();
 
@@ -509,12 +520,10 @@ void OGRGenSQLResultsLayer::ClearFilters()
     /* -------------------------------------------------------------------- */
     /*      Clear any filters installed on the target layer.                */
     /* -------------------------------------------------------------------- */
-    if (m_poSrcLayer != nullptr)
-    {
-        m_poSrcLayer->ResetReading();
-        m_poSrcLayer->SetAttributeFilter("");
+    m_poSrcLayer->ResetReading();
+    m_poSrcLayer->SetAttributeFilter("");
+    if (GetLayerDefn()->GetGeomFieldCount() > 0)
         m_poSrcLayer->SetSpatialFilter(nullptr);
-    }
 
     /* -------------------------------------------------------------------- */
     /*      Clear any attribute filter installed on the joined layers.      */
@@ -896,7 +905,7 @@ bool OGRGenSQLResultsLayer::PrepareSummary() const
     auto poSrcLayerDefn = m_poSrcLayer->GetLayerDefn();
     std::unique_ptr<TempGeomIgnoredSetter> oTempGeomIgnoredSetter;
 
-    if (m_poFilterGeom == nullptr &&
+    if (!m_bSpatialFilterSetOnSourceLayer && m_poFilterGeom == nullptr &&
         (psSelectInfo->where_expr == nullptr ||
          !ContainGeomSpecialField(psSelectInfo->where_expr)))
     {
@@ -2706,17 +2715,21 @@ void OGRGenSQLResultsLayer::FindAndSetIgnoredFields()
                 //          poFDefn->GetNameRef(), poLayer->GetName());
             }
         }
-        const int nSrcGeomFieldCount = poSrcFDefn->GetGeomFieldCount();
-        for (int iSrcField = 0; iSrcField < nSrcGeomFieldCount; iSrcField++)
+        if (!m_bSpatialFilterSetOnSourceLayer)
         {
-            OGRGeomFieldDefn *poFDefn = poSrcFDefn->GetGeomFieldDefn(iSrcField);
-            if (CPLHashSetLookup(hSet, poFDefn) == nullptr)
+            const int nSrcGeomFieldCount = poSrcFDefn->GetGeomFieldCount();
+            for (int iSrcField = 0; iSrcField < nSrcGeomFieldCount; iSrcField++)
             {
-                papszIgnoredFields =
-                    CSLAddString(papszIgnoredFields, poFDefn->GetNameRef());
-                // CPLDebug("OGR", "Adding %s to the list of ignored fields of
-                // layer %s",
-                //          poFDefn->GetNameRef(), poLayer->GetName());
+                OGRGeomFieldDefn *poFDefn =
+                    poSrcFDefn->GetGeomFieldDefn(iSrcField);
+                if (CPLHashSetLookup(hSet, poFDefn) == nullptr)
+                {
+                    papszIgnoredFields =
+                        CSLAddString(papszIgnoredFields, poFDefn->GetNameRef());
+                    // CPLDebug("OGR", "Adding %s to the list of ignored fields of
+                    // layer %s",
+                    //          poFDefn->GetNameRef(), poLayer->GetName());
+                }
             }
         }
         poLayer->SetIgnoredFields(
diff --git a/deps/libgdal/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.h b/deps/libgdal/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.h
index d18aaef93..e35aa588d 100644
--- a/deps/libgdal/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.h
+++ b/deps/libgdal/gdal/ogr/ogrsf_frmts/generic/ogr_gensql.h
@@ -50,6 +50,7 @@ class OGRGenSQLResultsLayer final : public OGRLayer
     std::string m_osInitialWHERE{};
     bool m_bForwardWhereToSourceLayer = true;
     bool m_bEOF = false;
+    bool m_bSpatialFilterSetOnSourceLayer = false;
 
     // Array of source layers (owned by m_poSrcDS or m_apoExtraDS)
     std::vector<OGRLayer *> m_apoTableLayers{};
diff --git a/deps/libgdal/gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp b/deps/libgdal/gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp
index fbf539d90..f19133acf 100644
--- a/deps/libgdal/gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp
+++ b/deps/libgdal/gdal/ogr/ogrsf_frmts/gml/gmlhandler.cpp
@@ -1610,6 +1610,24 @@ CPLXMLNode *GMLHandler::ParseAIXMElevationPoint(CPLXMLNode *psGML)
     return psGML;
 }
 
+/************************************************************************/
+/*                            nodeHasChild()                            */
+/************************************************************************/
+
+static bool nodeHasChild(const CPLXMLNode *psHaystack,
+                         const CPLXMLNode *psNeedle)
+{
+    if (psHaystack == psNeedle)
+        return true;
+    for (const CPLXMLNode *psChild = psHaystack->psChild; psChild;
+         psChild = psChild->psNext)
+    {
+        if (nodeHasChild(psChild, psNeedle))
+            return true;
+    }
+    return false;
+}
+
 /************************************************************************/
 /*                         endElementGeometry()                         */
 /************************************************************************/
@@ -1651,34 +1669,37 @@ OGRErr GMLHandler::endElementGeometry()
             m_oMapElementToSubstitute.find(psThisNodeChild->psChild->pszValue);
         if (oIter != m_oMapElementToSubstitute.end())
         {
-            auto psLastChild = oIter->second->psChild;
-            if (psLastChild)
+            const auto psElementToSubstitute = oIter->second;
+            if (nodeHasChild(psElementToSubstitute, psThisNode))
             {
-                // CPLDebug("GML", "Substitution of xlink:href=\"#%s\" with actual content", psThisNodeChild->psChild->pszValue);
-                CPLXMLNode *psAfter = psThisNode->psNext;
-                psThisNode->psNext = nullptr;
-                // We can patch oIter->second as it stored as it in the current
-                // GMLFeature.
-                // Of course that would no longer be the case in case of
-                // cross-references between different GMLFeature, hence we clear
-                // m_oMapElementToSubstitute at the end of the current feature.
-                while (psLastChild->psNext)
-                    psLastChild = psLastChild->psNext;
-                if (psLastChild == psThisNode)
-                {
-                    /* Can happen in situations like:
-                     <foo xlink:href="#X">
-                        <bar gml:id="X"/>
-                     </foo>
-                     Do not attempt substitution as that would cause a memory
-                     leak.
-                    */
-                }
-                else
+                CPLDebug("GML", "href #%s referencing one of its subnodes",
+                         psThisNodeChild->psChild->pszValue);
+                /* Can happen in situations like:
+                 <foo xlink:href="#X">
+                    <bar gml:id="X"/>
+                 </foo>
+                 Do not attempt substitution as that would cause a memory
+                 leak.
+                */
+            }
+            else
+            {
+                auto psLastChild = oIter->second->psChild;
+                if (psLastChild)
                 {
+                    // CPLDebug("GML", "Substitution of xlink:href=\"#%s\" with actual content", psThisNodeChild->psChild->pszValue);
+                    CPLXMLNode *psAfter = psThisNode->psNext;
+                    psThisNode->psNext = nullptr;
+                    // We can patch oIter->second as it stored as it in the current
+                    // GMLFeature.
+                    // Of course that would no longer be the case in case of
+                    // cross-references between different GMLFeature, hence we clear
+                    // m_oMapElementToSubstitute at the end of the current feature.
+                    while (psLastChild->psNext)
+                        psLastChild = psLastChild->psNext;
                     psLastChild->psNext = CPLCloneXMLTree(psThisNode);
+                    psThisNode->psNext = psAfter;
                 }
-                psThisNode->psNext = psAfter;
             }
         }
     }
diff --git a/deps/libgdal/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp b/deps/libgdal/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
index 9abe372c9..1a5af5437 100644
--- a/deps/libgdal/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
+++ b/deps/libgdal/gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
@@ -4087,6 +4087,14 @@ GIntBig OGRGeoPackageTableLayer::GetFeatureCount(int /*bForce*/)
 
     CancelAsyncNextArrowArray();
 
+    if (m_poFilterGeom != nullptr)
+    {
+        // Both are exclusive
+        CreateSpatialIndexIfNecessary();
+        if (!RunDeferredSpatialIndexUpdate())
+            return -1;
+    }
+
     /* Ignore bForce, because we always do a full count on the database */
     OGRErr err;
     CPLString soSQL;
diff --git a/deps/libgdal/gdal/port/cpl_conv.cpp b/deps/libgdal/gdal/port/cpl_conv.cpp
index 59a5dcdc4..648ac8abc 100644
--- a/deps/libgdal/gdal/port/cpl_conv.cpp
+++ b/deps/libgdal/gdal/port/cpl_conv.cpp
@@ -3300,7 +3300,13 @@ int CPLMoveFile(const char *pszNewPath, const char *pszOldPath)
     const int nRet = CPLCopyFile(pszNewPath, pszOldPath);
 
     if (nRet == 0)
-        VSIUnlink(pszOldPath);
+    {
+        if (VSIUnlink(pszOldPath) != 0)
+        {
+            CPLError(CE_Warning, CPLE_AppDefined, "Cannot delete '%s'",
+                     pszOldPath);
+        }
+    }
     return nRet;
 }
 
diff --git a/deps/libgdal/gdal/port/cpl_conv.h b/deps/libgdal/gdal/port/cpl_conv.h
index 2ef34092b..b4a418b71 100644
--- a/deps/libgdal/gdal/port/cpl_conv.h
+++ b/deps/libgdal/gdal/port/cpl_conv.h
@@ -205,7 +205,7 @@ const char CPL_DLL *CPLExtractRelativePath(const char *, const char *, int *)
     CPL_WARN_UNUSED_RESULT CPL_RETURNS_NONNULL;
 char CPL_DLL **
 CPLCorrespondingPaths(const char *pszOldFilename, const char *pszNewFilename,
-                      char **papszFileList) CPL_WARN_UNUSED_RESULT;
+                      CSLConstList papszFileList) CPL_WARN_UNUSED_RESULT;
 int CPL_DLL CPLCheckForFile(char *pszFilename, CSLConstList papszSiblingList);
 
 const char CPL_DLL *CPLGetHomeDir(void) CPL_WARN_UNUSED_RESULT;
@@ -238,6 +238,12 @@ extern "C++"
         CPL_WARN_UNUSED_RESULT;
     std::string CPL_DLL CPLLaunderForFilenameSafe(
         const char *pszName, const char *pszOutputPath) CPL_WARN_UNUSED_RESULT;
+
+#if defined(GDAL_COMPILATION) || __cplusplus >= 201703L
+    std::string CPL_DLL CPLLexicallyNormalize(std::string_view svPath,
+                                              char sep1, char sep2 = 0)
+        CPL_WARN_UNUSED_RESULT;
+#endif
 }
 
 #endif  // defined(__cplusplus) && !defined(CPL_SUPRESS_CPLUSPLUS)
diff --git a/deps/libgdal/gdal/port/cpl_known_config_options.h b/deps/libgdal/gdal/port/cpl_known_config_options.h
index 0b1f4d64a..98cd59a59 100644
--- a/deps/libgdal/gdal/port/cpl_known_config_options.h
+++ b/deps/libgdal/gdal/port/cpl_known_config_options.h
@@ -690,6 +690,7 @@ constexpr static const char* const apszKnownConfigOptions[] =
    "OGR2OGR_MIN_FEATURES_FOR_THREADED_REPROJ", // from ogr2ogr_lib.cpp
    "OGR2OGR_USE_ARROW_API", // from ogr2ogr_lib.cpp
    "OGR_ADBC_AUTO_LOAD_DUCKDB_SPATIAL", // from ogradbcdataset.cpp
+   "OGR_ADBC_LIBDUCKDB", // from ogradbcdataset.cpp
    "OGR_API_SPY_FILE", // from ograpispy.cpp
    "OGR_API_SPY_SNAPSHOT_PATH", // from ograpispy.cpp
    "OGR_APPLY_GEOM_SET_PRECISION", // from ogr2ogr_lib.cpp, ogrlayer.cpp
diff --git a/deps/libgdal/gdal/port/cpl_path.cpp b/deps/libgdal/gdal/port/cpl_path.cpp
index 5a9669877..7aa353862 100644
--- a/deps/libgdal/gdal/port/cpl_path.cpp
+++ b/deps/libgdal/gdal/port/cpl_path.cpp
@@ -27,6 +27,7 @@
 
 #include <algorithm>
 #include <string>
+#include <string_view>
 
 #include "cpl_atomic_ops.h"
 #include "cpl_config.h"
@@ -1317,12 +1318,42 @@ const char *CPLCleanTrailingSlash(const char *pszPath)
  */
 
 char **CPLCorrespondingPaths(const char *pszOldFilename,
-                             const char *pszNewFilename, char **papszFileList)
+                             const char *pszNewFilename,
+                             CSLConstList papszFileList)
 
 {
     if (CSLCount(papszFileList) == 0)
         return nullptr;
 
+    VSIStatBufL sStatBuf;
+    if (VSIStatL(pszOldFilename, &sStatBuf) == 0 && VSI_ISDIR(sStatBuf.st_mode))
+    {
+        CPLStringList aosNewList;
+        std::string_view svOldFilename(pszOldFilename);
+        for (int i = 0; papszFileList[i] != nullptr; i++)
+        {
+            if (cpl::starts_with(std::string_view(papszFileList[i]),
+                                 svOldFilename) &&
+                (papszFileList[i][svOldFilename.size()] == '/' ||
+                 papszFileList[i][svOldFilename.size()] == '\\'))
+            {
+                // If the old file list contains entries like oldpath/filename,
+                // generate newpath/filename
+                aosNewList.push_back(CPLFormFilenameSafe(
+                    pszNewFilename, papszFileList[i] + svOldFilename.size() + 1,
+                    nullptr));
+            }
+            else
+            {
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "Unable to copy/rename fileset due to unexpected "
+                         "source filename.");
+                return nullptr;
+            }
+        }
+        return aosNewList.StealList();
+    }
+
     /* -------------------------------------------------------------------- */
     /*      There is a special case for a one item list which exactly       */
     /*      matches the old name, to rename to the new name.                */
@@ -1706,3 +1737,102 @@ bool CPLHasUnbalancedPathTraversal(const char *pszFilename)
 
     return false;
 }
+
+/************************************************************************/
+/*                       CPLLexicallyNormalize()                        */
+/************************************************************************/
+
+/**
+ * Return a path where "/./" or "/../" sequences are removed.
+ *
+ * No filesystem access is done.
+ *
+ * @param svPath Input path
+ * @param sep1 Path separator (typically slash or backslash)
+ * @param sep2 Secondary path separator (typically slash or backslash), or NUL
+ * @return compacted path
+ *
+ * @since GDAL 3.13
+ */
+std::string CPLLexicallyNormalize(std::string_view svPath, char sep1, char sep2)
+{
+    struct Token
+    {
+        size_t iStart = 0;  // index of start of token with svPath
+        size_t nLen = 0;    // length of token (excluding ending separator)
+        char chSep = 0;     // separator at end of token, or 0 if there is none
+    };
+
+    std::vector<Token> tokens;
+
+    const auto CompactTokens = [&tokens, &svPath]()
+    {
+        Token &t = tokens.back();
+        if (t.nLen == 1 && svPath[t.iStart] == '.')
+        {
+            tokens.pop_back();
+        }
+        else if (t.nLen == 2 && svPath[t.iStart] == '.' &&
+                 svPath[t.iStart + 1] == '.')
+        {
+            if (tokens.size() >= 2)
+                tokens.resize(tokens.size() - 2);
+        }
+    };
+
+    bool lastCharIsSep = false;
+    for (size_t i = 0; i < svPath.size(); ++i)
+    {
+        const char c = svPath[i];
+        if (c == sep1 || c == sep2)
+        {
+            if (!lastCharIsSep)
+            {
+                if (tokens.empty())
+                {
+                    Token t;
+                    t.chSep = c;
+                    tokens.push_back(t);
+                }
+                else
+                {
+                    Token &t = tokens.back();
+                    t.chSep = c;
+                    CompactTokens();
+                }
+                lastCharIsSep = true;
+            }
+        }
+        else
+        {
+            if (tokens.empty() || lastCharIsSep)
+            {
+                Token t;
+                t.iStart = i;
+                t.nLen = 1;
+                tokens.push_back(t);
+            }
+            else
+            {
+                Token &t = tokens.back();
+                ++t.nLen;
+            }
+            lastCharIsSep = false;
+        }
+    }
+    if (!tokens.empty())
+    {
+        CompactTokens();
+    }
+
+    std::string s;
+    s.reserve(svPath.size());
+    for (const auto &t : tokens)
+    {
+        if (t.nLen)
+            s.append(svPath.substr(t.iStart, t.nLen));
+        if (t.chSep)
+            s.push_back(t.chSep);
+    }
+    return s;
+}
diff --git a/deps/libgdal/gdal/port/cpl_vsil_s3.cpp b/deps/libgdal/gdal/port/cpl_vsil_s3.cpp
index 0c0378260..783046fd7 100644
--- a/deps/libgdal/gdal/port/cpl_vsil_s3.cpp
+++ b/deps/libgdal/gdal/port/cpl_vsil_s3.cpp
@@ -1890,38 +1890,15 @@ VSIS3FSHandler::CreateWriteHandle(const char *pszFilename,
 /*                        NormalizeFilenameIfNeeded()                   */
 /************************************************************************/
 
-static void NormalizeFilenameIfNeeded(CPLString &osFilename,
-                                      const char *&pszFilename)
+static void NormalizeFilenameIfNeeded(CPLString &osFilename)
 {
     // Transform '/vsis3/./foo' to '/vsis3/foo' by default
     //
     // Cf https://curl.se/libcurl/c/CURLOPT_PATH_AS_IS.html
-    if (!CPLTestBool(VSIGetPathSpecificOption(pszFilename,
+    if (!CPLTestBool(VSIGetPathSpecificOption(osFilename,
                                               "GDAL_HTTP_PATH_VERBATIM", "NO")))
     {
-        osFilename.replaceAll("/./", '/');
-
-        // Remove "/.." or /../" sequences..
-        while (true)
-        {
-            const auto nSlashDotDotSlashPos = osFilename.find("/../");
-            if (nSlashDotDotSlashPos != std::string::npos &&
-                nSlashDotDotSlashPos > 0)
-            {
-                const auto nLastSlashPos =
-                    osFilename.rfind('/', nSlashDotDotSlashPos - 1);
-                if (nLastSlashPos != std::string::npos)
-                {
-                    osFilename = osFilename.substr(0, nLastSlashPos + 1) +
-                                 osFilename.substr(nSlashDotDotSlashPos +
-                                                   strlen("/../"));
-                    continue;
-                }
-            }
-            break;
-        }
-
-        pszFilename = osFilename.c_str();
+        osFilename = CPLLexicallyNormalize(osFilename, '/');
     }
 }
 
@@ -1937,11 +1914,17 @@ VSIVirtualHandleUniquePtr VSICurlFilesystemHandlerBaseWritable::Open(
         return nullptr;
 
     CPLString osFilename(pszFilename);
-    NormalizeFilenameIfNeeded(osFilename, pszFilename);
+    NormalizeFilenameIfNeeded(osFilename);
+    if (!STARTS_WITH_CI(osFilename.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'",
+                 pszFilename);
+        return nullptr;
+    }
 
     if (strchr(pszAccess, '+'))
     {
-        if (!SupportsRandomWrite(pszFilename, true))
+        if (!SupportsRandomWrite(osFilename, true))
         {
             if (bSetError)
             {
@@ -1956,16 +1939,16 @@ VSIVirtualHandleUniquePtr VSICurlFilesystemHandlerBaseWritable::Open(
         }
 
         const std::string osTmpFilename(
-            CPLGenerateTempFilenameSafe(CPLGetFilename(pszFilename)));
+            CPLGenerateTempFilenameSafe(CPLGetFilename(osFilename)));
         if (strchr(pszAccess, 'r'))
         {
             auto poExistingFile =
-                VSIFilesystemHandler::OpenStatic(pszFilename, "rb");
+                VSIFilesystemHandler::OpenStatic(osFilename, "rb");
             if (!poExistingFile)
             {
                 return nullptr;
             }
-            if (VSICopyFile(pszFilename, osTmpFilename.c_str(),
+            if (VSICopyFile(osFilename, osTmpFilename.c_str(),
                             poExistingFile.get(), static_cast<vsi_l_offset>(-1),
                             nullptr, nullptr, nullptr) != 0)
             {
@@ -1982,7 +1965,7 @@ VSIVirtualHandleUniquePtr VSICurlFilesystemHandlerBaseWritable::Open(
             return nullptr;
         }
 
-        auto poWriteHandle = CreateWriteHandle(pszFilename, papszOptions);
+        auto poWriteHandle = CreateWriteHandle(osFilename, papszOptions);
         if (!poWriteHandle)
         {
             return nullptr;
@@ -1994,20 +1977,20 @@ VSIVirtualHandleUniquePtr VSICurlFilesystemHandlerBaseWritable::Open(
     else if (strchr(pszAccess, 'w') || strchr(pszAccess, 'a'))
     {
         return VSIVirtualHandleUniquePtr(
-            CreateWriteHandle(pszFilename, papszOptions).release());
+            CreateWriteHandle(osFilename, papszOptions).release());
     }
 
-    if (std::string(pszFilename).back() != '/')
+    if (osFilename.back() != '/')
     {
         // If there's directory content for the directory where this file
         // belongs to, use it to detect if the object does not exist
         CachedDirList cachedDirList;
-        const std::string osDirname(CPLGetDirnameSafe(pszFilename));
+        const std::string osDirname(CPLGetDirnameSafe(osFilename));
         if (STARTS_WITH_CI(osDirname.c_str(), GetFSPrefix().c_str()) &&
             GetCachedDirList(osDirname.c_str(), cachedDirList) &&
             cachedDirList.bGotFileList)
         {
-            const std::string osFilenameOnly(CPLGetFilename(pszFilename));
+            const std::string osFilenameOnly(CPLGetFilename(osFilename));
             bool bFound = false;
             for (int i = 0; i < cachedDirList.oFileList.size(); i++)
             {
@@ -2024,7 +2007,7 @@ VSIVirtualHandleUniquePtr VSICurlFilesystemHandlerBaseWritable::Open(
         }
     }
 
-    return VSICurlFilesystemHandlerBase::Open(pszFilename, pszAccess, bSetError,
+    return VSICurlFilesystemHandlerBase::Open(osFilename, pszAccess, bSetError,
                                               papszOptions);
 }
 
@@ -2467,17 +2450,24 @@ char **VSIS3FSHandler::GetFileMetadata(const char *pszFilename,
         return nullptr;
 
     CPLString osFilename(pszFilename);
-    NormalizeFilenameIfNeeded(osFilename, pszFilename);
+    NormalizeFilenameIfNeeded(osFilename);
+    if (!STARTS_WITH_CI(osFilename.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'",
+                 pszFilename);
+        return nullptr;
+    }
 
     if (pszDomain == nullptr || !EQUAL(pszDomain, "TAGS"))
     {
         return VSICurlFilesystemHandlerBase::GetFileMetadata(
-            pszFilename, pszDomain, papszOptions);
+            osFilename, pszDomain, papszOptions);
     }
 
     auto poS3HandleHelper =
         std::unique_ptr<VSIS3HandleHelper>(VSIS3HandleHelper::BuildFromURI(
-            pszFilename + GetFSPrefix().size(), GetFSPrefix().c_str(), false));
+            osFilename.c_str() + GetFSPrefix().size(), GetFSPrefix().c_str(),
+            false));
     if (!poS3HandleHelper)
         return nullptr;
 
@@ -2486,7 +2476,7 @@ char **VSIS3FSHandler::GetFileMetadata(const char *pszFilename,
 
     bool bRetry;
 
-    const CPLStringList aosHTTPOptions(CPLHTTPGetOptionsFromEnv(pszFilename));
+    const CPLStringList aosHTTPOptions(CPLHTTPGetOptionsFromEnv(osFilename));
     const CPLHTTPRetryParameters oRetryParameters(aosHTTPOptions);
     CPLHTTPRetryContext oRetryContext(oRetryParameters);
 
@@ -2588,7 +2578,13 @@ bool VSIS3FSHandler::SetFileMetadata(const char *pszFilename,
         return false;
 
     CPLString osFilename(pszFilename);
-    NormalizeFilenameIfNeeded(osFilename, pszFilename);
+    NormalizeFilenameIfNeeded(osFilename);
+    if (!STARTS_WITH_CI(osFilename.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'",
+                 pszFilename);
+        return false;
+    }
 
     if (pszDomain == nullptr ||
         !(EQUAL(pszDomain, "HEADERS") || EQUAL(pszDomain, "TAGS")))
@@ -2600,12 +2596,13 @@ bool VSIS3FSHandler::SetFileMetadata(const char *pszFilename,
 
     if (EQUAL(pszDomain, "HEADERS"))
     {
-        return CopyObject(pszFilename, pszFilename, papszMetadata) == 0;
+        return CopyObject(osFilename, osFilename, papszMetadata) == 0;
     }
 
     auto poS3HandleHelper =
         std::unique_ptr<VSIS3HandleHelper>(VSIS3HandleHelper::BuildFromURI(
-            pszFilename + GetFSPrefix().size(), GetFSPrefix().c_str(), false));
+            osFilename.c_str() + GetFSPrefix().size(), GetFSPrefix().c_str(),
+            false));
     if (!poS3HandleHelper)
         return false;
 
@@ -2662,7 +2659,7 @@ bool VSIS3FSHandler::SetFileMetadata(const char *pszFilename,
 
     bool bRetry;
 
-    const CPLStringList aosHTTPOptions(CPLHTTPGetOptionsFromEnv(pszFilename));
+    const CPLStringList aosHTTPOptions(CPLHTTPGetOptionsFromEnv(osFilename));
     const CPLHTTPRetryParameters oRetryParameters(aosHTTPOptions);
     CPLHTTPRetryContext oRetryContext(oRetryParameters);
 
@@ -2774,7 +2771,14 @@ int IVSIS3LikeFSHandler::MkdirInternal(const char *pszDirname, long /*nMode*/,
     NetworkStatisticsAction oContextAction("Mkdir");
 
     CPLString osDirname(pszDirname);
-    NormalizeFilenameIfNeeded(osDirname, pszDirname);
+    NormalizeFilenameIfNeeded(osDirname);
+    if (!STARTS_WITH_CI(osDirname.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'",
+                 pszDirname);
+        return -1;
+    }
+
     if (!osDirname.empty() && osDirname.back() != '/')
         osDirname += "/";
 
@@ -2848,7 +2852,14 @@ int IVSIS3LikeFSHandler::Rmdir(const char *pszDirname)
     NetworkStatisticsAction oContextAction("Rmdir");
 
     CPLString osDirname(pszDirname);
-    NormalizeFilenameIfNeeded(osDirname, pszDirname);
+    NormalizeFilenameIfNeeded(osDirname);
+    if (!STARTS_WITH_CI(osDirname.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'",
+                 pszDirname);
+        return -1;
+    }
+
     if (!osDirname.empty() && osDirname.back() != '/')
         osDirname += "/";
 
@@ -2907,14 +2918,19 @@ int IVSIS3LikeFSHandler::Stat(const char *pszFilename, VSIStatBufL *pStatBuf,
         return -1;
 
     CPLString osFilename(pszFilename);
-    NormalizeFilenameIfNeeded(osFilename, pszFilename);
+    NormalizeFilenameIfNeeded(osFilename);
+    if (!STARTS_WITH_CI(osFilename.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'",
+                 pszFilename);
+        return -1;
+    }
 
     if ((nFlags & VSI_STAT_CACHE_ONLY) != 0)
-        return VSICurlFilesystemHandlerBase::Stat(pszFilename, pStatBuf,
-                                                  nFlags);
+        return VSICurlFilesystemHandlerBase::Stat(osFilename, pStatBuf, nFlags);
 
     memset(pStatBuf, 0, sizeof(VSIStatBufL));
-    if (!IsAllowedFilename(pszFilename))
+    if (!IsAllowedFilename(osFilename))
         return -1;
 
     NetworkStatisticsFileSystem oContextFS(GetFSPrefix().c_str());
@@ -3057,9 +3073,15 @@ int IVSIS3LikeFSHandler::Unlink(const char *pszFilename)
         return -1;
 
     CPLString osFilename(pszFilename);
-    NormalizeFilenameIfNeeded(osFilename, pszFilename);
+    NormalizeFilenameIfNeeded(osFilename);
+    if (!STARTS_WITH_CI(osFilename.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'",
+                 pszFilename);
+        return -1;
+    }
 
-    std::string osNameWithoutPrefix = pszFilename + GetFSPrefix().size();
+    std::string osNameWithoutPrefix = osFilename.c_str() + GetFSPrefix().size();
     if (osNameWithoutPrefix.find('/') == std::string::npos)
     {
         CPLDebug(GetDebugKey(), "%s is not a file", pszFilename);
@@ -3071,7 +3093,7 @@ int IVSIS3LikeFSHandler::Unlink(const char *pszFilename)
     NetworkStatisticsAction oContextAction("Unlink");
 
     VSIStatBufL sStat;
-    if (VSIStatL(pszFilename, &sStat) != 0)
+    if (VSIStatL(osFilename, &sStat) != 0)
     {
         CPLDebug(GetDebugKey(), "%s is not a object", pszFilename);
         errno = ENOENT;
@@ -3084,7 +3106,7 @@ int IVSIS3LikeFSHandler::Unlink(const char *pszFilename)
         return -1;
     }
 
-    return DeleteObject(pszFilename);
+    return DeleteObject(osFilename);
 }
 
 /************************************************************************/
@@ -3101,16 +3123,25 @@ int IVSIS3LikeFSHandler::Rename(const char *oldpath, const char *newpath,
         return -1;
 
     CPLString osOldPath(oldpath);
-    NormalizeFilenameIfNeeded(osOldPath, oldpath);
+    NormalizeFilenameIfNeeded(osOldPath);
+    if (!STARTS_WITH_CI(osOldPath.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'", oldpath);
+        return -1;
+    }
 
     CPLString osNewPath(newpath);
-    NormalizeFilenameIfNeeded(osNewPath, newpath);
-
+    NormalizeFilenameIfNeeded(osNewPath);
+    if (!STARTS_WITH_CI(osNewPath.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'", newpath);
+        return -1;
+    }
     NetworkStatisticsFileSystem oContextFS(GetFSPrefix().c_str());
     NetworkStatisticsAction oContextAction("Rename");
 
     VSIStatBufL sStat;
-    if (VSIStatL(oldpath, &sStat) != 0)
+    if (VSIStatL(osOldPath, &sStat) != 0)
     {
         CPLDebug(GetDebugKey(), "%s is not a object", oldpath);
         errno = ENOENT;
@@ -3120,21 +3151,21 @@ int IVSIS3LikeFSHandler::Rename(const char *oldpath, const char *newpath,
     // AWS doesn't like renaming to the same name, and errors out
     // But GCS does like it, and so we might end up killing ourselves !
     // POSIX says renaming on the same file is OK
-    if (strcmp(oldpath, newpath) == 0)
+    if (strcmp(osOldPath, osNewPath) == 0)
         return 0;
 
     if (VSI_ISDIR(sStat.st_mode))
     {
         int ret = 0;
-        const CPLStringList aosList(VSIReadDir(oldpath));
-        Mkdir(newpath, 0755);
+        const CPLStringList aosList(VSIReadDir(osOldPath));
+        Mkdir(osNewPath, 0755);
         const int nListSize = aosList.size();
         for (int i = 0; ret == 0 && i < nListSize; i++)
         {
             const std::string osSrc =
-                CPLFormFilenameSafe(oldpath, aosList[i], nullptr);
+                CPLFormFilenameSafe(osOldPath, aosList[i], nullptr);
             const std::string osTarget =
-                CPLFormFilenameSafe(newpath, aosList[i], nullptr);
+                CPLFormFilenameSafe(osNewPath, aosList[i], nullptr);
             void *pScaledProgress =
                 GDALCreateScaledProgress(static_cast<double>(i) / nListSize,
                                          static_cast<double>(i + 1) / nListSize,
@@ -3145,23 +3176,23 @@ int IVSIS3LikeFSHandler::Rename(const char *oldpath, const char *newpath,
             GDALDestroyScaledProgress(pScaledProgress);
         }
         if (ret == 0)
-            Rmdir(oldpath);
+            Rmdir(osOldPath);
         return ret;
     }
     else
     {
-        if (VSIStatL(newpath, &sStat) == 0 && VSI_ISDIR(sStat.st_mode))
+        if (VSIStatL(osNewPath, &sStat) == 0 && VSI_ISDIR(sStat.st_mode))
         {
             CPLDebug(GetDebugKey(), "%s already exists and is a directory",
                      newpath);
             errno = ENOTEMPTY;
             return -1;
         }
-        if (CopyObject(oldpath, newpath, nullptr) != 0)
+        if (CopyObject(osOldPath, osNewPath, nullptr) != 0)
         {
             return -1;
         }
-        return DeleteObject(oldpath);
+        return DeleteObject(osOldPath);
     }
 }
 
@@ -3471,12 +3502,17 @@ VSIDIR *IVSIS3LikeFSHandler::OpenDir(const char *pszPath, int nRecurseDepth,
         return nullptr;
 
     CPLString osPath(pszPath);
-    NormalizeFilenameIfNeeded(osPath, pszPath);
+    NormalizeFilenameIfNeeded(osPath);
+    if (!STARTS_WITH_CI(osPath.c_str(), GetFSPrefix().c_str()))
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Invalid filename '%s'", pszPath);
+        return nullptr;
+    }
 
     NetworkStatisticsFileSystem oContextFS(GetFSPrefix().c_str());
     NetworkStatisticsAction oContextAction("OpenDir");
 
-    std::string osDirnameWithoutPrefix = pszPath + GetFSPrefix().size();
+    std::string osDirnameWithoutPrefix = osPath.c_str() + GetFSPrefix().size();
     if (!osDirnameWithoutPrefix.empty() && osDirnameWithoutPrefix.back() == '/')
     {
         osDirnameWithoutPrefix.pop_back();
@@ -3498,7 +3534,7 @@ VSIDIR *IVSIS3LikeFSHandler::OpenDir(const char *pszPath, int nRecurseDepth,
         return nullptr;
     }
 
-    VSIDIRS3 *dir = new VSIDIRS3(pszPath, this);
+    VSIDIRS3 *dir = new VSIDIRS3(osPath, this);
     dir->nRecurseDepth = nRecurseDepth;
     dir->poHandleHelper = std::move(poS3HandleHelper);
     dir->osBucket = std::move(osBucket);