From 0dede5a742530db7905bfb23090c00cbfaddc40e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 23:09:43 +0200
Subject: [PATCH 01/87] Python bindings; Add osgeo.gdal.VSIFile class
 (originating from autotest)

---
 autotest/pymod/gdaltest.py        | 81 +------------------------
 doc/source/spelling_wordlist.txt  |  1 +
 swig/include/python/gdal_python.i | 99 +++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 80 deletions(-)

diff --git a/autotest/pymod/gdaltest.py b/autotest/pymod/gdaltest.py
index 417a0768181e..e02254740f9d 100755
--- a/autotest/pymod/gdaltest.py
+++ b/autotest/pymod/gdaltest.py
@@ -2102,87 +2102,8 @@ def reopen(ds, update=False, open_options=None):
     )
 
 
-# VSIFile helper class
-
-
-class VSIFile:
-    def __init__(self, path, mode, encoding="utf-8"):
-        self._path = path
-        self._mode = mode
-
-        self._binary = "b" in mode
-        self._encoding = encoding
-
-        self._fp = gdal.VSIFOpenExL(self._path, self._mode, True)
-        if self._fp is None:
-            raise OSError(gdal.VSIGetLastErrorMsg())
-
-        self._closed = False
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args):
-        self.close()
-
-    def __iter__(self):
-        return self
-
-    def __next__(self):
-        line = gdal.CPLReadLineL(self._fp)
-        if line is None:
-            raise StopIteration
-        if self._binary:
-            return line.encode()
-        return line
-
-    def close(self):
-        if self._closed:
-            return
-
-        self._closed = True
-        gdal.VSIFCloseL(self._fp)
-
-    def read(self, size=-1):
-        if size == -1:
-            pos = self.tell()
-            self.seek(0, 2)
-            size = self.tell()
-            self.seek(pos)
-
-        raw = gdal.VSIFReadL(1, size, self._fp)
-
-        if self._binary:
-            return bytes(raw)
-        else:
-            return raw.decode(self._encoding)
-
-    def write(self, x):
-
-        if self._binary:
-            assert type(x) in (bytes, bytearray, memoryview)
-        else:
-            assert type(x) is str
-            x = x.encode(self._encoding)
-
-        planned_write = len(x)
-        actual_write = gdal.VSIFWriteL(x, 1, planned_write, self._fp)
-
-        if planned_write != actual_write:
-            raise OSError(
-                f"Expected to write {planned_write} bytes but {actual_write} were written"
-            )
-
-    def seek(self, offset, whence=0):
-        if gdal.VSIFSeekL(self._fp, offset, whence) != 0:
-            raise OSError(gdal.VSIGetLastErrorMsg())
-
-    def tell(self):
-        return gdal.VSIFTellL(self._fp)
-
-
 def vsi_open(path, mode="r"):
-    return VSIFile(path, mode)
+    return gdal.VSIFile(path, mode)
 
 
 def vrt_has_open_support():
diff --git a/doc/source/spelling_wordlist.txt b/doc/source/spelling_wordlist.txt
index 77d3e4e14e6c..4c4ea2d861af 100644
--- a/doc/source/spelling_wordlist.txt
+++ b/doc/source/spelling_wordlist.txt
@@ -3455,6 +3455,7 @@ vsiaz
 vsicached
 vsicrypt
 vsicurl
+VSIFile
 VSIFOpen
 vsigs
 vsigz
diff --git a/swig/include/python/gdal_python.i b/swig/include/python/gdal_python.i
index 902aa5d6bf50..d6354b63a47e 100644
--- a/swig/include/python/gdal_python.i
+++ b/swig/include/python/gdal_python.i
@@ -5012,3 +5012,102 @@ def InterpolateAtPoint(self, *args, **kwargs):
     else:
         return ret[1]
 %}
+
+%pythoncode %{
+
+# VSIFile: Copyright (c) 2024, Dan Baston <dbaston at gmail.com>
+
+from io import BytesIO
+
+class VSIFile(BytesIO):
+    """Class wrapping a GDAL VSILFILE instance as a Python BytesIO instance
+
+       :since: GDAL 3.11
+    """
+
+    def __init__(self, path, mode, encoding="utf-8"):
+        self._path = path
+        self._mode = mode
+
+        self._binary = "b" in mode
+        self._encoding = encoding
+
+        self._fp = VSIFOpenExL(self._path, self._mode, True)
+        if self._fp is None:
+            raise OSError(VSIGetLastErrorMsg())
+
+        self._closed = False
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        self.close()
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        line = CPLReadLineL(self._fp)
+        if line is None:
+            raise StopIteration
+        if self._binary:
+            return line.encode()
+        return line
+
+    def close(self):
+        if self._closed:
+            return
+
+        self._closed = True
+        VSIFCloseL(self._fp)
+
+    def read(self, size=-1):
+        if size == -1:
+            pos = self.tell()
+            self.seek(0, 2)
+            size = self.tell()
+            self.seek(pos)
+
+        raw = VSIFReadL(1, size, self._fp)
+
+        if self._binary:
+            return bytes(raw)
+        else:
+            return raw.decode(self._encoding)
+
+    def write(self, x):
+
+        if self._binary:
+            assert type(x) in (bytes, bytearray, memoryview)
+        else:
+            assert type(x) is str
+            x = x.encode(self._encoding)
+
+        planned_write = len(x)
+        actual_write = VSIFWriteL(x, 1, planned_write, self._fp)
+
+        if planned_write != actual_write:
+            raise OSError(
+                f"Expected to write {planned_write} bytes but {actual_write} were written"
+            )
+
+    def seek(self, offset, whence=0):
+        # We redefine the docstring since otherwise breathe would complain on the one coming from BytesIO.seek()
+        """Change stream position.
+
+           Seek to byte offset pos relative to position indicated by whence:
+
+           - 0: Start of stream (the default).  pos should be >= 0;
+           - 1: Current position - pos may be negative;
+           - 2: End of stream - pos usually negative.
+
+           Returns the new absolute position.
+        """
+
+        if VSIFSeekL(self._fp, offset, whence) != 0:
+            raise OSError(VSIGetLastErrorMsg())
+
+    def tell(self):
+        return VSIFTellL(self._fp)
+%}

From 2210300b4a11eaf99edfce0fc6017661d6bc61d3 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 23:11:26 +0200
Subject: [PATCH 02/87] Python bindings: add a osgeo.gdal_fsspec module that on
 import will register GDAL VSI file system handlers as fsspec
 AbstractFileSystem

---
 .github/workflows/cmake_builds.yml           |   2 +-
 .github/workflows/ubuntu_24.04/Dockerfile.ci |   2 +
 .pre-commit-config.yaml                      |   9 +-
 autotest/gcore/test_gdal_fsspec.py           | 229 +++++++++++++++
 doc/requirements.txt                         |   1 +
 doc/source/api/python/general.rst            |  20 ++
 doc/source/api/python/osgeo.gdal_fsspec.rst  |  12 +
 doc/source/api/python/osgeo.rst              |   1 +
 swig/include/cpl.i                           |   8 +
 swig/python/CMakeLists.txt                   |  10 +
 swig/python/osgeo/gdal_fsspec.py             | 292 +++++++++++++++++++
 11 files changed, 582 insertions(+), 4 deletions(-)
 create mode 100644 autotest/gcore/test_gdal_fsspec.py
 create mode 100644 doc/source/api/python/osgeo.gdal_fsspec.rst
 create mode 100644 swig/python/osgeo/gdal_fsspec.py

diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
index d4e8f04587fd..234021da7493 100644
--- a/.github/workflows/cmake_builds.yml
+++ b/.github/workflows/cmake_builds.yml
@@ -432,7 +432,7 @@ jobs:
             cfitsio freexl geotiff libjpeg-turbo libpq libspatialite libwebp-base pcre pcre2 postgresql \
             sqlite tiledb zstd cryptopp cgal doxygen librttopo libkml openssl xz \
             openjdk ant qhull armadillo blas blas-devel libblas libcblas liblapack liblapacke blosc libarchive \
-            arrow-cpp pyarrow libaec libheif libavif cmake
+            arrow-cpp pyarrow libaec libheif libavif cmake fsspec
     - name: Check CMake version
       shell: bash -l {0}
       run: |
diff --git a/.github/workflows/ubuntu_24.04/Dockerfile.ci b/.github/workflows/ubuntu_24.04/Dockerfile.ci
index 9d4f4137480d..0c217be9b185 100644
--- a/.github/workflows/ubuntu_24.04/Dockerfile.ci
+++ b/.github/workflows/ubuntu_24.04/Dockerfile.ci
@@ -149,3 +149,5 @@ RUN python3 -m pip install -U --break-system-packages -r /tmp/requirements.txt
 # cfchecker requires udunits2
 RUN apt-get install -y --allow-unauthenticated libudunits2-0 libudunits2-data
 RUN python3 -m pip install --break-system-packages cfchecker
+
+RUN python3 -m pip install --break-system-packages fsspec
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a0215f92638f..b7f88f67772b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,7 +5,8 @@ repos:
         -   id: black
             exclude: >
               (?x)^(
-                swig/python/osgeo/|
+                swig/python/osgeo/__init__.py|
+                swig/python/osgeo/gdalnumeric.py|
                 autotest/ogr/data/
               )
     -   repo: https://github.com/timothycrosley/isort
@@ -14,7 +15,8 @@ repos:
         -   id: isort
             exclude: >
               (?x)^(
-                swig/python/osgeo/|
+                swig/python/osgeo/__init__.py|
+                swig/python/osgeo/gdalnumeric.py|
                 autotest/ogr/data/
               )
     -   repo: https://github.com/pycqa/flake8
@@ -23,7 +25,8 @@ repos:
         -   id: flake8
             exclude: >
               (?x)^(
-                swig/python/osgeo/|
+                swig/python/osgeo/__init__.py|
+                swig/python/osgeo/gdalnumeric.py|
                 examples/|
                 autotest/ogr/data/
               )
diff --git a/autotest/gcore/test_gdal_fsspec.py b/autotest/gcore/test_gdal_fsspec.py
new file mode 100644
index 000000000000..ac227a57db10
--- /dev/null
+++ b/autotest/gcore/test_gdal_fsspec.py
@@ -0,0 +1,229 @@
+#!/usr/bin/env pytest
+# -*- coding: utf-8 -*-
+###############################################################################
+# Project:  GDAL/OGR Test Suite
+# Purpose:  Test gdal_fsspec module
+# Author:   Even Rouault <even dot rouault at spatialys.com>
+#
+###############################################################################
+# Copyright (c) 20124, Even Rouault <even dot rouault at spatialys.com>
+#
+# SPDX-License-Identifier: MIT
+###############################################################################
+
+import pytest
+
+from osgeo import gdal
+
+fsspec = pytest.importorskip("fsspec")
+pytest.importorskip("fsspec.spec")
+
+from osgeo import gdal_fsspec  # NOQA
+
+
+def test_gdal_fsspec_open_read():
+
+    with fsspec.open("vsi://data/byte.tif") as f:
+        assert len(f.read()) == gdal.VSIStatL("data/byte.tif").size
+
+
+def test_gdal_fsspec_info_file():
+
+    fs = fsspec.filesystem("vsi")
+    info = fs.info("data/byte.tif")
+    assert "mtime" in info
+    del info["mtime"]
+    assert (info["mode"] & 32768) != 0
+    del info["mode"]
+    assert info == {
+        "name": "data/byte.tif",
+        "size": 736,
+        "type": "file",
+    }
+
+
+def test_gdal_fsspec_info_dir():
+
+    fs = fsspec.filesystem("vsi")
+    info = fs.info("data")
+    assert (info["mode"] & 16384) != 0
+    del info["mode"]
+    assert info == {
+        "name": "data",
+        "size": 0,
+        "type": "directory",
+    }
+
+
+def test_gdal_fsspec_info_error():
+
+    fs = fsspec.filesystem("vsi")
+    with pytest.raises(FileNotFoundError):
+        fs.info("/i/do/not/exist")
+
+
+def test_gdal_fsspec_ls():
+
+    fs = fsspec.filesystem("vsi")
+    ret = fs.ls("data")
+    assert len(ret) > 2
+    item_of_interest = None
+    for item in ret:
+        if item["name"] == "data/byte.tif":
+            item_of_interest = item
+            break
+    assert item_of_interest
+    assert "mtime" in item_of_interest
+    del item_of_interest["mtime"]
+    assert item_of_interest == {
+        "name": "data/byte.tif",
+        "size": 736,
+        "type": "file",
+    }
+
+
+def test_gdal_fsspec_ls_file():
+
+    fs = fsspec.filesystem("vsi")
+    ret = fs.ls("data/byte.tif")
+    assert ret == ["data/byte.tif"]
+
+
+def test_gdal_fsspec_ls_error():
+
+    fs = fsspec.filesystem("vsi")
+    with pytest.raises(FileNotFoundError):
+        fs.ls("vsi://i/do/not/exist")
+
+
+def test_gdal_fsspec_modified():
+
+    fs = fsspec.filesystem("vsi")
+    modified = fs.modified("data/byte.tif")
+    assert modified is not None
+    import datetime
+
+    assert isinstance(modified, datetime.datetime)
+
+
+def test_gdal_fsspec_modified_error():
+
+    fs = fsspec.filesystem("vsi")
+    with pytest.raises(FileNotFoundError):
+        fs.modified("vsi://i/do/not/exist")
+
+
+def test_gdal_fsspec_rm():
+
+    with fsspec.open("vsimem:///foo.bin", "wb") as f:
+        f.write(b"""bar""")
+    fs = fsspec.filesystem("vsimem")
+    fs.info("/foo.bin")
+    fs.rm("/foo.bin")
+    with pytest.raises(FileNotFoundError):
+        fs.info("/foo.bin")
+
+
+def test_gdal_fsspec_rm_error():
+
+    fs = fsspec.filesystem("vsimem")
+    with pytest.raises(FileNotFoundError):
+        fs.rm("/foo.bin")
+
+
+def test_gdal_fsspec_copy():
+
+    with fsspec.open("vsimem://foo.bin", "wb") as f:
+        f.write(b"""bar""")
+    fs = fsspec.filesystem("vsimem")
+    fs.copy("/foo.bin", "/bar.bin")
+    assert fs.info("/bar.bin")["size"] == 3
+    assert fs.info("/foo.bin")["size"] == 3
+    fs.rm("/foo.bin")
+    fs.rm("/bar.bin")
+
+
+def test_gdal_fsspec_copy_error():
+
+    fs = fsspec.filesystem("vsimem")
+    with pytest.raises(FileNotFoundError):
+        fs.copy("/foo.bin", "/bar.bin")
+
+
+def test_gdal_fsspec_mv():
+
+    with fsspec.open("vsimem://foo.bin", "wb") as f:
+        f.write(b"""bar""")
+    fs = fsspec.filesystem("vsimem")
+    fs.mv("/foo.bin", "/bar.bin")
+    assert fs.info("/bar.bin")["size"] == 3
+    with pytest.raises(FileNotFoundError):
+        fs.info("/foo.bin")
+    fs.rm("/bar.bin")
+
+
+def test_gdal_fsspec_mv_error():
+
+    fs = fsspec.filesystem("vsimem")
+    with pytest.raises(FileNotFoundError):
+        fs.mv("/foo.bin", "/bar.bin")
+
+
+def test_gdal_fsspec_mkdir(tmp_path):
+
+    fs = fsspec.filesystem("vsi")
+
+    my_path = str(tmp_path) + "/my_dir"
+
+    fs.mkdir(my_path)
+    assert fs.info(my_path)["type"] == "directory"
+    with pytest.raises(FileExistsError):
+        fs.mkdir(my_path)
+    fs.rmdir(my_path)
+
+    fs.mkdir(my_path + "/my_subdir")
+    assert fs.info(my_path)["type"] == "directory"
+    assert fs.info(my_path + "/my_subdir")["type"] == "directory"
+    fs.rmdir(my_path + "/my_subdir")
+    fs.rmdir(my_path)
+    with pytest.raises(FileNotFoundError):
+        fs.info(my_path)
+
+    fs = fsspec.filesystem("vsi")
+    with pytest.raises(Exception):
+        fs.mkdir(my_path + "/my_subdir", create_parents=False)
+    with pytest.raises(FileNotFoundError):
+        fs.info(my_path)
+
+
+def test_gdal_fsspec_makedirs(tmp_path):
+
+    fs = fsspec.filesystem("vsi")
+
+    my_path = str(tmp_path) + "/my_dir"
+    fs.makedirs(my_path)
+    assert fs.info(my_path)["type"] == "directory"
+    with pytest.raises(FileExistsError):
+        fs.makedirs(my_path)
+    fs.makedirs(my_path, exist_ok=True)
+    fs.rmdir(my_path)
+
+
+def test_gdal_fsspec_usable_by_pyarrow_dataset(tmp_vsimem):
+
+    ds = pytest.importorskip("pyarrow.dataset")
+
+    tmp_vsimem_file = str(tmp_vsimem / "tmp.parquet")
+    gdal.FileFromMemBuffer(
+        tmp_vsimem_file, open("../ogr/data/parquet/test.parquet", "rb").read()
+    )
+
+    fs_vsimem = fsspec.filesystem("vsimem")
+
+    assert (
+        ds.dataset(tmp_vsimem_file[len("/vsimem") :], filesystem=fs_vsimem) is not None
+    )
+
+    assert (
+        ds.dataset(str(tmp_vsimem)[len("/vsimem") :], filesystem=fs_vsimem) is not None
+    )
diff --git a/doc/requirements.txt b/doc/requirements.txt
index e4378d870530..34b6230cfd8d 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,6 @@
 # This file may be used to create an environment using:
 # $ pip install --upgrade -r <this file>
+fsspec
 numpy
 sphinx
 breathe
diff --git a/doc/source/api/python/general.rst b/doc/source/api/python/general.rst
index 7c7cb58a19ab..a77c90f3844c 100644
--- a/doc/source/api/python/general.rst
+++ b/doc/source/api/python/general.rst
@@ -95,6 +95,26 @@ Error Handling
 File Management
 ---------------
 
+osgeo.gdal_fsspec module
+++++++++++++++++++++++++
+
+.. automodule:: osgeo.gdal_fsspec
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   :noindex:
+
+osgeo.gdal.VSIFile class
+++++++++++++++++++++++++
+
+.. autoclass:: osgeo.gdal.VSIFile
+   :members:
+   :undoc-members:
+   :noindex:
+
+Low level functions
++++++++++++++++++++
+
 .. autofunction:: osgeo.gdal.CloseDir
 
 .. autofunction:: osgeo.gdal.CopyFile
diff --git a/doc/source/api/python/osgeo.gdal_fsspec.rst b/doc/source/api/python/osgeo.gdal_fsspec.rst
new file mode 100644
index 000000000000..2b1bbe35b138
--- /dev/null
+++ b/doc/source/api/python/osgeo.gdal_fsspec.rst
@@ -0,0 +1,12 @@
+..
+   The documentation displayed on this page is automatically generated from
+   Python docstrings. See https://gdal.org/development/dev_documentation.html
+   for information on updating this content.
+
+osgeo.gdal_fsspec module
+========================
+
+.. automodule:: osgeo.gdal_fsspec
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc/source/api/python/osgeo.rst b/doc/source/api/python/osgeo.rst
index d10dfdded4ba..5cf9bcd6e46a 100644
--- a/doc/source/api/python/osgeo.rst
+++ b/doc/source/api/python/osgeo.rst
@@ -12,6 +12,7 @@ Submodules
 
    osgeo.gdal
    osgeo.gdal_array
+   osgeo.gdal_fsspec
    osgeo.gdalconst
    osgeo.gnm
    osgeo.ogr
diff --git a/swig/include/cpl.i b/swig/include/cpl.i
index 0e8efca98794..e1890997737b 100644
--- a/swig/include/cpl.i
+++ b/swig/include/cpl.i
@@ -742,6 +742,14 @@ void CopyFileRestartable(const char* pszSource,
 
 }
 
+%rename (MoveFile) wrapper_MoveFile;
+%inline {
+int wrapper_MoveFile(const char* pszSource, const char* pszTarget)
+{
+    return CPLMoveFile(pszTarget, pszSource);
+}
+}
+
 %clear (const char* pszSource);
 %clear (const char* pszTarget);
 
diff --git a/swig/python/CMakeLists.txt b/swig/python/CMakeLists.txt
index d694c71c208b..b0a12f19c704 100644
--- a/swig/python/CMakeLists.txt
+++ b/swig/python/CMakeLists.txt
@@ -106,6 +106,14 @@ set(GDAL_PYTHON_CSOURCES
       list(APPEND GDAL_PYTHON_PYSOURCES "${CMAKE_CURRENT_BINARY_DIR}/osgeo/__init__.py")
   endif()
 
+  if (NOT "${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
+      add_custom_command(
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdal_fsspec.py"
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/osgeo/gdal_fsspec.py" "${CMAKE_CURRENT_BINARY_DIR}/osgeo"
+        DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/osgeo/gdal_fsspec.py")
+      list(APPEND GDAL_PYTHON_PYSOURCES "${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdal_fsspec.py")
+  endif()
+
   foreach(_file IN ITEMS ${GDAL_PYTHON_CSOURCES})
       add_custom_command(
         OUTPUT ${_file}
@@ -544,6 +552,7 @@ elseif (Python_Development_FOUND)
             ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdal.py
             ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdalconst.py
             ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdalnumeric.py
+            ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdal_fsspec.py
             ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gnm.py
             ${CMAKE_CURRENT_BINARY_DIR}/osgeo/ogr.py
             ${CMAKE_CURRENT_BINARY_DIR}/osgeo/osr.py
@@ -554,6 +563,7 @@ elseif (Python_Development_FOUND)
           ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdal.py
           ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdalconst.py
           ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdalnumeric.py
+          ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gdal_fsspec.py
           ${CMAKE_CURRENT_BINARY_DIR}/osgeo/gnm.py
           ${CMAKE_CURRENT_BINARY_DIR}/osgeo/ogr.py
           ${CMAKE_CURRENT_BINARY_DIR}/osgeo/osr.py
diff --git a/swig/python/osgeo/gdal_fsspec.py b/swig/python/osgeo/gdal_fsspec.py
new file mode 100644
index 000000000000..5debc910ec36
--- /dev/null
+++ b/swig/python/osgeo/gdal_fsspec.py
@@ -0,0 +1,292 @@
+# SPDX-License-Identifier: MIT
+# Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+
+"""Module exposing GDAL Virtual File Systems (VSI) as fsspec implementations.
+
+   Importing "osgeo.gdal_fsspec" requires the Python "fsspec"
+   (https://filesystem-spec.readthedocs.io/en/latest/) module to be available.
+
+   A generic "vsi" fsspec protocol is available. All GDAL VSI file names must be
+   simply prefixed with "vsi://". For example:
+
+   - "vsi://data/byte.tif" to access relative file "data/byte.tif"
+   - "vsi:///home/user/byte.tif" to access absolute file "/home/user/byte.tif"
+   - "vsi:///vsimem/byte.tif" (note the 3 slashes) to access VSIMem file "/vsimem/byte.tif"
+
+   Each VSI file system is also registered as a distinct fsspec protocol, such
+   as "vsimem", "vsicurl", "vsizip", "vsitar", etc.
+
+   Examples:
+
+   - "vsimem://byte.tif" to access file "/vsimem/byte.tif"
+   - "vsicurl://http://example.com/foo" to access file "/vsicurl/http://example.com/foo"
+   - "vsis3://my_bucket/byte.tif" to access file "/vsis3/my_bucket/byte.tif"
+   - "vsizip:///home/user/my.zip/foo.tif" (note the 3 slashes to indicate absolute path)
+     to access (absolute) file "/vsizip//home/user/my.zip/foo.tif"
+   - "vsizip://my.zip/foo.tif" to access (relative) file "/vsizip/my.zip/foo.tif"
+
+   :since: GDAL 3.11
+"""
+
+from pathlib import PurePath
+
+from fsspec.registry import register_implementation
+from fsspec.spec import AbstractFileSystem
+from fsspec.utils import stringify_path
+
+from osgeo import gdal
+
+
+class VSIFileSystem(AbstractFileSystem):
+    """Implementation of AbstractFileSystem for a GDAL Virtual File System"""
+
+    @classmethod
+    def _get_gdal_path(cls, path):
+        """Return a GDAL compatible file from a fsspec file name.
+
+        For the file system using the generic "vsi" protocol,
+        remove the leading vsi:// if found (normally, it should be there,
+        but most AbstractFileSystem implementations seem to be ready to remove
+        it if found)
+
+        For specialized file systems, like vsimem://, etc., for an input
+        like "vsimem:///foo", return "/vsimem/foo". And for an input like
+        "/foo" also return "/vsimem/foo".
+        """
+
+        if isinstance(path, PurePath):
+            path = stringify_path(path)
+
+        if cls.protocol == "vsi":
+            # "vsi://something" just becomes "something"
+            if path.startswith("vsi://"):
+                return path[len("vsi://") :]
+
+            return path
+
+        else:
+            list_protocols_that_need_leeding_slash = [
+                "vsis3",
+                "vsigs",
+                "vsiaz",
+                "vsioss",
+                "vsiswift",
+            ]
+            list_protocols_that_need_leeding_slash += [
+                item + "_streaming" for item in list_protocols_that_need_leeding_slash
+            ]
+            list_protocols_that_need_leeding_slash.append("vsimem")
+
+            # Deal with paths like "vsis3://foo"
+            full_protocol = cls.protocol + "://"
+            if path.startswith(full_protocol):
+                path = path[len(full_protocol) :]
+
+            # Deal with paths like "/foo" with a VSIFileSystem that is something like "vsis3"
+            if (
+                cls.protocol in list_protocols_that_need_leeding_slash
+                and not path.startswith("/")
+            ):
+                path = "/" + path
+
+            return "/" + cls.protocol + path
+
+    def _open(
+        self,
+        path,
+        mode="rb",
+        block_size=None,
+        autocommit=True,
+        cache_options=None,
+        **kwargs,
+    ):
+        """Implements AbstractFileSystem._open()"""
+
+        path = self._get_gdal_path(path)
+        return gdal.VSIFile(path, mode)
+
+    def info(self, path, **kwargs):
+        """Implements AbstractFileSystem.info()"""
+
+        gdal_path = self._get_gdal_path(path)
+        stat = gdal.VSIStatL(gdal_path)
+        if stat is None:
+            raise FileNotFoundError(path)
+        if stat.IsDirectory():
+            ret = {
+                "name": self._strip_protocol(path),
+                "size": 0,
+                "type": "directory",
+            }
+        else:
+            ret = {
+                "name": self._strip_protocol(path),
+                "size": stat.size,
+                "type": "file",
+                "mtime": stat.mtime,
+            }
+        if stat.mode:
+            ret["mode"] = stat.mode
+        return ret
+
+    def modified(self, path):
+        """Implements AbstractFileSystem.modified()"""
+
+        gdal_path = self._get_gdal_path(path)
+        stat = gdal.VSIStatL(gdal_path)
+        if stat is None:
+            raise FileNotFoundError(path)
+        import datetime
+
+        return datetime.datetime.fromtimestamp(stat.mtime)
+
+    def ls(self, path, detail=True, **kwargs):
+        """Implements AbstractFileSystem.ls()"""
+
+        fs_path = self._strip_protocol(path)
+        gdal_path = self._get_gdal_path(path)
+        ret = []
+        directory = gdal.OpenDir(gdal_path)
+        if directory is None:
+            stat = gdal.VSIStatL(gdal_path)
+            if stat is None:
+                raise FileNotFoundError(path)
+            return [fs_path]
+
+        try:
+            while True:
+                entry = gdal.GetNextDirEntry(directory)
+                if entry is None:
+                    break
+
+                ret_entry = {
+                    "name": fs_path + "/" + entry.name,
+                    "type": (
+                        "file"
+                        if (entry.mode & 32768) != 0
+                        else "directory"
+                        if (entry.mode & 16384) != 0
+                        else None
+                    ),
+                }
+                if ret_entry["type"] == "file":
+                    ret_entry["size"] = entry.size if entry.sizeKnown else None
+                if entry.mtimeKnown:
+                    ret_entry["mtime"] = entry.mtime
+                ret.append(ret_entry)
+        finally:
+            gdal.CloseDir(directory)
+        return ret
+
+    def mkdir(self, path, create_parents=True, **kwargs):
+        """Implements AbstractFileSystem.mkdir()"""
+
+        # Base fs.makedirs() may call us with "/vsimem"
+        if (
+            path + "/" in gdal.GetFileSystemsPrefixes()
+            or path in gdal.GetFileSystemsPrefixes()
+        ):
+            return
+
+        gdal_path = self._get_gdal_path(path)
+        if gdal.VSIStatL(gdal_path):
+            raise FileExistsError(path)
+        if create_parents:
+            ret = gdal.MkdirRecursive(gdal_path, 0o755)
+        else:
+            ret = gdal.Mkdir(gdal_path, 0o755)
+        if ret != 0:
+            raise IOError(path)
+
+    def makedirs(self, path, exist_ok=False):
+        """Implements AbstractFileSystem.makedirs()"""
+
+        gdal_path = self._get_gdal_path(path)
+        if gdal.VSIStatL(gdal_path):
+            if not exist_ok:
+                raise FileExistsError(path)
+            return
+
+        self.mkdir(path, create_parents=True)
+
+    def _rm(self, path):
+        """Implements AbstractFileSystem._rm()"""
+
+        gdal_path = self._get_gdal_path(path)
+        ret = -1
+        try:
+            ret = gdal.Unlink(gdal_path)
+        except Exception:
+            pass
+        if ret != 0:
+            if gdal.VSIStatL(gdal_path) is None:
+                raise FileNotFoundError(path)
+            raise IOError(path)
+
+    def rmdir(self, path):
+        """Implements AbstractFileSystem.rmdir()"""
+
+        gdal_path = self._get_gdal_path(path)
+        ret = -1
+        try:
+            ret = gdal.Rmdir(gdal_path)
+        except Exception:
+            pass
+        if ret != 0:
+            if gdal.VSIStatL(gdal_path) is None:
+                raise FileNotFoundError(path)
+            raise IOError(path)
+
+    def mv(self, path1, path2, recursive=False, maxdepth=None, **kwargs):
+        """Implements AbstractFileSystem.mv()"""
+
+        old_path = self._get_gdal_path(path1)
+        new_path = self._get_gdal_path(path2)
+        try:
+            if gdal.MoveFile(old_path, new_path) != 0:
+                if gdal.VSIStatL(old_path) is None:
+                    raise FileNotFoundError(path1)
+                raise IOError(f"Cannot move from {path1} to {path2}")
+        except Exception:
+            if gdal.VSIStatL(old_path) is None:
+                raise FileNotFoundError(path1)
+            raise
+
+    def copy(
+        self, path1, path2, recursive=False, maxdepth=None, on_error=None, **kwargs
+    ):
+        """Implements AbstractFileSystem.copy()"""
+
+        old_path = self._get_gdal_path(path1)
+        new_path = self._get_gdal_path(path2)
+        try:
+            if gdal.CopyFile(old_path, new_path) != 0:
+                if gdal.VSIStatL(old_path) is None:
+                    raise FileNotFoundError(path1)
+                raise IOError(f"Cannot copy from {path1} to {path2}")
+        except Exception:
+            if gdal.VSIStatL(old_path) is None:
+                raise FileNotFoundError(path1)
+            raise
+
+
+def register_vsi_implementations():
+    """Register a generic "vsi" protocol and "vsimem", "vsitar", etc.
+    This method is automatically called on osgeo.gdal_fsspec import.
+    """
+    register_implementation("vsi", VSIFileSystem)
+    for vsi_prefix in gdal.GetFileSystemsPrefixes():
+        if vsi_prefix.startswith("/vsi") and not vsi_prefix.endswith("?"):
+            assert vsi_prefix.endswith("/")
+            protocol = vsi_prefix[1:-1]
+            # We need to duplicate the base class for each protocol, so that
+            # each class has a distinct "protocol" member.
+            new_class = type(
+                "VSIFileSystem_" + protocol,
+                VSIFileSystem.__bases__,
+                dict(VSIFileSystem.__dict__),
+            )
+            register_implementation(protocol, new_class)
+
+
+register_vsi_implementations()

From 0b07ea7db3c95b57e779a4ef0c59d0b08bf9f552 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 12 Oct 2024 15:10:11 +0200
Subject: [PATCH 03/87] Python bindings: simplify previous commit to have a
 single 'gdalvsi' protocol

---
 autotest/gcore/test_gdal_fsspec.py | 86 ++++++++++++++----------------
 doc/source/spelling_wordlist.txt   |  1 +
 swig/python/osgeo/gdal_fsspec.py   | 84 +++++------------------------
 3 files changed, 56 insertions(+), 115 deletions(-)

diff --git a/autotest/gcore/test_gdal_fsspec.py b/autotest/gcore/test_gdal_fsspec.py
index ac227a57db10..38deb8da07be 100644
--- a/autotest/gcore/test_gdal_fsspec.py
+++ b/autotest/gcore/test_gdal_fsspec.py
@@ -23,13 +23,13 @@
 
 def test_gdal_fsspec_open_read():
 
-    with fsspec.open("vsi://data/byte.tif") as f:
+    with fsspec.open("gdalvsi://data/byte.tif") as f:
         assert len(f.read()) == gdal.VSIStatL("data/byte.tif").size
 
 
 def test_gdal_fsspec_info_file():
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
     info = fs.info("data/byte.tif")
     assert "mtime" in info
     del info["mtime"]
@@ -44,7 +44,7 @@ def test_gdal_fsspec_info_file():
 
 def test_gdal_fsspec_info_dir():
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
     info = fs.info("data")
     assert (info["mode"] & 16384) != 0
     del info["mode"]
@@ -57,14 +57,14 @@ def test_gdal_fsspec_info_dir():
 
 def test_gdal_fsspec_info_error():
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
     with pytest.raises(FileNotFoundError):
         fs.info("/i/do/not/exist")
 
 
 def test_gdal_fsspec_ls():
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
     ret = fs.ls("data")
     assert len(ret) > 2
     item_of_interest = None
@@ -84,21 +84,21 @@ def test_gdal_fsspec_ls():
 
 def test_gdal_fsspec_ls_file():
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
     ret = fs.ls("data/byte.tif")
     assert ret == ["data/byte.tif"]
 
 
 def test_gdal_fsspec_ls_error():
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
     with pytest.raises(FileNotFoundError):
-        fs.ls("vsi://i/do/not/exist")
+        fs.ls("gdalvsi://i/do/not/exist")
 
 
 def test_gdal_fsspec_modified():
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
     modified = fs.modified("data/byte.tif")
     assert modified is not None
     import datetime
@@ -108,70 +108,70 @@ def test_gdal_fsspec_modified():
 
 def test_gdal_fsspec_modified_error():
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
     with pytest.raises(FileNotFoundError):
-        fs.modified("vsi://i/do/not/exist")
+        fs.modified("gdalvsi://i/do/not/exist")
 
 
 def test_gdal_fsspec_rm():
 
-    with fsspec.open("vsimem:///foo.bin", "wb") as f:
+    with fsspec.open("gdalvsi:///vsimem/foo.bin", "wb") as f:
         f.write(b"""bar""")
-    fs = fsspec.filesystem("vsimem")
-    fs.info("/foo.bin")
-    fs.rm("/foo.bin")
+    fs = fsspec.filesystem("gdalvsi")
+    fs.info("/vsimem/foo.bin")
+    fs.rm("/vsimem/foo.bin")
     with pytest.raises(FileNotFoundError):
-        fs.info("/foo.bin")
+        fs.info("/vsimem/foo.bin")
 
 
 def test_gdal_fsspec_rm_error():
 
-    fs = fsspec.filesystem("vsimem")
+    fs = fsspec.filesystem("gdalvsi")
     with pytest.raises(FileNotFoundError):
-        fs.rm("/foo.bin")
+        fs.rm("/vsimem/foo.bin")
 
 
 def test_gdal_fsspec_copy():
 
-    with fsspec.open("vsimem://foo.bin", "wb") as f:
+    with fsspec.open("gdalvsi:///vsimem/foo.bin", "wb") as f:
         f.write(b"""bar""")
-    fs = fsspec.filesystem("vsimem")
-    fs.copy("/foo.bin", "/bar.bin")
-    assert fs.info("/bar.bin")["size"] == 3
-    assert fs.info("/foo.bin")["size"] == 3
-    fs.rm("/foo.bin")
-    fs.rm("/bar.bin")
+    fs = fsspec.filesystem("gdalvsi")
+    fs.copy("/vsimem/foo.bin", "/vsimem/bar.bin")
+    assert fs.info("/vsimem/bar.bin")["size"] == 3
+    assert fs.info("/vsimem/foo.bin")["size"] == 3
+    fs.rm("/vsimem/foo.bin")
+    fs.rm("/vsimem/bar.bin")
 
 
 def test_gdal_fsspec_copy_error():
 
-    fs = fsspec.filesystem("vsimem")
+    fs = fsspec.filesystem("gdalvsi")
     with pytest.raises(FileNotFoundError):
-        fs.copy("/foo.bin", "/bar.bin")
+        fs.copy("/vsimem/foo.bin", "/vsimem/bar.bin")
 
 
 def test_gdal_fsspec_mv():
 
-    with fsspec.open("vsimem://foo.bin", "wb") as f:
+    with fsspec.open("gdalvsi:///vsimem/foo.bin", "wb") as f:
         f.write(b"""bar""")
-    fs = fsspec.filesystem("vsimem")
-    fs.mv("/foo.bin", "/bar.bin")
-    assert fs.info("/bar.bin")["size"] == 3
+    fs = fsspec.filesystem("gdalvsi")
+    fs.mv("/vsimem/foo.bin", "/vsimem/bar.bin")
+    assert fs.info("/vsimem/bar.bin")["size"] == 3
     with pytest.raises(FileNotFoundError):
-        fs.info("/foo.bin")
-    fs.rm("/bar.bin")
+        fs.info("/vsimem/foo.bin")
+    fs.rm("/vsimem/bar.bin")
 
 
 def test_gdal_fsspec_mv_error():
 
-    fs = fsspec.filesystem("vsimem")
+    fs = fsspec.filesystem("gdalvsi")
     with pytest.raises(FileNotFoundError):
-        fs.mv("/foo.bin", "/bar.bin")
+        fs.mv("/vsimem/foo.bin", "/bar.bin")
 
 
 def test_gdal_fsspec_mkdir(tmp_path):
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
 
     my_path = str(tmp_path) + "/my_dir"
 
@@ -189,7 +189,7 @@ def test_gdal_fsspec_mkdir(tmp_path):
     with pytest.raises(FileNotFoundError):
         fs.info(my_path)
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
     with pytest.raises(Exception):
         fs.mkdir(my_path + "/my_subdir", create_parents=False)
     with pytest.raises(FileNotFoundError):
@@ -198,7 +198,7 @@ def test_gdal_fsspec_mkdir(tmp_path):
 
 def test_gdal_fsspec_makedirs(tmp_path):
 
-    fs = fsspec.filesystem("vsi")
+    fs = fsspec.filesystem("gdalvsi")
 
     my_path = str(tmp_path) + "/my_dir"
     fs.makedirs(my_path)
@@ -218,12 +218,8 @@ def test_gdal_fsspec_usable_by_pyarrow_dataset(tmp_vsimem):
         tmp_vsimem_file, open("../ogr/data/parquet/test.parquet", "rb").read()
     )
 
-    fs_vsimem = fsspec.filesystem("vsimem")
+    fs_vsimem = fsspec.filesystem("gdalvsi")
 
-    assert (
-        ds.dataset(tmp_vsimem_file[len("/vsimem") :], filesystem=fs_vsimem) is not None
-    )
+    assert ds.dataset(tmp_vsimem_file, filesystem=fs_vsimem) is not None
 
-    assert (
-        ds.dataset(str(tmp_vsimem)[len("/vsimem") :], filesystem=fs_vsimem) is not None
-    )
+    assert ds.dataset(str(tmp_vsimem), filesystem=fs_vsimem) is not None
diff --git a/doc/source/spelling_wordlist.txt b/doc/source/spelling_wordlist.txt
index 4c4ea2d861af..484b6fd812ea 100644
--- a/doc/source/spelling_wordlist.txt
+++ b/doc/source/spelling_wordlist.txt
@@ -1018,6 +1018,7 @@ GDALThreadLocalDatasetCache
 gdaltindex
 gdaltransform
 gdalvirtualmem
+gdalvsi
 gdalwarp
 gdalwmscache
 gdb
diff --git a/swig/python/osgeo/gdal_fsspec.py b/swig/python/osgeo/gdal_fsspec.py
index 5debc910ec36..5861422095dc 100644
--- a/swig/python/osgeo/gdal_fsspec.py
+++ b/swig/python/osgeo/gdal_fsspec.py
@@ -1,29 +1,18 @@
 # SPDX-License-Identifier: MIT
 # Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
 
-"""Module exposing GDAL Virtual File Systems (VSI) as fsspec implementations.
+"""Module exposing GDAL Virtual File Systems (VSI) as a "gdalvsi" fsspec implementation.
 
    Importing "osgeo.gdal_fsspec" requires the Python "fsspec"
    (https://filesystem-spec.readthedocs.io/en/latest/) module to be available.
 
-   A generic "vsi" fsspec protocol is available. All GDAL VSI file names must be
-   simply prefixed with "vsi://". For example:
+   A generic "gdalvsi" fsspec protocol is available. All GDAL VSI file names must be
+   simply prefixed with "gdalvsi://". For example:
 
-   - "vsi://data/byte.tif" to access relative file "data/byte.tif"
-   - "vsi:///home/user/byte.tif" to access absolute file "/home/user/byte.tif"
-   - "vsi:///vsimem/byte.tif" (note the 3 slashes) to access VSIMem file "/vsimem/byte.tif"
-
-   Each VSI file system is also registered as a distinct fsspec protocol, such
-   as "vsimem", "vsicurl", "vsizip", "vsitar", etc.
-
-   Examples:
-
-   - "vsimem://byte.tif" to access file "/vsimem/byte.tif"
-   - "vsicurl://http://example.com/foo" to access file "/vsicurl/http://example.com/foo"
-   - "vsis3://my_bucket/byte.tif" to access file "/vsis3/my_bucket/byte.tif"
-   - "vsizip:///home/user/my.zip/foo.tif" (note the 3 slashes to indicate absolute path)
-     to access (absolute) file "/vsizip//home/user/my.zip/foo.tif"
-   - "vsizip://my.zip/foo.tif" to access (relative) file "/vsizip/my.zip/foo.tif"
+   - "gdalvsi://data/byte.tif" to access relative file "data/byte.tif"
+   - "gdalvsi:///home/user/byte.tif" to access absolute file "/home/user/byte.tif"
+   - "gdalvsi:///vsimem/byte.tif" (note the 3 slashes) to access VSIMem file "/vsimem/byte.tif"
+   - "gdalvsi:///vsicurl/https://example.com/byte.tif (note the 3 slashes) to access "https://example.com/byte.tif" through /vsicurl/
 
    :since: GDAL 3.11
 """
@@ -44,52 +33,19 @@ class VSIFileSystem(AbstractFileSystem):
     def _get_gdal_path(cls, path):
         """Return a GDAL compatible file from a fsspec file name.
 
-        For the file system using the generic "vsi" protocol,
-        remove the leading vsi:// if found (normally, it should be there,
+        Remove the leading vsi:// if found (normally, it should be there,
         but most AbstractFileSystem implementations seem to be ready to remove
         it if found)
-
-        For specialized file systems, like vsimem://, etc., for an input
-        like "vsimem:///foo", return "/vsimem/foo". And for an input like
-        "/foo" also return "/vsimem/foo".
         """
 
         if isinstance(path, PurePath):
             path = stringify_path(path)
 
-        if cls.protocol == "vsi":
-            # "vsi://something" just becomes "something"
-            if path.startswith("vsi://"):
-                return path[len("vsi://") :]
-
-            return path
+        # "vsi://something" just becomes "something"
+        if path.startswith("vsi://"):
+            return path[len("vsi://") :]
 
-        else:
-            list_protocols_that_need_leeding_slash = [
-                "vsis3",
-                "vsigs",
-                "vsiaz",
-                "vsioss",
-                "vsiswift",
-            ]
-            list_protocols_that_need_leeding_slash += [
-                item + "_streaming" for item in list_protocols_that_need_leeding_slash
-            ]
-            list_protocols_that_need_leeding_slash.append("vsimem")
-
-            # Deal with paths like "vsis3://foo"
-            full_protocol = cls.protocol + "://"
-            if path.startswith(full_protocol):
-                path = path[len(full_protocol) :]
-
-            # Deal with paths like "/foo" with a VSIFileSystem that is something like "vsis3"
-            if (
-                cls.protocol in list_protocols_that_need_leeding_slash
-                and not path.startswith("/")
-            ):
-                path = "/" + path
-
-            return "/" + cls.protocol + path
+        return path
 
     def _open(
         self,
@@ -271,22 +227,10 @@ def copy(
 
 
 def register_vsi_implementations():
-    """Register a generic "vsi" protocol and "vsimem", "vsitar", etc.
+    """Register a generic "gdalvsi" protocol.
     This method is automatically called on osgeo.gdal_fsspec import.
     """
-    register_implementation("vsi", VSIFileSystem)
-    for vsi_prefix in gdal.GetFileSystemsPrefixes():
-        if vsi_prefix.startswith("/vsi") and not vsi_prefix.endswith("?"):
-            assert vsi_prefix.endswith("/")
-            protocol = vsi_prefix[1:-1]
-            # We need to duplicate the base class for each protocol, so that
-            # each class has a distinct "protocol" member.
-            new_class = type(
-                "VSIFileSystem_" + protocol,
-                VSIFileSystem.__bases__,
-                dict(VSIFileSystem.__dict__),
-            )
-            register_implementation(protocol, new_class)
+    register_implementation("gdalvsi", VSIFileSystem)
 
 
 register_vsi_implementations()

From bef27e19d24ef43353eee7921237870f2bd8cb27 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Oct 2024 17:49:25 +0200
Subject: [PATCH 04/87] CMake: add EMBED_RESOURCE_FILES and
 USE_ONLY_EMBEDDED_RESOURCE_FILES options

---
 cmake/helpers/GdalDriverHelper.cmake | 13 ++++++++++
 gdal.cmake                           | 39 ++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/cmake/helpers/GdalDriverHelper.cmake b/cmake/helpers/GdalDriverHelper.cmake
index d8588adbf1f4..23be3dd9aa22 100644
--- a/cmake/helpers/GdalDriverHelper.cmake
+++ b/cmake/helpers/GdalDriverHelper.cmake
@@ -559,3 +559,16 @@ macro(ogr_default_driver name desc)
     add_feature_info(ogr_${key} OGR_ENABLE_DRIVER_${key} "${desc}")
     add_subdirectory(${name})
 endmacro()
+
+function(add_driver_embedded_resources driver_target is_plugin_var c_filename)
+    add_library(${driver_target}_resources OBJECT ${c_filename})
+    gdal_standard_includes(${driver_target}_resources)
+    set_property(TARGET ${driver_target}_resources PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
+    target_compile_definitions(${driver_target} PRIVATE EMBED_RESOURCE_FILES)
+    set_target_properties(${driver_target}_resources PROPERTIES C_STANDARD 23)
+    if (${${is_plugin_var}})
+        target_sources(${driver_target} PRIVATE $<TARGET_OBJECTS:${driver_target}_resources>)
+    else()
+        target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:${driver_target}_resources>)
+    endif()
+endfunction()
diff --git a/gdal.cmake b/gdal.cmake
index 029eedda484d..6af60831fb01 100644
--- a/gdal.cmake
+++ b/gdal.cmake
@@ -253,6 +253,45 @@ endif ()
 
 set(INSTALL_PLUGIN_FULL_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGIN_DIR}")
 
+function (is_sharp_embed_available res)
+    if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.21 AND
+        ((CMAKE_C_COMPILER_ID STREQUAL "GNU") OR (CMAKE_C_COMPILER_ID STREQUAL "Clang")))
+        # CMAKE_C_STANDARD=23 only supported since CMake 3.21
+        set(TEST_SHARP_EMBED
+          "static const unsigned char embedded[] = {\n#embed __FILE__\n};\nint main() { (void)embedded; return 0;}"
+        )
+        set(CMAKE_C_STANDARD_BACKUP "${CMAKE_C_STANDARD}")
+        set(CMAKE_C_STANDARD "23")
+        check_c_source_compiles("${TEST_SHARP_EMBED}" _TEST_SHARP_EMBED)
+        set(CMAKE_C_STANDARD "${CMAKE_C_STANDARD_BACKUP}")
+        if (_TEST_SHARP_EMBED)
+            set(${res} ON PARENT_SCOPE)
+        else()
+            set(${res} OFF PARENT_SCOPE)
+        endif()
+    else()
+        set(${res} OFF PARENT_SCOPE)
+    endif()
+endfunction()
+
+is_sharp_embed_available(IS_SHARP_EMBED_AVAILABLE_RES)
+if (NOT BUILD_SHARED_LIBS AND IS_SHARP_EMBED_AVAILABLE_RES)
+    set(DEFAULT_EMBED_RESOURCE_FILES ON)
+else()
+    set(DEFAULT_EMBED_RESOURCE_FILES OFF)
+endif()
+option(EMBED_RESOURCE_FILES "Whether resource files should be embedded into the GDAL library (only available with a C23 compatible compiler)" ${DEFAULT_EMBED_RESOURCE_FILES})
+
+if (EMBED_RESOURCE_FILES AND NOT IS_SHARP_EMBED_AVAILABLE_RES)
+  message(FATAL_ERROR "C23 #embed not available with this compiler")
+endif()
+
+option(USE_ONLY_EMBEDDED_RESOURCE_FILES "Whether embedded resource files should be used (should nominally be used together with EMBED_RESOURCE_FILES=ON, otherwise this will result in non-functional builds)" OFF)
+
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES AND NOT EMBED_RESOURCE_FILES)
+  message(WARNING "USE_ONLY_EMBEDDED_RESOURCE_FILES=ON set but EMBED_RESOURCE_FILES=OFF: some drivers will lack required resource files")
+endif()
+
 # Configure internal libraries
 if (GDAL_USE_ZLIB_INTERNAL)
   option(RENAME_INTERNAL_ZLIB_SYMBOLS "Rename internal zlib symbols" ON)

From 0a752b78ac32cbe86046208e41c79cc3c94e47b8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 3 Oct 2024 23:02:48 +0200
Subject: [PATCH 05/87] CI: fedoraw:rawhide: enable -DEMBED_RESOURCE_FILES=ON
 -DUSE_ONLY_EMBEDDED_RESOURCE_FILES=ON

---
 .github/workflows/fedora_rawhide/build.sh | 10 ++++++++++
 .github/workflows/linux_build.yml         | 15 ++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/fedora_rawhide/build.sh b/.github/workflows/fedora_rawhide/build.sh
index b4d22a77b2b9..423a817451cc 100755
--- a/.github/workflows/fedora_rawhide/build.sh
+++ b/.github/workflows/fedora_rawhide/build.sh
@@ -10,7 +10,17 @@ cmake ${GDAL_SOURCE_DIR:=..} \
   -DCMAKE_CXX_FLAGS="-std=c++20 -Werror -O1 -D_FORTIFY_SOURCE=2" \
   -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \
   -DUSE_CCACHE=ON \
+  -DEMBED_RESOURCE_FILES=ON \
   -DCMAKE_INSTALL_PREFIX=/usr \
   -DWERROR_DEV_FLAG="-Werror=dev"
 make -j$(nproc)
 make -j$(nproc) install DESTDIR=/tmp/install-gdal
+
+ctest -V -j $(nproc)
+
+rm -rf data
+cmake ${GDAL_SOURCE_DIR:=..} \
+  -DUSE_ONLY_EMBEDDED_RESOURCE_FILES=ON
+rm -rf /tmp/install-gdal
+make -j$(nproc)
+make -j$(nproc) install DESTDIR=/tmp/install-gdal
diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml
index 19db499f741f..360ef0687397 100644
--- a/.github/workflows/linux_build.yml
+++ b/.github/workflows/linux_build.yml
@@ -264,6 +264,10 @@ jobs:
         # FIXME the default BUILD_CMD here isn't working...we get an error
         # about the quotes not matching.
       - name: Build
+        env:
+          TRAVIS: yes
+          TRAVIS_BRANCH: ${{ matrix.travis_branch }}
+          BUILD_NAME: ${{ matrix.travis_branch }}
         run: |
           if test -f ".github/workflows/${{ matrix.id }}/${{ matrix.build_script }}"; then
             BUILD_CMD="$(pwd)/.github/workflows/${{ matrix.id }}/${{ matrix.build_script }}"
@@ -271,11 +275,20 @@ jobs:
             BUILD_CMD="sh -c 'cmake .. && make -j$(nproc)'"
           fi
 
+          # For cache
+          mkdir -p .gdal
+
           mkdir -p build-${{ matrix.id }}
           docker run --name gdal-build \
             --rm \
+            -e CI \
+            -e GITHUB_WORKFLOW \
+            -e TRAVIS \
+            -e TRAVIS_BRANCH \
+            -e BUILD_NAME \
             -e "GDAL_SOURCE_DIR=$(pwd)" \
             -u $(id -u ${USER}):$(id -g ${USER}) \
+            -v $(pwd)/.gdal:/.gdal:rw \
             -v $(pwd):$(pwd):rw \
             -v ${{ github.workspace }}/.ccache:/.ccache:rw \
             --workdir $(pwd)/build-${{ matrix.id }} \
@@ -322,7 +335,7 @@ jobs:
           fi
 
           # For cache
-          mkdir .gdal
+          mkdir -p .gdal
 
           docker run \
             -e CI \

From 57519b9907f08733cc5a42491dd3ec36d53ae595 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Oct 2024 17:49:26 +0200
Subject: [PATCH 06/87] gcore/: embed LICENSE.TXT if EMBED_RESOURCE_FILES

---
 autotest/gcore/basic_test.py | 25 ++++++++++++++-----------
 gcore/CMakeLists.txt         | 12 ++++++++++++
 gcore/embedded_resources.c   | 13 +++++++++++++
 gcore/embedded_resources.h   | 10 ++++++++++
 gcore/gdal_misc.cpp          | 29 ++++++++++++++++++++++++++---
 5 files changed, 75 insertions(+), 14 deletions(-)
 create mode 100644 gcore/embedded_resources.c
 create mode 100644 gcore/embedded_resources.h

diff --git a/autotest/gcore/basic_test.py b/autotest/gcore/basic_test.py
index cb389656c94d..3b399d820925 100755
--- a/autotest/gcore/basic_test.py
+++ b/autotest/gcore/basic_test.py
@@ -176,17 +176,20 @@ def test_basic_test_8():
         license_text.startswith("GDAL/OGR is released under the MIT license")
         or "GDAL/OGR Licensing" in license_text
     )
-
-    # Use a subprocess to avoid the cached license text
-    env = os.environ.copy()
-    env["GDAL_DATA"] = "tmp"
-    with open("tmp/LICENSE.TXT", "wt") as f:
-        f.write("fake_license")
-    license_text = subprocess.check_output(
-        [sys.executable, "basic_test_subprocess.py"], env=env
-    ).decode("utf-8")
-    os.unlink("tmp/LICENSE.TXT")
-    assert license_text.startswith("fake_license")
+    if "EMBED_RESOURCE_FILES=YES" in gdal.VersionInfo("BUILD_INFO"):
+        assert len(license_text) > 1000
+
+    if "USE_ONLY_EMBEDDED_RESOURCE_FILES=YES" not in gdal.VersionInfo("BUILD_INFO"):
+        # Use a subprocess to avoid the cached license text
+        env = os.environ.copy()
+        env["GDAL_DATA"] = "tmp"
+        with open("tmp/LICENSE.TXT", "wt") as f:
+            f.write("fake_license")
+        license_text = subprocess.check_output(
+            [sys.executable, "basic_test_subprocess.py"], env=env
+        ).decode("utf-8")
+        os.unlink("tmp/LICENSE.TXT")
+        assert license_text.startswith("fake_license")
 
 
 ###############################################################################
diff --git a/gcore/CMakeLists.txt b/gcore/CMakeLists.txt
index a61970e9e1f5..fd4563e25045 100644
--- a/gcore/CMakeLists.txt
+++ b/gcore/CMakeLists.txt
@@ -112,6 +112,18 @@ if (HAVE_SSSE3_AT_COMPILE_TIME)
     PROPERTY COMPILE_FLAGS ${GDAL_SSSE3_FLAG})
 endif ()
 
+if (EMBED_RESOURCE_FILES)
+    add_library(gcore_resources OBJECT embedded_resources.c)
+    gdal_standard_includes(gcore_resources)
+    set_property(TARGET gcore_resources PROPERTY POSITION_INDEPENDENT_CODE ${GDAL_OBJECT_LIBRARIES_POSITION_INDEPENDENT_CODE})
+    target_compile_definitions(gcore PRIVATE EMBED_RESOURCE_FILES)
+    set_target_properties(gcore_resources PROPERTIES C_STANDARD 23)
+    target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:gcore_resources>)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(gcore PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
+
 target_sources(${GDAL_LIB_TARGET_NAME} PRIVATE $<TARGET_OBJECTS:gcore>)
 
 if (GDAL_USE_JSONC_INTERNAL)
diff --git a/gcore/embedded_resources.c b/gcore/embedded_resources.c
new file mode 100644
index 000000000000..007889152ece
--- /dev/null
+++ b/gcore/embedded_resources.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char szLICENSE[] = {
+#embed "../LICENSE.TXT"
+    , 0};
+
+const char *GDALGetEmbeddedLicense()
+{
+    return szLICENSE;
+}
diff --git a/gcore/embedded_resources.h b/gcore/embedded_resources.h
new file mode 100644
index 000000000000..9fbb7d354421
--- /dev/null
+++ b/gcore/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *GDALGetEmbeddedLicense(void);
+
+CPL_C_END
diff --git a/gcore/gdal_misc.cpp b/gcore/gdal_misc.cpp
index 047a789993ed..dfbf7e7fe7d8 100644
--- a/gcore/gdal_misc.cpp
+++ b/gcore/gdal_misc.cpp
@@ -35,6 +35,9 @@
 #include "cpl_multiproc.h"
 #include "cpl_string.h"
 #include "cpl_vsi.h"
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
 #include "gdal_version_full/gdal_version.h"
 #include "gdal.h"
 #include "gdal_mdreader.h"
@@ -2798,6 +2801,12 @@ const char *CPL_STDCALL GDALVersionInfo(const char *pszRequest)
 #ifdef CMAKE_UNITY_BUILD
         osBuildInfo += "CMAKE_UNITY_BUILD=YES\n";
 #endif
+#ifdef EMBED_RESOURCE_FILES
+        osBuildInfo += "EMBED_RESOURCE_FILES=YES\n";
+#endif
+#ifdef USE_ONLY_EMBEDDED_RESOURCE_FILES
+        osBuildInfo += "USE_ONLY_EMBEDDED_RESOURCE_FILES=YES\n";
+#endif
 
 #undef STRINGIFY_HELPER
 #undef STRINGIFY
@@ -2813,6 +2822,9 @@ const char *CPL_STDCALL GDALVersionInfo(const char *pszRequest)
     /* -------------------------------------------------------------------- */
     if (pszRequest != nullptr && EQUAL(pszRequest, "LICENSE"))
     {
+#if defined(EMBED_RESOURCE_FILES) && defined(USE_ONLY_EMBEDDED_RESOURCE_FILES)
+        return GDALGetEmbeddedLicense();
+#else
         char *pszResultLicence =
             reinterpret_cast<char *>(CPLGetTLS(CTLS_VERSIONINFO_LICENCE));
         if (pszResultLicence != nullptr)
@@ -2820,12 +2832,14 @@ const char *CPL_STDCALL GDALVersionInfo(const char *pszRequest)
             return pszResultLicence;
         }
 
-        const char *pszFilename = CPLFindFile("etc", "LICENSE.TXT");
         VSILFILE *fp = nullptr;
-
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
+#ifdef EMBED_RESOURCE_FILES
+        CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
+        const char *pszFilename = CPLFindFile("etc", "LICENSE.TXT");
         if (pszFilename != nullptr)
             fp = VSIFOpenL(pszFilename, "r");
-
         if (fp != nullptr)
         {
             if (VSIFSeekL(fp, 0, SEEK_END) == 0)
@@ -2845,6 +2859,14 @@ const char *CPL_STDCALL GDALVersionInfo(const char *pszRequest)
 
             CPL_IGNORE_RET_VAL(VSIFCloseL(fp));
         }
+#endif
+
+#ifdef EMBED_RESOURCE_FILES
+        if (!fp)
+        {
+            return GDALGetEmbeddedLicense();
+        }
+#endif
 
         if (!pszResultLicence)
         {
@@ -2856,6 +2878,7 @@ const char *CPL_STDCALL GDALVersionInfo(const char *pszRequest)
 
         CPLSetTLS(CTLS_VERSIONINFO_LICENCE, pszResultLicence, TRUE);
         return pszResultLicence;
+#endif
     }
 
     /* -------------------------------------------------------------------- */

From d6aa5e7dabfeeea720ba00506a809be36e7513f8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Oct 2024 17:49:27 +0200
Subject: [PATCH 07/87] NITF: embed nitf_spec.xml if EMBED_RESOURCE_FILES

---
 frmts/nitf/CMakeLists.txt       | 18 +++++--
 frmts/nitf/embedded_resources.c | 31 ++++++++++++
 frmts/nitf/embedded_resources.h | 12 +++++
 frmts/nitf/nitfdataset.cpp      | 89 ++++++++++++++++++++++++++++++++-
 frmts/nitf/nitffile.c           | 22 ++++++++
 5 files changed, 167 insertions(+), 5 deletions(-)
 create mode 100644 frmts/nitf/embedded_resources.c
 create mode 100644 frmts/nitf/embedded_resources.h

diff --git a/frmts/nitf/CMakeLists.txt b/frmts/nitf/CMakeLists.txt
index 9bed18a5a221..c287ea015eb8 100644
--- a/frmts/nitf/CMakeLists.txt
+++ b/frmts/nitf/CMakeLists.txt
@@ -21,11 +21,16 @@ add_gdal_driver(
 )
 
 set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/nitf_spec.xml
     ${CMAKE_CURRENT_SOURCE_DIR}/data/nitf_spec.xsd
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/gt_datum.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/gt_ellips.csv
 )
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    list(APPEND GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/nitf_spec.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/gt_datum.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/gt_ellips.csv
+    )
+endif()
+
 set_property(
   TARGET ${GDAL_LIB_TARGET_NAME}
   APPEND
@@ -51,6 +56,13 @@ if (GDAL_ENABLE_DRIVER_GTIFF)
   target_compile_definitions(gdal_NITF PRIVATE -DHAVE_TIFF)
 endif()
 
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(gdal_NITF GDAL_ENABLE_DRIVER_NITF_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(gdal_NITF PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
+
 if (GDAL_USE_TIFF_INTERNAL)
   gdal_add_vendored_lib(gdal_NITF libtiff)
 endif()
diff --git a/frmts/nitf/embedded_resources.c b/frmts/nitf/embedded_resources.c
new file mode 100644
index 000000000000..59353f4c2347
--- /dev/null
+++ b/frmts/nitf/embedded_resources.c
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char szSpecFile[] = {
+#embed "data/nitf_spec.xml"
+    , 0};
+
+const char *NITFGetSpecFile()
+{
+    return szSpecFile;
+}
+
+static const char szGTDatum[] = {
+#embed "data/gt_datum.csv"
+    , 0};
+
+const char *NITFGetGTDatum()
+{
+    return szGTDatum;
+}
+
+static const char szGTEllips[] = {
+#embed "data/gt_ellips.csv"
+    , 0};
+
+const char *NITFGetGTEllips()
+{
+    return szGTEllips;
+}
diff --git a/frmts/nitf/embedded_resources.h b/frmts/nitf/embedded_resources.h
new file mode 100644
index 000000000000..916901c50768
--- /dev/null
+++ b/frmts/nitf/embedded_resources.h
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *NITFGetSpecFile(void);
+const char *NITFGetGTDatum(void);
+const char *NITFGetGTEllips(void);
+
+CPL_C_END
diff --git a/frmts/nitf/nitfdataset.cpp b/frmts/nitf/nitfdataset.cpp
index 3a18bb50aefb..9974cd258c43 100644
--- a/frmts/nitf/nitfdataset.cpp
+++ b/frmts/nitf/nitfdataset.cpp
@@ -46,6 +46,10 @@
 #include "ogr_core.h"
 #include "ogr_srs_api.h"
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 static bool NITFPatchImageLength(const char *pszFilename, int nIMIndex,
                                  GUIntBig nImageOffset, GIntBig nPixelCount,
                                  const char *pszIC, vsi_l_offset nICOffset,
@@ -1770,12 +1774,37 @@ static OGRErr LoadDODDatum(OGRSpatialReference *poSRS, const char *pszDatumName)
         return OGRERR_NONE;
     }
 
+#if defined(USE_ONLY_EMBEDDED_RESOURCE_FILES) && !defined(EMBED_RESOURCE_FILES)
+    return OGRERR_FAILURE;
+#else
+
     /* -------------------------------------------------------------------- */
     /*      All the rest we will try and load from gt_datum.csv             */
     /*      (Geotrans datum file).                                          */
     /* -------------------------------------------------------------------- */
     char szExpanded[6];
-    const char *pszGTDatum = CSVFilename("gt_datum.csv");
+    const char *pszGTDatum = nullptr;
+    CPL_IGNORE_RET_VAL(pszGTDatum);
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
+    pszGTDatum = CSVFilename("gt_datum.csv");
+#endif
+#ifdef EMBED_RESOURCE_FILES
+    std::string osTmpFilename;
+    // CSVFilename() returns the same content as pszFilename if it does not
+    // find the file.
+    if (!pszGTDatum || strcmp(pszGTDatum, "gt_datum.csv") == 0)
+    {
+        osTmpFilename = VSIMemGenerateHiddenFilename("gt_datum.csv");
+        const char *pszFileContent = NITFGetGTDatum();
+        VSIFCloseL(VSIFileFromMemBuffer(
+            osTmpFilename.c_str(),
+            const_cast<GByte *>(
+                reinterpret_cast<const GByte *>(pszFileContent)),
+            static_cast<int>(strlen(pszFileContent)),
+            /* bTakeOwnership = */ false));
+        pszGTDatum = osTmpFilename.c_str();
+    }
+#endif
 
     strncpy(szExpanded, pszDatumName, 3);
     szExpanded[3] = '\0';
@@ -1795,6 +1824,14 @@ static OGRErr LoadDODDatum(OGRSpatialReference *poSRS, const char *pszDatumName)
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Failed to find datum %s/%s in gt_datum.csv.", pszDatumName,
                  szExpanded);
+
+#ifdef EMBED_RESOURCE_FILES
+        if (!osTmpFilename.empty())
+        {
+            CSVDeaccess(osTmpFilename.c_str());
+            VSIUnlink(osTmpFilename.c_str());
+        }
+#endif
         return OGRERR_FAILURE;
     }
 
@@ -1807,10 +1844,40 @@ static OGRErr LoadDODDatum(OGRSpatialReference *poSRS, const char *pszDatumName)
     double dfDeltaZ = CPLAtof(
         CSVGetField(pszGTDatum, "CODE", szExpanded, CC_ApproxString, "DELTAZ"));
 
+#ifdef EMBED_RESOURCE_FILES
+    if (!osTmpFilename.empty())
+    {
+        CSVDeaccess(osTmpFilename.c_str());
+        VSIUnlink(osTmpFilename.c_str());
+        osTmpFilename.clear();
+    }
+#endif
+
     /* -------------------------------------------------------------------- */
     /*      Lookup the ellipse code.                                        */
     /* -------------------------------------------------------------------- */
-    const char *pszGTEllipse = CSVFilename("gt_ellips.csv");
+    const char *pszGTEllipse = nullptr;
+    CPL_IGNORE_RET_VAL(pszGTEllipse);
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
+    pszGTEllipse = CSVFilename("gt_ellips.csv");
+#endif
+
+#ifdef EMBED_RESOURCE_FILES
+    // CSVFilename() returns the same content as pszFilename if it does not
+    // find the file.
+    if (!pszGTEllipse || strcmp(pszGTEllipse, "gt_ellips.csv") == 0)
+    {
+        osTmpFilename = VSIMemGenerateHiddenFilename("gt_ellips");
+        const char *pszFileContent = NITFGetGTEllips();
+        VSIFCloseL(VSIFileFromMemBuffer(
+            osTmpFilename.c_str(),
+            const_cast<GByte *>(
+                reinterpret_cast<const GByte *>(pszFileContent)),
+            static_cast<int>(strlen(pszFileContent)),
+            /* bTakeOwnership = */ false));
+        pszGTEllipse = osTmpFilename.c_str();
+    }
+#endif
 
     CPLString osEName = CSVGetField(pszGTEllipse, "CODE", osEllipseCode,
                                     CC_ApproxString, "NAME");
@@ -1820,6 +1887,14 @@ static OGRErr LoadDODDatum(OGRSpatialReference *poSRS, const char *pszDatumName)
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Failed to find datum %s in gt_ellips.csv.",
                  osEllipseCode.c_str());
+
+#ifdef EMBED_RESOURCE_FILES
+        if (!osTmpFilename.empty())
+        {
+            CSVDeaccess(osTmpFilename.c_str());
+            VSIUnlink(osTmpFilename.c_str());
+        }
+#endif
         return OGRERR_FAILURE;
     }
 
@@ -1835,7 +1910,17 @@ static OGRErr LoadDODDatum(OGRSpatialReference *poSRS, const char *pszDatumName)
 
     poSRS->SetTOWGS84(dfDeltaX, dfDeltaY, dfDeltaZ);
 
+#ifdef EMBED_RESOURCE_FILES
+    if (!osTmpFilename.empty())
+    {
+        CSVDeaccess(osTmpFilename.c_str());
+        VSIUnlink(osTmpFilename.c_str());
+        osTmpFilename.clear();
+    }
+#endif
+
     return OGRERR_NONE;
+#endif
 }
 
 /************************************************************************/
diff --git a/frmts/nitf/nitffile.c b/frmts/nitf/nitffile.c
index 40753c1d55af..1f7e79a2b2bc 100644
--- a/frmts/nitf/nitffile.c
+++ b/frmts/nitf/nitffile.c
@@ -19,6 +19,10 @@
 #include "cpl_string.h"
 #include <stdbool.h>
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 #ifndef CPL_IGNORE_RET_VAL_INT_defined
 #define CPL_IGNORE_RET_VAL_INT_defined
 
@@ -3283,18 +3287,36 @@ static CPLXMLNode *NITFLoadXMLSpec(NITFFile *psFile)
 
     if (psFile->psNITFSpecNode == NULL)
     {
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
+#ifdef EMBED_RESOURCE_FILES
+        CPLPushErrorHandler(CPLQuietErrorHandler);
+#endif
         const char *pszXMLDescFilename = CPLFindFile("gdal", NITF_SPEC_FILE);
+#ifdef EMBED_RESOURCE_FILES
+        CPLPopErrorHandler();
+        CPLErrorReset();
+#endif
         if (pszXMLDescFilename == NULL)
+#endif
         {
+#ifdef EMBED_RESOURCE_FILES
+            CPLDebug("NITF", "Using embedded %s", NITF_SPEC_FILE);
+            psFile->psNITFSpecNode = CPLParseXMLString(NITFGetSpecFile());
+            CPLAssert(psFile->psNITFSpecNode);
+            return psFile->psNITFSpecNode;
+#else
             CPLDebug("NITF", "Cannot find XML file : %s", NITF_SPEC_FILE);
             return NULL;
+#endif
         }
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
         psFile->psNITFSpecNode = CPLParseXMLFile(pszXMLDescFilename);
         if (psFile->psNITFSpecNode == NULL)
         {
             CPLDebug("NITF", "Invalid XML file : %s", pszXMLDescFilename);
             return NULL;
         }
+#endif
     }
 
     return psFile->psNITFSpecNode;

From aefb77cf91fba8def9655e33ce47ee72c94509a9 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Oct 2024 17:49:27 +0200
Subject: [PATCH 08/87] PDF: embed pdfcomposition.xsd if EMBED_RESOURCE_FILES

---
 frmts/pdf/CMakeLists.txt               | 23 +++++++++++-----
 frmts/pdf/embedded_resources.c         | 13 ++++++++++
 frmts/pdf/embedded_resources.h         | 10 +++++++
 frmts/pdf/pdfcreatefromcomposition.cpp | 36 ++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 7 deletions(-)
 create mode 100644 frmts/pdf/embedded_resources.c
 create mode 100644 frmts/pdf/embedded_resources.h

diff --git a/frmts/pdf/CMakeLists.txt b/frmts/pdf/CMakeLists.txt
index 587b8bbc5ae3..a8f8890afb0f 100644
--- a/frmts/pdf/CMakeLists.txt
+++ b/frmts/pdf/CMakeLists.txt
@@ -35,13 +35,15 @@ if(TARGET gdal_PDF_core)
     endif ()
 endif()
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/pdfcomposition.xsd
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/pdfcomposition.xsd
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
 
 if(NOT TARGET gdal_PDF)
     return()
@@ -51,6 +53,13 @@ gdal_standard_includes(gdal_PDF)
 target_include_directories(gdal_PDF PRIVATE ${GDAL_RASTER_FORMAT_SOURCE_DIR}/vrt ${GDAL_RASTER_FORMAT_SOURCE_DIR}/mem
                                             ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/mem)
 
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(gdal_PDF GDAL_ENABLE_DRIVER_PDF_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(gdal_PDF PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
+
 if (GDAL_USE_POPPLER)
   gdal_target_link_libraries(gdal_PDF PRIVATE Poppler::Poppler)
   string(REGEX REPLACE "([0-9]+)\\.([0-9]+).*" "\\1" Poppler_VERSION_MAJOR ${Poppler_VERSION_STRING})
diff --git a/frmts/pdf/embedded_resources.c b/frmts/pdf/embedded_resources.c
new file mode 100644
index 000000000000..84562057b1a0
--- /dev/null
+++ b/frmts/pdf/embedded_resources.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char szCompositionXSD[] = {
+#embed "data/pdfcomposition.xsd"
+    , 0};
+
+const char *PDFGetCompositionXSD()
+{
+    return szCompositionXSD;
+}
diff --git a/frmts/pdf/embedded_resources.h b/frmts/pdf/embedded_resources.h
new file mode 100644
index 000000000000..4034ba7d2abe
--- /dev/null
+++ b/frmts/pdf/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *PDFGetCompositionXSD(void);
+
+CPL_C_END
diff --git a/frmts/pdf/pdfcreatefromcomposition.cpp b/frmts/pdf/pdfcreatefromcomposition.cpp
index 6b6144d8d95e..8588a90a119d 100644
--- a/frmts/pdf/pdfcreatefromcomposition.cpp
+++ b/frmts/pdf/pdfcreatefromcomposition.cpp
@@ -24,6 +24,10 @@
 #include "cpl_vsi_virtual.h"
 #include "ogr_geometry.h"
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 /************************************************************************/
 /*                         GDALPDFComposerWriter()                      */
 /************************************************************************/
@@ -2434,8 +2438,35 @@ GDALDataset *GDALPDFCreateFromCompositionFile(const char *pszPDFFilename,
     // XML Validation.
     if (CPLTestBool(CPLGetConfigOption("GDAL_XML_VALIDATION", "YES")))
     {
+#ifdef EMBED_RESOURCE_FILES
+        std::string osTmpFilename;
+        CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
+#ifdef USE_ONLY_EMBEDDED_RESOURCE_FILES
+        const char *pszXSD = nullptr;
+#else
         const char *pszXSD = CPLFindFile("gdal", "pdfcomposition.xsd");
+#endif
+#ifdef EMBED_RESOURCE_FILES
+        if (!pszXSD)
+        {
+            static const bool bOnce [[maybe_unused]] = []()
+            {
+                CPLDebug("PDF", "Using embedded pdfcomposition.xsd");
+                return true;
+            }();
+            osTmpFilename = VSIMemGenerateHiddenFilename("pdfcomposition.xsd");
+            pszXSD = osTmpFilename.c_str();
+            VSIFCloseL(VSIFileFromMemBuffer(
+                osTmpFilename.c_str(),
+                const_cast<GByte *>(
+                    reinterpret_cast<const GByte *>(PDFGetCompositionXSD())),
+                static_cast<int>(strlen(PDFGetCompositionXSD())),
+                /* bTakeOwnership = */ false));
+        }
+#else
         if (pszXSD != nullptr)
+#endif
         {
             std::vector<CPLString> aosErrors;
             CPLPushErrorHandlerEx(GDALPDFErrorHandler, &aosErrors);
@@ -2456,6 +2487,11 @@ GDALDataset *GDALPDFCreateFromCompositionFile(const char *pszPDFFilename,
             }
             CPLErrorReset();
         }
+
+#ifdef EMBED_RESOURCE_FILES
+        if (!osTmpFilename.empty())
+            VSIUnlink(osTmpFilename.c_str());
+#endif
     }
 
     /* -------------------------------------------------------------------- */

From 210935766e36ae624d4ed08287915a8f253bb793 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Oct 2024 17:49:28 +0200
Subject: [PATCH 09/87] DXF: embed header.dxf and trailer.dxf if
 EMBED_RESOURCE_FILES

---
 ogr/ogrsf_frmts/dxf/CMakeLists.txt       | 25 +++++++----
 ogr/ogrsf_frmts/dxf/embedded_resources.c | 22 +++++++++
 ogr/ogrsf_frmts/dxf/embedded_resources.h | 11 +++++
 ogr/ogrsf_frmts/dxf/ogr_dxf.h            |  3 ++
 ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp   | 57 ++++++++++++++++++++++++
 5 files changed, 110 insertions(+), 8 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/dxf/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/dxf/embedded_resources.h

diff --git a/ogr/ogrsf_frmts/dxf/CMakeLists.txt b/ogr/ogrsf_frmts/dxf/CMakeLists.txt
index ff6572f1a0db..ca57b9df4ae8 100644
--- a/ogr/ogrsf_frmts/dxf/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/dxf/CMakeLists.txt
@@ -24,11 +24,20 @@ add_gdal_driver(
   BUILTIN)
 gdal_standard_includes(ogr_DXF)
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/header.dxf
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/trailer.dxf
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/header.dxf
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/trailer.dxf
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_DXF OGR_ENABLE_DRIVER_DXF_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_DXF PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
diff --git a/ogr/ogrsf_frmts/dxf/embedded_resources.c b/ogr/ogrsf_frmts/dxf/embedded_resources.c
new file mode 100644
index 000000000000..200ea1eb6833
--- /dev/null
+++ b/ogr/ogrsf_frmts/dxf/embedded_resources.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char szHEADER[] = {
+#embed "data/header.dxf"
+    , 0};
+
+const char *OGRDXFGetHEADER()
+{
+    return szHEADER;
+}
+
+static const char szTRAILER[] = {
+#embed "data/trailer.dxf"
+    , 0};
+
+const char *OGRDXFGetTRAILER()
+{
+    return szTRAILER;
+}
diff --git a/ogr/ogrsf_frmts/dxf/embedded_resources.h b/ogr/ogrsf_frmts/dxf/embedded_resources.h
new file mode 100644
index 000000000000..fac0526b012c
--- /dev/null
+++ b/ogr/ogrsf_frmts/dxf/embedded_resources.h
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *OGRDXFGetHEADER(void);
+const char *OGRDXFGetTRAILER(void);
+
+CPL_C_END
diff --git a/ogr/ogrsf_frmts/dxf/ogr_dxf.h b/ogr/ogrsf_frmts/dxf/ogr_dxf.h
index 5fd9cf5e7e9f..0e9e2ef12e2d 100644
--- a/ogr/ogrsf_frmts/dxf/ogr_dxf.h
+++ b/ogr/ogrsf_frmts/dxf/ogr_dxf.h
@@ -954,6 +954,9 @@ class OGRDXFWriterDS final : public GDALDataset
 
     OGREnvelope oGlobalEnvelope;
 
+    bool m_bHeaderFileIsTemp = false;
+    bool m_bTrailerFileIsTemp = false;
+
   public:
     OGRDXFWriterDS();
     ~OGRDXFWriterDS();
diff --git a/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp b/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp
index 7db9da389420..27d2ac5d8e8a 100644
--- a/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp
+++ b/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp
@@ -22,6 +22,10 @@
 #include "cpl_string.h"
 #include "cpl_vsi_error.h"
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 /************************************************************************/
 /*                          OGRDXFWriterDS()                          */
 /************************************************************************/
@@ -118,6 +122,11 @@ OGRDXFWriterDS::~OGRDXFWriterDS()
     delete poBlocksLayer;
 
     CSLDestroy(papszLayersToCreate);
+
+    if (m_bHeaderFileIsTemp)
+        VSIUnlink(osHeaderFile.c_str());
+    if (m_bTrailerFileIsTemp)
+        VSIUnlink(osTrailerFile.c_str());
 }
 
 /************************************************************************/
@@ -175,13 +184,36 @@ int OGRDXFWriterDS::Open(const char *pszFilename, char **papszOptions)
         osHeaderFile = CSLFetchNameValue(papszOptions, "HEADER");
     else
     {
+#ifdef EMBED_RESOURCE_FILES
+        CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
+#ifdef USE_ONLY_EMBEDDED_RESOURCE_FILES
+        const char *pszValue = nullptr;
+#else
         const char *pszValue = CPLFindFile("gdal", "header.dxf");
         if (pszValue == nullptr)
+#endif
         {
+#ifdef EMBED_RESOURCE_FILES
+            static const bool bOnce [[maybe_unused]] = []()
+            {
+                CPLDebug("DXF", "Using embedded header.dxf");
+                return true;
+            }();
+            pszValue = VSIMemGenerateHiddenFilename("header.dxf");
+            VSIFCloseL(VSIFileFromMemBuffer(
+                pszValue,
+                const_cast<GByte *>(
+                    reinterpret_cast<const GByte *>(OGRDXFGetHEADER())),
+                static_cast<int>(strlen(OGRDXFGetHEADER())),
+                /* bTakeOwnership = */ false));
+            m_bHeaderFileIsTemp = true;
+#else
             CPLError(CE_Failure, CPLE_OpenFailed,
                      "Failed to find template header file header.dxf for "
                      "reading,\nis GDAL_DATA set properly?");
             return FALSE;
+#endif
         }
         osHeaderFile = pszValue;
     }
@@ -193,9 +225,34 @@ int OGRDXFWriterDS::Open(const char *pszFilename, char **papszOptions)
         osTrailerFile = CSLFetchNameValue(papszOptions, "TRAILER");
     else
     {
+#ifdef EMBED_RESOURCE_FILES
+        CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
+#ifdef USE_ONLY_EMBEDDED_RESOURCE_FILES
+        const char *pszValue = nullptr;
+#else
         const char *pszValue = CPLFindFile("gdal", "trailer.dxf");
         if (pszValue != nullptr)
             osTrailerFile = pszValue;
+#endif
+#ifdef EMBED_RESOURCE_FILES
+        if (!pszValue)
+        {
+            static const bool bOnce [[maybe_unused]] = []()
+            {
+                CPLDebug("DXF", "Using embedded trailer.dxf");
+                return true;
+            }();
+            osTrailerFile = VSIMemGenerateHiddenFilename("trailer.dxf");
+            m_bTrailerFileIsTemp = false;
+            VSIFCloseL(VSIFileFromMemBuffer(
+                osTrailerFile.c_str(),
+                const_cast<GByte *>(
+                    reinterpret_cast<const GByte *>(OGRDXFGetTRAILER())),
+                static_cast<int>(strlen(OGRDXFGetTRAILER())),
+                /* bTakeOwnership = */ false));
+        }
+#endif
     }
 
 /* -------------------------------------------------------------------- */

From 98e2d169afa619f492241965a34c7fb9c0866528 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Oct 2024 17:49:29 +0200
Subject: [PATCH 10/87] BAG: embed bag_template.xml if EMBED_RESOURCE_FILES

---
 frmts/hdf5/CMakeLists.txt       | 23 ++++++++++++++++-------
 frmts/hdf5/bagdataset.cpp       | 25 ++++++++++++++++++++++++-
 frmts/hdf5/embedded_resources.c | 13 +++++++++++++
 frmts/hdf5/embedded_resources.h | 10 ++++++++++
 4 files changed, 63 insertions(+), 8 deletions(-)
 create mode 100644 frmts/hdf5/embedded_resources.c
 create mode 100644 frmts/hdf5/embedded_resources.h

diff --git a/frmts/hdf5/CMakeLists.txt b/frmts/hdf5/CMakeLists.txt
index 284ae9c8d148..5079f0e45919 100644
--- a/frmts/hdf5/CMakeLists.txt
+++ b/frmts/hdf5/CMakeLists.txt
@@ -24,18 +24,27 @@ add_gdal_driver(TARGET gdal_HDF5
                 PLUGIN_CAPABLE
                 NO_SHARED_SYMBOL_WITH_CORE)
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/bag_template.xml
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/bag_template.xml
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
 
 if(NOT TARGET gdal_HDF5)
     return()
 endif()
 
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(gdal_HDF5 GDAL_ENABLE_DRIVER_HDF5_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(gdal_HDF5 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
+
 # Try to detect if libhdf5 has thread-safety enabled
 if(NOT DEFINED GDAL_ENABLE_HDF5_GLOBAL_LOCK AND UNIX AND
    (HDF5_C_LIBRARIES MATCHES ".so" OR HDF5_C_LIBRARIES MATCHES ".dylib"))
diff --git a/frmts/hdf5/bagdataset.cpp b/frmts/hdf5/bagdataset.cpp
index acabb44bbe41..4f60f6795010 100644
--- a/frmts/hdf5/bagdataset.cpp
+++ b/frmts/hdf5/bagdataset.cpp
@@ -30,6 +30,10 @@
 #include "ogrsf_frmts.h"
 #include "rat.h"
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 #include <cassert>
 #include <cmath>
 #include <algorithm>
@@ -5203,16 +5207,35 @@ CPLString BAGCreator::GenerateMetadata(int nXSize, int nYSize,
     }
     else
     {
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
+#ifdef EMBED_RESOURCE_FILES
+        CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
         const char *pszDefaultTemplateFilename =
             CPLFindFile("gdal", "bag_template.xml");
         if (pszDefaultTemplateFilename == nullptr)
+#endif
         {
+#ifdef EMBED_RESOURCE_FILES
+            static const bool bOnce [[maybe_unused]] = []()
+            {
+                CPLDebug("BAG", "Using embedded bag_template.xml");
+                return true;
+            }();
+            psRoot = CPLParseXMLString(BAGGetEmbeddedTemplateFile());
+#else
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Cannot find bag_template.xml and TEMPLATE "
                      "creation option not specified");
             return CPLString();
+#endif
         }
-        psRoot = CPLParseXMLFile(pszDefaultTemplateFilename);
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
+        else
+        {
+            psRoot = CPLParseXMLFile(pszDefaultTemplateFilename);
+        }
+#endif
     }
     if (psRoot == nullptr)
         return CPLString();
diff --git a/frmts/hdf5/embedded_resources.c b/frmts/hdf5/embedded_resources.c
new file mode 100644
index 000000000000..daec4e19e494
--- /dev/null
+++ b/frmts/hdf5/embedded_resources.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char szBAGTemplate[] = {
+#embed "data/bag_template.xml"
+    , 0};
+
+const char *BAGGetEmbeddedTemplateFile()
+{
+    return szBAGTemplate;
+}
diff --git a/frmts/hdf5/embedded_resources.h b/frmts/hdf5/embedded_resources.h
new file mode 100644
index 000000000000..5c2414a15977
--- /dev/null
+++ b/frmts/hdf5/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *BAGGetEmbeddedTemplateFile(void);
+
+CPL_C_END

From 0482c9f35502b2b2dc3a99ae45699244e8087f07 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Oct 2024 17:49:29 +0200
Subject: [PATCH 11/87] GRIB: embed CSV files if EMBED_RESOURCE_FILES

---
 frmts/grib/CMakeLists.txt                     | 151 ++++----
 frmts/grib/degrib/degrib/embedded_resources.c |  23 ++
 frmts/grib/degrib/degrib/embedded_resources.h |  10 +
 .../degrib/degrib/embedded_resources_gen1.c   | 326 ++++++++++++++++++
 .../degrib/degrib/embedded_resources_gen2.c   |  66 ++++
 frmts/grib/degrib/degrib/metaname.cpp         |  60 +++-
 frmts/grib/degrib/degrib/metaname.h           |   2 +
 .../degrib/generate_embedded_resources.py     |  37 ++
 frmts/grib/gribdataset.cpp                    |   1 +
 9 files changed, 603 insertions(+), 73 deletions(-)
 create mode 100644 frmts/grib/degrib/degrib/embedded_resources.c
 create mode 100644 frmts/grib/degrib/degrib/embedded_resources.h
 create mode 100644 frmts/grib/degrib/degrib/embedded_resources_gen1.c
 create mode 100644 frmts/grib/degrib/degrib/embedded_resources_gen2.c
 create mode 100755 frmts/grib/degrib/generate_embedded_resources.py

diff --git a/frmts/grib/CMakeLists.txt b/frmts/grib/CMakeLists.txt
index 01f58c263e0a..b047f95ccfde 100644
--- a/frmts/grib/CMakeLists.txt
+++ b/frmts/grib/CMakeLists.txt
@@ -59,77 +59,86 @@ endif()
 
 gdal_standard_includes(gdal_GRIB)
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_versions.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_center.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_process.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_subcenter.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_0.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_13.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_14.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_15.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_16.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_17.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_18.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_190.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_191.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_19.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_1.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_20.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_21.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_2.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_3.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_4.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_5.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_6.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_7.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_0.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_191.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_1.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_2.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_3.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_4.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_1_0.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_1_1.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_1_2.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_20_0.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_20_1.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_20_2.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_0.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_3.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_4.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_5.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_6.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_0.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_1.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_2.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_3.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_4.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_5.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_6.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_0.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_10.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_1.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_2.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_3.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_4.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_5.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_6.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_7.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_8.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_9.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_Canada.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_HPC.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_index.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_MRMS.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_NCEP.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_NDFD.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_5.csv
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_versions.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_center.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_process.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_subcenter.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_0.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_13.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_14.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_15.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_16.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_17.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_18.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_190.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_191.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_19.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_1.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_20.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_21.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_2.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_3.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_4.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_5.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_6.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_0_7.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_0.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_191.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_1.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_2.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_3.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_10_4.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_1_0.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_1_1.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_1_2.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_20_0.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_20_1.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_20_2.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_0.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_3.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_4.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_5.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_2_6.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_0.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_1.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_2.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_3.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_4.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_5.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_3_6.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_0.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_10.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_1.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_2.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_3.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_4.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_5.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_6.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_7.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_8.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_4_9.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_Canada.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_HPC.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_index.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_MRMS.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_NCEP.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_2_local_NDFD.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/grib2_table_4_5.csv
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(gdal_GRIB GDAL_ENABLE_DRIVER_GRIB_PLUGIN degrib/degrib/embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(gdal_GRIB PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
 
 target_include_directories(
   gdal_GRIB PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/degrib/degrib>
diff --git a/frmts/grib/degrib/degrib/embedded_resources.c b/frmts/grib/degrib/degrib/embedded_resources.c
new file mode 100644
index 000000000000..fe986e0f0558
--- /dev/null
+++ b/frmts/grib/degrib/degrib/embedded_resources.c
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+#include "embedded_resources_gen1.c"
+
+const char *GRIBGetCSVFileContent(const char* pszFilename)
+{
+    static const struct
+    {
+        const char* pszFilename;
+        const char* pszContent;
+    } asResources[] = {
+#include "embedded_resources_gen2.c"
+    };
+    for( size_t i = 0; i < sizeof(asResources) / sizeof(asResources[0]); ++i )
+    {
+        if( strcmp(pszFilename, asResources[i].pszFilename) == 0 )
+            return asResources[i].pszContent;
+    }
+    return NULL;
+}
diff --git a/frmts/grib/degrib/degrib/embedded_resources.h b/frmts/grib/degrib/degrib/embedded_resources.h
new file mode 100644
index 000000000000..2ec6d8a778fd
--- /dev/null
+++ b/frmts/grib/degrib/degrib/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *GRIBGetCSVFileContent(const char* pszFilename);
+
+CPL_C_END
diff --git a/frmts/grib/degrib/degrib/embedded_resources_gen1.c b/frmts/grib/degrib/degrib/embedded_resources_gen1.c
new file mode 100644
index 000000000000..cb854bede085
--- /dev/null
+++ b/frmts/grib/degrib/degrib/embedded_resources_gen1.c
@@ -0,0 +1,326 @@
+// File generated by generate_embedded_resources.py. DO NOT EDIT
+
+static const char grib2_center_csv [] = {
+    #embed "../../data/grib2_center.csv"
+            , 0
+};
+
+static const char grib2_process_csv [] = {
+    #embed "../../data/grib2_process.csv"
+            , 0
+};
+
+static const char grib2_subcenter_csv [] = {
+    #embed "../../data/grib2_subcenter.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_0_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_0.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_1_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_1.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_13_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_13.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_14_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_14.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_15_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_15.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_16_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_16.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_17_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_17.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_18_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_18.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_19_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_19.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_190_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_190.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_191_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_191.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_2_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_2.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_20_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_20.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_21_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_21.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_3_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_3.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_4_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_4.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_5_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_5.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_6_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_6.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_0_7_csv [] = {
+    #embed "../../data/grib2_table_4_2_0_7.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_10_0_csv [] = {
+    #embed "../../data/grib2_table_4_2_10_0.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_10_1_csv [] = {
+    #embed "../../data/grib2_table_4_2_10_1.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_10_191_csv [] = {
+    #embed "../../data/grib2_table_4_2_10_191.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_10_2_csv [] = {
+    #embed "../../data/grib2_table_4_2_10_2.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_10_3_csv [] = {
+    #embed "../../data/grib2_table_4_2_10_3.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_10_4_csv [] = {
+    #embed "../../data/grib2_table_4_2_10_4.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_1_0_csv [] = {
+    #embed "../../data/grib2_table_4_2_1_0.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_1_1_csv [] = {
+    #embed "../../data/grib2_table_4_2_1_1.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_1_2_csv [] = {
+    #embed "../../data/grib2_table_4_2_1_2.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_20_0_csv [] = {
+    #embed "../../data/grib2_table_4_2_20_0.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_20_1_csv [] = {
+    #embed "../../data/grib2_table_4_2_20_1.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_20_2_csv [] = {
+    #embed "../../data/grib2_table_4_2_20_2.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_2_0_csv [] = {
+    #embed "../../data/grib2_table_4_2_2_0.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_2_3_csv [] = {
+    #embed "../../data/grib2_table_4_2_2_3.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_2_4_csv [] = {
+    #embed "../../data/grib2_table_4_2_2_4.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_2_5_csv [] = {
+    #embed "../../data/grib2_table_4_2_2_5.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_2_6_csv [] = {
+    #embed "../../data/grib2_table_4_2_2_6.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_3_0_csv [] = {
+    #embed "../../data/grib2_table_4_2_3_0.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_3_1_csv [] = {
+    #embed "../../data/grib2_table_4_2_3_1.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_3_2_csv [] = {
+    #embed "../../data/grib2_table_4_2_3_2.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_3_3_csv [] = {
+    #embed "../../data/grib2_table_4_2_3_3.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_3_4_csv [] = {
+    #embed "../../data/grib2_table_4_2_3_4.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_3_5_csv [] = {
+    #embed "../../data/grib2_table_4_2_3_5.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_3_6_csv [] = {
+    #embed "../../data/grib2_table_4_2_3_6.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_0_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_0.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_1_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_1.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_10_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_10.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_2_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_2.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_3_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_3.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_4_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_4.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_5_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_5.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_6_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_6.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_7_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_7.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_8_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_8.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_4_9_csv [] = {
+    #embed "../../data/grib2_table_4_2_4_9.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_local_Canada_csv [] = {
+    #embed "../../data/grib2_table_4_2_local_Canada.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_local_HPC_csv [] = {
+    #embed "../../data/grib2_table_4_2_local_HPC.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_local_MRMS_csv [] = {
+    #embed "../../data/grib2_table_4_2_local_MRMS.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_local_NCEP_csv [] = {
+    #embed "../../data/grib2_table_4_2_local_NCEP.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_local_NDFD_csv [] = {
+    #embed "../../data/grib2_table_4_2_local_NDFD.csv"
+            , 0
+};
+
+static const char grib2_table_4_2_local_index_csv [] = {
+    #embed "../../data/grib2_table_4_2_local_index.csv"
+            , 0
+};
+
+static const char grib2_table_4_5_csv [] = {
+    #embed "../../data/grib2_table_4_5.csv"
+            , 0
+};
+
+static const char grib2_table_versions_csv [] = {
+    #embed "../../data/grib2_table_versions.csv"
+            , 0
+};
diff --git a/frmts/grib/degrib/degrib/embedded_resources_gen2.c b/frmts/grib/degrib/degrib/embedded_resources_gen2.c
new file mode 100644
index 000000000000..c43ff93fb854
--- /dev/null
+++ b/frmts/grib/degrib/degrib/embedded_resources_gen2.c
@@ -0,0 +1,66 @@
+// File generated by generate_embedded_resources.py. DO NOT EDIT
+{ "grib2_center.csv", grib2_center_csv },
+{ "grib2_process.csv", grib2_process_csv },
+{ "grib2_subcenter.csv", grib2_subcenter_csv },
+{ "grib2_table_4_2_0_0.csv", grib2_table_4_2_0_0_csv },
+{ "grib2_table_4_2_0_1.csv", grib2_table_4_2_0_1_csv },
+{ "grib2_table_4_2_0_13.csv", grib2_table_4_2_0_13_csv },
+{ "grib2_table_4_2_0_14.csv", grib2_table_4_2_0_14_csv },
+{ "grib2_table_4_2_0_15.csv", grib2_table_4_2_0_15_csv },
+{ "grib2_table_4_2_0_16.csv", grib2_table_4_2_0_16_csv },
+{ "grib2_table_4_2_0_17.csv", grib2_table_4_2_0_17_csv },
+{ "grib2_table_4_2_0_18.csv", grib2_table_4_2_0_18_csv },
+{ "grib2_table_4_2_0_19.csv", grib2_table_4_2_0_19_csv },
+{ "grib2_table_4_2_0_190.csv", grib2_table_4_2_0_190_csv },
+{ "grib2_table_4_2_0_191.csv", grib2_table_4_2_0_191_csv },
+{ "grib2_table_4_2_0_2.csv", grib2_table_4_2_0_2_csv },
+{ "grib2_table_4_2_0_20.csv", grib2_table_4_2_0_20_csv },
+{ "grib2_table_4_2_0_21.csv", grib2_table_4_2_0_21_csv },
+{ "grib2_table_4_2_0_3.csv", grib2_table_4_2_0_3_csv },
+{ "grib2_table_4_2_0_4.csv", grib2_table_4_2_0_4_csv },
+{ "grib2_table_4_2_0_5.csv", grib2_table_4_2_0_5_csv },
+{ "grib2_table_4_2_0_6.csv", grib2_table_4_2_0_6_csv },
+{ "grib2_table_4_2_0_7.csv", grib2_table_4_2_0_7_csv },
+{ "grib2_table_4_2_10_0.csv", grib2_table_4_2_10_0_csv },
+{ "grib2_table_4_2_10_1.csv", grib2_table_4_2_10_1_csv },
+{ "grib2_table_4_2_10_191.csv", grib2_table_4_2_10_191_csv },
+{ "grib2_table_4_2_10_2.csv", grib2_table_4_2_10_2_csv },
+{ "grib2_table_4_2_10_3.csv", grib2_table_4_2_10_3_csv },
+{ "grib2_table_4_2_10_4.csv", grib2_table_4_2_10_4_csv },
+{ "grib2_table_4_2_1_0.csv", grib2_table_4_2_1_0_csv },
+{ "grib2_table_4_2_1_1.csv", grib2_table_4_2_1_1_csv },
+{ "grib2_table_4_2_1_2.csv", grib2_table_4_2_1_2_csv },
+{ "grib2_table_4_2_20_0.csv", grib2_table_4_2_20_0_csv },
+{ "grib2_table_4_2_20_1.csv", grib2_table_4_2_20_1_csv },
+{ "grib2_table_4_2_20_2.csv", grib2_table_4_2_20_2_csv },
+{ "grib2_table_4_2_2_0.csv", grib2_table_4_2_2_0_csv },
+{ "grib2_table_4_2_2_3.csv", grib2_table_4_2_2_3_csv },
+{ "grib2_table_4_2_2_4.csv", grib2_table_4_2_2_4_csv },
+{ "grib2_table_4_2_2_5.csv", grib2_table_4_2_2_5_csv },
+{ "grib2_table_4_2_2_6.csv", grib2_table_4_2_2_6_csv },
+{ "grib2_table_4_2_3_0.csv", grib2_table_4_2_3_0_csv },
+{ "grib2_table_4_2_3_1.csv", grib2_table_4_2_3_1_csv },
+{ "grib2_table_4_2_3_2.csv", grib2_table_4_2_3_2_csv },
+{ "grib2_table_4_2_3_3.csv", grib2_table_4_2_3_3_csv },
+{ "grib2_table_4_2_3_4.csv", grib2_table_4_2_3_4_csv },
+{ "grib2_table_4_2_3_5.csv", grib2_table_4_2_3_5_csv },
+{ "grib2_table_4_2_3_6.csv", grib2_table_4_2_3_6_csv },
+{ "grib2_table_4_2_4_0.csv", grib2_table_4_2_4_0_csv },
+{ "grib2_table_4_2_4_1.csv", grib2_table_4_2_4_1_csv },
+{ "grib2_table_4_2_4_10.csv", grib2_table_4_2_4_10_csv },
+{ "grib2_table_4_2_4_2.csv", grib2_table_4_2_4_2_csv },
+{ "grib2_table_4_2_4_3.csv", grib2_table_4_2_4_3_csv },
+{ "grib2_table_4_2_4_4.csv", grib2_table_4_2_4_4_csv },
+{ "grib2_table_4_2_4_5.csv", grib2_table_4_2_4_5_csv },
+{ "grib2_table_4_2_4_6.csv", grib2_table_4_2_4_6_csv },
+{ "grib2_table_4_2_4_7.csv", grib2_table_4_2_4_7_csv },
+{ "grib2_table_4_2_4_8.csv", grib2_table_4_2_4_8_csv },
+{ "grib2_table_4_2_4_9.csv", grib2_table_4_2_4_9_csv },
+{ "grib2_table_4_2_local_Canada.csv", grib2_table_4_2_local_Canada_csv },
+{ "grib2_table_4_2_local_HPC.csv", grib2_table_4_2_local_HPC_csv },
+{ "grib2_table_4_2_local_MRMS.csv", grib2_table_4_2_local_MRMS_csv },
+{ "grib2_table_4_2_local_NCEP.csv", grib2_table_4_2_local_NCEP_csv },
+{ "grib2_table_4_2_local_NDFD.csv", grib2_table_4_2_local_NDFD_csv },
+{ "grib2_table_4_2_local_index.csv", grib2_table_4_2_local_index_csv },
+{ "grib2_table_4_5.csv", grib2_table_4_5_csv },
+{ "grib2_table_versions.csv", grib2_table_versions_csv },
diff --git a/frmts/grib/degrib/degrib/metaname.cpp b/frmts/grib/degrib/degrib/metaname.cpp
index 4ab5576c7833..d0192d7fd93c 100644
--- a/frmts/grib/degrib/degrib/metaname.cpp
+++ b/frmts/grib/degrib/degrib/metaname.cpp
@@ -27,8 +27,40 @@
 
 #include <cmath>
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#include <map>
+#include <mutex>
+static std::mutex goMutex;
+static std::map<std::string, std::string>* pgoMapResourceFiles = nullptr;
+#endif
+
+void MetanameCleanup(void)
+{
+#ifdef EMBED_RESOURCE_FILES
+    std::lock_guard oGuard(goMutex);
+    if( pgoMapResourceFiles )
+    {
+        for( const auto& oIter: *pgoMapResourceFiles )
+        {
+            VSIUnlink(oIter.second.c_str());
+        }
+        delete pgoMapResourceFiles;
+    }
+    pgoMapResourceFiles = nullptr;
+#endif
+}
+
 static const char* GetGRIB2_CSVFilename(const char* pszFilename)
 {
+#ifdef EMBED_RESOURCE_FILES
+    std::lock_guard oGuard(goMutex);
+    if( !pgoMapResourceFiles )
+        pgoMapResourceFiles = new std::map<std::string, std::string>();
+    const auto oIter = pgoMapResourceFiles->find(pszFilename);
+    if( oIter != pgoMapResourceFiles->end() )
+        return oIter->second.c_str();
+#endif
     const char* pszGribTableDirectory = CPLGetConfigOption("GRIB_RESOURCE_DIR", nullptr);
     if( pszGribTableDirectory )
     {
@@ -38,11 +70,35 @@ static const char* GetGRIB2_CSVFilename(const char* pszFilename)
             return pszFullFilename;
         return nullptr;
     }
-    const char* pszRet = CSVFilename(pszFilename);
+    const char* pszRet = nullptr;
+    CPL_IGNORE_RET_VAL(pszRet);
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
+    pszRet = CSVFilename(pszFilename);
     // CSVFilename() returns the same content as pszFilename if it does not
     // find the file.
     if( pszRet && strcmp(pszRet, pszFilename) == 0 )
-        return nullptr;
+#endif
+    {
+#ifdef EMBED_RESOURCE_FILES
+        const char* pszFileContent = GRIBGetCSVFileContent(pszFilename);
+        if( pszFileContent )
+        {
+            const std::string osTmpFilename = VSIMemGenerateHiddenFilename(pszFilename);
+            VSIFCloseL(VSIFileFromMemBuffer(
+                osTmpFilename.c_str(),
+                const_cast<GByte *>(
+                    reinterpret_cast<const GByte *>(pszFileContent)),
+                static_cast<int>(strlen(pszFileContent)),
+                /* bTakeOwnership = */ false));
+            (*pgoMapResourceFiles)[pszFilename] = osTmpFilename;
+            pszRet = (*pgoMapResourceFiles)[pszFilename].c_str();
+        }
+        else
+#endif
+        {
+            return nullptr;
+        }
+    }
     return pszRet;
 }
 
diff --git a/frmts/grib/degrib/degrib/metaname.h b/frmts/grib/degrib/degrib/metaname.h
index 3408adb5980b..4df04802d4c6 100644
--- a/frmts/grib/degrib/degrib/metaname.h
+++ b/frmts/grib/degrib/degrib/metaname.h
@@ -46,6 +46,8 @@ void ParseLevelName (unsigned short int center, unsigned short int subcenter,
                      double sndValue, char **shortLevelName,
                      char **longLevelName);
 
+void MetanameCleanup(void);
+
 #ifdef __cplusplus
 }
 #endif  /* __cplusplus */
diff --git a/frmts/grib/degrib/generate_embedded_resources.py b/frmts/grib/degrib/generate_embedded_resources.py
new file mode 100755
index 000000000000..4a45fc0b1cfe
--- /dev/null
+++ b/frmts/grib/degrib/generate_embedded_resources.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2024 Even Rouault
+
+import glob
+import os
+
+embedded_resources_gen1 = open(
+    os.path.join(os.path.dirname(__file__), "degrib/embedded_resources_gen1.c"), "wt"
+)
+embedded_resources_gen2 = open(
+    os.path.join(os.path.dirname(__file__), "degrib/embedded_resources_gen2.c"), "wt"
+)
+
+embedded_resources_gen1.write(
+    "// File generated by generate_embedded_resources.py. DO NOT EDIT\n"
+)
+embedded_resources_gen2.write(
+    "// File generated by generate_embedded_resources.py. DO NOT EDIT\n"
+)
+
+for f in sorted(glob.glob(os.path.join(os.path.dirname(__file__), "../data/*.csv"))):
+    f = os.path.basename(f)
+    c = f.replace(".", "_")
+    embedded_resources_gen1.write(
+        """
+static const char %s [] = {
+    #embed "../../data/%s"
+            , 0
+};
+"""
+        % (c, f)
+    )
+    embedded_resources_gen2.write("""{ "%s", %s },\n""" % (f, c))
+
+embedded_resources_gen1.close()
+embedded_resources_gen2.close()
diff --git a/frmts/grib/gribdataset.cpp b/frmts/grib/gribdataset.cpp
index 9e506e379760..bec730047d3e 100644
--- a/frmts/grib/gribdataset.cpp
+++ b/frmts/grib/gribdataset.cpp
@@ -2815,6 +2815,7 @@ static void GDALDeregister_GRIB(GDALDriver *)
 {
     if (hGRIBMutex != nullptr)
     {
+        MetanameCleanup();
         CPLDestroyMutex(hGRIBMutex);
         hGRIBMutex = nullptr;
     }

From 8223056d070129913172c5f3251d464e3404c01f Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Oct 2024 17:49:34 +0200
Subject: [PATCH 12/87] PDS4: embed pds4_template.xml if EMBED_RESOURCE_FILES

---
 frmts/pds/CMakeLists.txt       | 12 +++++++++++-
 frmts/pds/embedded_resources.c | 13 +++++++++++++
 frmts/pds/embedded_resources.h | 10 ++++++++++
 frmts/pds/pds4dataset.cpp      | 25 +++++++++++++++++++++++--
 4 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 frmts/pds/embedded_resources.c
 create mode 100644 frmts/pds/embedded_resources.h

diff --git a/frmts/pds/CMakeLists.txt b/frmts/pds/CMakeLists.txt
index ac46b0ede91f..12207939d21b 100644
--- a/frmts/pds/CMakeLists.txt
+++ b/frmts/pds/CMakeLists.txt
@@ -15,9 +15,12 @@ add_gdal_driver(
 )
 
 set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/pds4_template.xml
     ${CMAKE_CURRENT_SOURCE_DIR}/data/vicar.json
 )
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    list(APPEND GDAL_DATA_FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pds4_template.xml)
+endif()
+
 set_property(
   TARGET ${GDAL_LIB_TARGET_NAME}
   APPEND
@@ -39,6 +42,13 @@ if (GDAL_ENABLE_DRIVER_PDS_PLUGIN)
   target_compile_definitions(gdal_PDS PRIVATE -DPDS_PLUGIN)
 endif ()
 
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(gdal_PDS GDAL_ENABLE_DRIVER_PDS_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(gdal_PDS PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
+
 # Internal libs first
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(gdal_PDS libjson)
diff --git a/frmts/pds/embedded_resources.c b/frmts/pds/embedded_resources.c
new file mode 100644
index 000000000000..e75cf2e29e90
--- /dev/null
+++ b/frmts/pds/embedded_resources.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char szPDS4Template[] = {
+#embed "data/pds4_template.xml"
+    , 0};
+
+const char *PDS4GetEmbeddedTemplate()
+{
+    return szPDS4Template;
+}
diff --git a/frmts/pds/embedded_resources.h b/frmts/pds/embedded_resources.h
new file mode 100644
index 000000000000..fd3850eb5f43
--- /dev/null
+++ b/frmts/pds/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *PDS4GetEmbeddedTemplate(void);
+
+CPL_C_END
diff --git a/frmts/pds/pds4dataset.cpp b/frmts/pds/pds4dataset.cpp
index bf559e071bc9..09e0a1fd5198 100644
--- a/frmts/pds/pds4dataset.cpp
+++ b/frmts/pds/pds4dataset.cpp
@@ -21,6 +21,10 @@
 #include "pds4dataset.h"
 #include "pdsdrivercore.h"
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 #include <cstdlib>
 #include <vector>
 #include <algorithm>
@@ -4034,16 +4038,33 @@ void PDS4Dataset::WriteHeader()
             psRoot = CPLParseXMLString(m_osXMLPDS4);
         else
         {
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
+#ifdef EMBED_RESOURCE_FILES
+            CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
             const char *pszDefaultTemplateFilename =
                 CPLFindFile("gdal", "pds4_template.xml");
-            if (pszDefaultTemplateFilename == nullptr)
+            if (pszDefaultTemplateFilename)
             {
+                psRoot = CPLParseXMLFile(pszDefaultTemplateFilename);
+            }
+            else
+#endif
+            {
+#ifdef EMBED_RESOURCE_FILES
+                static const bool bOnce [[maybe_unused]] = []()
+                {
+                    CPLDebug("PDS4", "Using embedded pds4_template.xml");
+                    return true;
+                }();
+                psRoot = CPLParseXMLString(PDS4GetEmbeddedTemplate());
+#else
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "Cannot find pds4_template.xml and TEMPLATE "
                          "creation option not specified");
                 return;
+#endif
             }
-            psRoot = CPLParseXMLFile(pszDefaultTemplateFilename);
         }
     }
     else

From 38b47c6e057b6c203966244457e8e973e5065573 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 3 Oct 2024 22:16:21 +0200
Subject: [PATCH 13/87] DGN: embed seed_2d.dgn and seed_3d.dgn if
 EMBED_RESOURCE_FILES

---
 ogr/ogrsf_frmts/dgn/CMakeLists.txt       | 27 +++++++----
 ogr/ogrsf_frmts/dgn/embedded_resources.c | 24 +++++++++
 ogr/ogrsf_frmts/dgn/embedded_resources.h | 16 ++++++
 ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp | 62 ++++++++++++++++++++++--
 4 files changed, 115 insertions(+), 14 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/dgn/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/dgn/embedded_resources.h

diff --git a/ogr/ogrsf_frmts/dgn/CMakeLists.txt b/ogr/ogrsf_frmts/dgn/CMakeLists.txt
index e3876bfe5836..3a98e7548a9b 100644
--- a/ogr/ogrsf_frmts/dgn/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/dgn/CMakeLists.txt
@@ -12,15 +12,24 @@ add_gdal_driver(
           NO_DEPS)
 gdal_standard_includes(ogr_DGN)
 
-set(GDAL_DATA_FILES
-    LICENSE.TXT
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/seed_2d.dgn
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/seed_3d.dgn
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        LICENSE.TXT
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/seed_2d.dgn
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/seed_3d.dgn
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_DGN OGR_ENABLE_DRIVER_DGN_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_DGN PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
 
 if (NOT OGR_ENABLE_DRIVER_DGN_PLUGIN)
   add_executable(dgnwritetest EXCLUDE_FROM_ALL dgnwritetest.cpp)
diff --git a/ogr/ogrsf_frmts/dgn/embedded_resources.c b/ogr/ogrsf_frmts/dgn/embedded_resources.c
new file mode 100644
index 000000000000..ec1efa230dfd
--- /dev/null
+++ b/ogr/ogrsf_frmts/dgn/embedded_resources.c
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const unsigned char abySeed2D[] = {
+#embed "data/seed_2d.dgn"
+};
+
+const unsigned char *DGNGetSeed2D(unsigned int *pnSize)
+{
+    *pnSize = sizeof(abySeed2D);
+    return abySeed2D;
+}
+
+static const unsigned char abySeed3D[] = {
+#embed "data/seed_3d.dgn"
+};
+
+const unsigned char *DGNGetSeed3D(unsigned int *pnSize)
+{
+    *pnSize = sizeof(abySeed3D);
+    return abySeed3D;
+}
diff --git a/ogr/ogrsf_frmts/dgn/embedded_resources.h b/ogr/ogrsf_frmts/dgn/embedded_resources.h
new file mode 100644
index 000000000000..5b42625247bc
--- /dev/null
+++ b/ogr/ogrsf_frmts/dgn/embedded_resources.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#ifndef DGN_EMBEDDED_RESOURCES_H
+#define DGN_EMBEDDED_RESOURCES_H
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const unsigned char *DGNGetSeed2D(unsigned int *pnSize);
+const unsigned char *DGNGetSeed3D(unsigned int *pnSize);
+
+CPL_C_END
+
+#endif
diff --git a/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp b/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp
index 46ec850643f8..efed9d1db2b8 100644
--- a/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp
+++ b/ogr/ogrsf_frmts/dgn/ogrdgndatasource.cpp
@@ -14,6 +14,10 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 /************************************************************************/
 /*                         OGRDGNDataSource()                           */
 /************************************************************************/
@@ -180,19 +184,58 @@ OGRDGNDataSource::ICreateLayer(const char *pszLayerName,
     const bool b3DRequested =
         CPLFetchBool(papszOptions, "3D", wkbHasZ(eGeomType));
 
-    const char *pszSeed = CSLFetchNameValue(papszOptions, "SEED");
+    const char *pszRequestSeed = CSLFetchNameValue(papszOptions, "SEED");
+    const char *pszSeed = pszRequestSeed;
     int nCreationFlags = 0;
+#ifdef EMBED_RESOURCE_FILES
+    std::string osTmpSeedFilename;
+#endif
     if (pszSeed)
         nCreationFlags |= DGNCF_USE_SEED_ORIGIN | DGNCF_USE_SEED_UNITS;
-    else if (b3DRequested)
-        pszSeed = CPLFindFile("gdal", "seed_3d.dgn");
     else
-        pszSeed = CPLFindFile("gdal", "seed_2d.dgn");
+    {
+        pszRequestSeed = b3DRequested ? "seed_3d.dgn" : "seed_2d.dgn";
+#ifdef EMBED_RESOURCE_FILES
+        CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
+        pszSeed = CPLFindFile("gdal", pszRequestSeed);
+#ifdef EMBED_RESOURCE_FILES
+        if (!pszSeed)
+        {
+            if (b3DRequested)
+            {
+                static const bool bOnce [[maybe_unused]] = []()
+                {
+                    CPLDebug("DGN", "Using embedded seed_3d");
+                    return true;
+                }();
+            }
+            else
+            {
+                static const bool bOnce [[maybe_unused]] = []()
+                {
+                    CPLDebug("DGN", "Using embedded seed_2d");
+                    return true;
+                }();
+            }
+            unsigned nSize = 0;
+            const unsigned char *pabyData =
+                b3DRequested ? DGNGetSeed3D(&nSize) : DGNGetSeed2D(&nSize);
+            osTmpSeedFilename = VSIMemGenerateHiddenFilename(pszRequestSeed);
+            pszSeed = osTmpSeedFilename.c_str();
+            VSIFCloseL(VSIFileFromMemBuffer(osTmpSeedFilename.c_str(),
+                                            const_cast<GByte *>(pabyData),
+                                            static_cast<int>(nSize),
+                                            /* bTakeOwnership = */ false));
+        }
+#endif
+    }
 
     if (pszSeed == nullptr)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
-                 "No seed file provided, and unable to find seed_2d.dgn.");
+                 "No seed file provided, and unable to find %s.",
+                 pszRequestSeed);
         return nullptr;
     }
 
@@ -254,6 +297,10 @@ OGRDGNDataSource::ICreateLayer(const char *pszLayerName,
             CPLError(CE_Failure, CPLE_AppDefined,
                      "ORIGIN is not a valid 2d or 3d tuple.\n"
                      "Separate tuple values with comma.");
+#ifdef EMBED_RESOURCE_FILES
+            if (!osTmpSeedFilename.empty())
+                VSIUnlink(osTmpSeedFilename.c_str());
+#endif
             return nullptr;
         }
         CSLDestroy(papszTuple);
@@ -265,6 +312,11 @@ OGRDGNDataSource::ICreateLayer(const char *pszLayerName,
     hDGN = DGNCreate(GetDescription(), pszSeed, nCreationFlags, dfOriginX,
                      dfOriginY, dfOriginZ, nSUPerMU, nUORPerSU, pszMasterUnit,
                      pszSubUnit);
+#ifdef EMBED_RESOURCE_FILES
+    if (!osTmpSeedFilename.empty())
+        VSIUnlink(osTmpSeedFilename.c_str());
+#endif
+
     if (hDGN == nullptr)
         return nullptr;
 

From 361620d260a85d9ca142bbe5799e1d46a66d7f2a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 3 Oct 2024 22:49:13 +0200
Subject: [PATCH 14/87] GML: embed gml_registry.gml and .gfs files if
 EMBED_RESOURCE_FILES

---
 ogr/ogrsf_frmts/gml/CMakeLists.txt            |  83 +++++-----
 ogr/ogrsf_frmts/gml/embedded_resources.c      |  24 +++
 ogr/ogrsf_frmts/gml/embedded_resources.h      |  10 ++
 ogr/ogrsf_frmts/gml/embedded_resources_gen1.c | 145 ++++++++++++++++++
 ogr/ogrsf_frmts/gml/embedded_resources_gen2.c |  36 +++++
 .../gml/generate_embedded_resources.py        |  40 +++++
 ogr/ogrsf_frmts/gml/gmlreader.cpp             |  28 +++-
 ogr/ogrsf_frmts/gml/gmlregistry.cpp           |  38 ++++-
 8 files changed, 360 insertions(+), 44 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/gml/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/gml/embedded_resources.h
 create mode 100644 ogr/ogrsf_frmts/gml/embedded_resources_gen1.c
 create mode 100644 ogr/ogrsf_frmts/gml/embedded_resources_gen2.c
 create mode 100755 ogr/ogrsf_frmts/gml/generate_embedded_resources.py

diff --git a/ogr/ogrsf_frmts/gml/CMakeLists.txt b/ogr/ogrsf_frmts/gml/CMakeLists.txt
index 845a797dcaec..9316580f70ab 100644
--- a/ogr/ogrsf_frmts/gml/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/gml/CMakeLists.txt
@@ -25,49 +25,60 @@ target_include_directories(ogr_GML PRIVATE $<TARGET_PROPERTY:gmlutils,SOURCE_DIR
 
 set(GDAL_DATA_FILES
     ${CMAKE_CURRENT_SOURCE_DIR}/data/gfs.xsd
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/gml_registry.xml
     ${CMAKE_CURRENT_SOURCE_DIR}/data/gml_registry.xsd
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/inspire_cp_BasicPropertyUnit.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/inspire_cp_CadastralBoundary.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/inspire_cp_CadastralParcel.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/inspire_cp_CadastralZoning.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_AdmArea.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_AdmBdry.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_AdmPt.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_BldA.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_BldL.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_Cntr.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_CommBdry.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_CommPt.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_Cstline.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_ElevPt.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_GCP.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_LeveeEdge.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RailCL.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdASL.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdArea.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdCompt.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdEdg.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdMgtBdry.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdSgmtA.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RvrMgtBdry.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_SBAPt.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_SBArea.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_SBBdry.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_WA.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_WL.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_WStrA.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_WStrL.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/ruian_vf_ob_v1.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/ruian_vf_st_uvoh_v1.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/ruian_vf_st_v1.gfs
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/ruian_vf_v1.gfs
 )
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    list(APPEND GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/gml_registry.xml
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/inspire_cp_BasicPropertyUnit.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/inspire_cp_CadastralBoundary.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/inspire_cp_CadastralParcel.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/inspire_cp_CadastralZoning.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_AdmArea.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_AdmBdry.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_AdmPt.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_BldA.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_BldL.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_Cntr.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_CommBdry.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_CommPt.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_Cstline.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_ElevPt.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_GCP.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_LeveeEdge.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RailCL.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdASL.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdArea.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdCompt.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdEdg.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdMgtBdry.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RdSgmtA.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_RvrMgtBdry.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_SBAPt.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_SBArea.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_SBBdry.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_WA.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_WL.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_WStrA.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/jpfgdgml_WStrL.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/ruian_vf_ob_v1.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/ruian_vf_st_uvoh_v1.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/ruian_vf_st_v1.gfs
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/ruian_vf_v1.gfs
+    )
+endif()
 set_property(
   TARGET ${GDAL_LIB_TARGET_NAME}
   APPEND
   PROPERTY RESOURCE "${GDAL_DATA_FILES}")
 
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_GML OGR_ENABLE_DRIVER_GML_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_GML PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
+
 if (GDAL_USE_EXPAT)
   target_compile_definitions(ogr_GML PRIVATE -DHAVE_EXPAT)
   gdal_target_link_libraries(ogr_GML PRIVATE ${EXPAT_TARGET})
diff --git a/ogr/ogrsf_frmts/gml/embedded_resources.c b/ogr/ogrsf_frmts/gml/embedded_resources.c
new file mode 100644
index 000000000000..8ebc7eb8a72a
--- /dev/null
+++ b/ogr/ogrsf_frmts/gml/embedded_resources.c
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+#include "embedded_resources_gen1.c"
+
+const char *GMLGetFileContent(const char *pszFilename)
+{
+    static const struct
+    {
+        const char *pszFilename;
+        const char *pszContent;
+    } asResources[] = {
+
+#include "embedded_resources_gen2.c"
+    };
+    for (size_t i = 0; i < sizeof(asResources) / sizeof(asResources[0]); ++i)
+    {
+        if (strcmp(pszFilename, asResources[i].pszFilename) == 0)
+            return asResources[i].pszContent;
+    }
+    return NULL;
+}
diff --git a/ogr/ogrsf_frmts/gml/embedded_resources.h b/ogr/ogrsf_frmts/gml/embedded_resources.h
new file mode 100644
index 000000000000..d9c634e063b3
--- /dev/null
+++ b/ogr/ogrsf_frmts/gml/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *GMLGetFileContent(const char *pszFilename);
+
+CPL_C_END
diff --git a/ogr/ogrsf_frmts/gml/embedded_resources_gen1.c b/ogr/ogrsf_frmts/gml/embedded_resources_gen1.c
new file mode 100644
index 000000000000..1b12587e3220
--- /dev/null
+++ b/ogr/ogrsf_frmts/gml/embedded_resources_gen1.c
@@ -0,0 +1,145 @@
+// File generated by generate_embedded_resources.py. DO NOT EDIT
+
+static const char gml_registry_xml[] = {
+#embed "data/gml_registry.xml"
+    , 0};
+
+static const char inspire_cp_BasicPropertyUnit_gfs[] = {
+#embed "data/inspire_cp_BasicPropertyUnit.gfs"
+    , 0};
+
+static const char inspire_cp_CadastralBoundary_gfs[] = {
+#embed "data/inspire_cp_CadastralBoundary.gfs"
+    , 0};
+
+static const char inspire_cp_CadastralParcel_gfs[] = {
+#embed "data/inspire_cp_CadastralParcel.gfs"
+    , 0};
+
+static const char inspire_cp_CadastralZoning_gfs[] = {
+#embed "data/inspire_cp_CadastralZoning.gfs"
+    , 0};
+
+static const char jpfgdgml_AdmArea_gfs[] = {
+#embed "data/jpfgdgml_AdmArea.gfs"
+    , 0};
+
+static const char jpfgdgml_AdmBdry_gfs[] = {
+#embed "data/jpfgdgml_AdmBdry.gfs"
+    , 0};
+
+static const char jpfgdgml_AdmPt_gfs[] = {
+#embed "data/jpfgdgml_AdmPt.gfs"
+    , 0};
+
+static const char jpfgdgml_BldA_gfs[] = {
+#embed "data/jpfgdgml_BldA.gfs"
+    , 0};
+
+static const char jpfgdgml_BldL_gfs[] = {
+#embed "data/jpfgdgml_BldL.gfs"
+    , 0};
+
+static const char jpfgdgml_Cntr_gfs[] = {
+#embed "data/jpfgdgml_Cntr.gfs"
+    , 0};
+
+static const char jpfgdgml_CommBdry_gfs[] = {
+#embed "data/jpfgdgml_CommBdry.gfs"
+    , 0};
+
+static const char jpfgdgml_CommPt_gfs[] = {
+#embed "data/jpfgdgml_CommPt.gfs"
+    , 0};
+
+static const char jpfgdgml_Cstline_gfs[] = {
+#embed "data/jpfgdgml_Cstline.gfs"
+    , 0};
+
+static const char jpfgdgml_ElevPt_gfs[] = {
+#embed "data/jpfgdgml_ElevPt.gfs"
+    , 0};
+
+static const char jpfgdgml_GCP_gfs[] = {
+#embed "data/jpfgdgml_GCP.gfs"
+    , 0};
+
+static const char jpfgdgml_LeveeEdge_gfs[] = {
+#embed "data/jpfgdgml_LeveeEdge.gfs"
+    , 0};
+
+static const char jpfgdgml_RailCL_gfs[] = {
+#embed "data/jpfgdgml_RailCL.gfs"
+    , 0};
+
+static const char jpfgdgml_RdASL_gfs[] = {
+#embed "data/jpfgdgml_RdASL.gfs"
+    , 0};
+
+static const char jpfgdgml_RdArea_gfs[] = {
+#embed "data/jpfgdgml_RdArea.gfs"
+    , 0};
+
+static const char jpfgdgml_RdCompt_gfs[] = {
+#embed "data/jpfgdgml_RdCompt.gfs"
+    , 0};
+
+static const char jpfgdgml_RdEdg_gfs[] = {
+#embed "data/jpfgdgml_RdEdg.gfs"
+    , 0};
+
+static const char jpfgdgml_RdMgtBdry_gfs[] = {
+#embed "data/jpfgdgml_RdMgtBdry.gfs"
+    , 0};
+
+static const char jpfgdgml_RdSgmtA_gfs[] = {
+#embed "data/jpfgdgml_RdSgmtA.gfs"
+    , 0};
+
+static const char jpfgdgml_RvrMgtBdry_gfs[] = {
+#embed "data/jpfgdgml_RvrMgtBdry.gfs"
+    , 0};
+
+static const char jpfgdgml_SBAPt_gfs[] = {
+#embed "data/jpfgdgml_SBAPt.gfs"
+    , 0};
+
+static const char jpfgdgml_SBArea_gfs[] = {
+#embed "data/jpfgdgml_SBArea.gfs"
+    , 0};
+
+static const char jpfgdgml_SBBdry_gfs[] = {
+#embed "data/jpfgdgml_SBBdry.gfs"
+    , 0};
+
+static const char jpfgdgml_WA_gfs[] = {
+#embed "data/jpfgdgml_WA.gfs"
+    , 0};
+
+static const char jpfgdgml_WL_gfs[] = {
+#embed "data/jpfgdgml_WL.gfs"
+    , 0};
+
+static const char jpfgdgml_WStrA_gfs[] = {
+#embed "data/jpfgdgml_WStrA.gfs"
+    , 0};
+
+static const char jpfgdgml_WStrL_gfs[] = {
+#embed "data/jpfgdgml_WStrL.gfs"
+    , 0};
+
+static const char ruian_vf_ob_v1_gfs[] = {
+#embed "data/ruian_vf_ob_v1.gfs"
+    , 0};
+
+static const char ruian_vf_st_uvoh_v1_gfs[] = {
+#embed "data/ruian_vf_st_uvoh_v1.gfs"
+    , 0};
+
+static const char ruian_vf_st_v1_gfs[] = {
+#embed "data/ruian_vf_st_v1.gfs"
+    , 0};
+
+static const char ruian_vf_v1_gfs[] = {
+#embed "data/ruian_vf_v1.gfs"
+    , 0};
diff --git a/ogr/ogrsf_frmts/gml/embedded_resources_gen2.c b/ogr/ogrsf_frmts/gml/embedded_resources_gen2.c
new file mode 100644
index 000000000000..ab7ac32a61fb
--- /dev/null
+++ b/ogr/ogrsf_frmts/gml/embedded_resources_gen2.c
@@ -0,0 +1,36 @@
+// File generated by generate_embedded_resources.py. DO NOT EDIT
+{"gml_registry.xml", gml_registry_xml},
+    {"inspire_cp_BasicPropertyUnit.gfs", inspire_cp_BasicPropertyUnit_gfs},
+    {"inspire_cp_CadastralBoundary.gfs", inspire_cp_CadastralBoundary_gfs},
+    {"inspire_cp_CadastralParcel.gfs", inspire_cp_CadastralParcel_gfs},
+    {"inspire_cp_CadastralZoning.gfs", inspire_cp_CadastralZoning_gfs},
+    {"jpfgdgml_AdmArea.gfs", jpfgdgml_AdmArea_gfs},
+    {"jpfgdgml_AdmBdry.gfs", jpfgdgml_AdmBdry_gfs},
+    {"jpfgdgml_AdmPt.gfs", jpfgdgml_AdmPt_gfs},
+    {"jpfgdgml_BldA.gfs", jpfgdgml_BldA_gfs},
+    {"jpfgdgml_BldL.gfs", jpfgdgml_BldL_gfs},
+    {"jpfgdgml_Cntr.gfs", jpfgdgml_Cntr_gfs},
+    {"jpfgdgml_CommBdry.gfs", jpfgdgml_CommBdry_gfs},
+    {"jpfgdgml_CommPt.gfs", jpfgdgml_CommPt_gfs},
+    {"jpfgdgml_Cstline.gfs", jpfgdgml_Cstline_gfs},
+    {"jpfgdgml_ElevPt.gfs", jpfgdgml_ElevPt_gfs},
+    {"jpfgdgml_GCP.gfs", jpfgdgml_GCP_gfs},
+    {"jpfgdgml_LeveeEdge.gfs", jpfgdgml_LeveeEdge_gfs},
+    {"jpfgdgml_RailCL.gfs", jpfgdgml_RailCL_gfs},
+    {"jpfgdgml_RdASL.gfs", jpfgdgml_RdASL_gfs},
+    {"jpfgdgml_RdArea.gfs", jpfgdgml_RdArea_gfs},
+    {"jpfgdgml_RdCompt.gfs", jpfgdgml_RdCompt_gfs},
+    {"jpfgdgml_RdEdg.gfs", jpfgdgml_RdEdg_gfs},
+    {"jpfgdgml_RdMgtBdry.gfs", jpfgdgml_RdMgtBdry_gfs},
+    {"jpfgdgml_RdSgmtA.gfs", jpfgdgml_RdSgmtA_gfs},
+    {"jpfgdgml_RvrMgtBdry.gfs", jpfgdgml_RvrMgtBdry_gfs},
+    {"jpfgdgml_SBAPt.gfs", jpfgdgml_SBAPt_gfs},
+    {"jpfgdgml_SBArea.gfs", jpfgdgml_SBArea_gfs},
+    {"jpfgdgml_SBBdry.gfs", jpfgdgml_SBBdry_gfs},
+    {"jpfgdgml_WA.gfs", jpfgdgml_WA_gfs}, {"jpfgdgml_WL.gfs", jpfgdgml_WL_gfs},
+    {"jpfgdgml_WStrA.gfs", jpfgdgml_WStrA_gfs},
+    {"jpfgdgml_WStrL.gfs", jpfgdgml_WStrL_gfs},
+    {"ruian_vf_ob_v1.gfs", ruian_vf_ob_v1_gfs},
+    {"ruian_vf_st_uvoh_v1.gfs", ruian_vf_st_uvoh_v1_gfs},
+    {"ruian_vf_st_v1.gfs", ruian_vf_st_v1_gfs},
+    {"ruian_vf_v1.gfs", ruian_vf_v1_gfs},
diff --git a/ogr/ogrsf_frmts/gml/generate_embedded_resources.py b/ogr/ogrsf_frmts/gml/generate_embedded_resources.py
new file mode 100755
index 000000000000..e26b2ff74683
--- /dev/null
+++ b/ogr/ogrsf_frmts/gml/generate_embedded_resources.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: MIT
+# Copyright (C) 2024 Even Rouault
+
+import glob
+import os
+
+embedded_resources_gen1 = open(
+    os.path.join(os.path.dirname(__file__), "embedded_resources_gen1.c"), "wt"
+)
+embedded_resources_gen2 = open(
+    os.path.join(os.path.dirname(__file__), "embedded_resources_gen2.c"), "wt"
+)
+
+embedded_resources_gen1.write(
+    "// File generated by generate_embedded_resources.py. DO NOT EDIT\n"
+)
+embedded_resources_gen2.write(
+    "// File generated by generate_embedded_resources.py. DO NOT EDIT\n"
+)
+
+files = list(glob.glob(os.path.join(os.path.dirname(__file__), "data/*.gfs")))
+files += list(glob.glob(os.path.join(os.path.dirname(__file__), "data/*.xml")))
+
+for f in sorted(files):
+    f = os.path.basename(f)
+    c = f.replace(".", "_")
+    embedded_resources_gen1.write(
+        """
+static const char %s [] = {
+    #embed "data/%s"
+            , 0
+};
+"""
+        % (c, f)
+    )
+    embedded_resources_gen2.write("""{ "%s", %s },\n""" % (f, c))
+
+embedded_resources_gen1.close()
+embedded_resources_gen2.close()
diff --git a/ogr/ogrsf_frmts/gml/gmlreader.cpp b/ogr/ogrsf_frmts/gml/gmlreader.cpp
index c8beac7ee919..cd89c146ee29 100644
--- a/ogr/ogrsf_frmts/gml/gmlreader.cpp
+++ b/ogr/ogrsf_frmts/gml/gmlreader.cpp
@@ -30,6 +30,10 @@
 #include "gmlutils.h"
 #include "ogr_geometry.h"
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 /************************************************************************/
 /*                            ~IGMLReader()                             */
 /************************************************************************/
@@ -1123,11 +1127,29 @@ bool GMLReader::LoadClasses(const char *pszFile)
     /*      Load the raw XML file.                                          */
     /* -------------------------------------------------------------------- */
     GByte *pabyRet = nullptr;
-    if (!VSIIngestFile(nullptr, pszFile, &pabyRet, nullptr, 100 * 1024 * 1024))
+    const char *pszWholeText = nullptr;
     {
-        return false;
+#ifdef EMBED_RESOURCE_FILES
+        CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
+        if (VSIIngestFile(nullptr, pszFile, &pabyRet, nullptr,
+                          100 * 1024 * 1024))
+        {
+            pszWholeText = reinterpret_cast<const char *>(pabyRet);
+        }
+        else
+        {
+#ifdef EMBED_RESOURCE_FILES
+            pszWholeText = GMLGetFileContent(pszFile);
+            if (pszWholeText)
+            {
+                CPLDebug("GML", "Using embedded %s", pszFile);
+            }
+#endif
+        }
     }
-    const char *pszWholeText = reinterpret_cast<const char *>(pabyRet);
+    if (!pszWholeText)
+        return false;
 
     if (strstr(pszWholeText, "<GMLFeatureClassList") == nullptr)
     {
diff --git a/ogr/ogrsf_frmts/gml/gmlregistry.cpp b/ogr/ogrsf_frmts/gml/gmlregistry.cpp
index 766d74dfe3b7..381dfd3c9cbe 100644
--- a/ogr/ogrsf_frmts/gml/gmlregistry.cpp
+++ b/ogr/ogrsf_frmts/gml/gmlregistry.cpp
@@ -17,21 +17,47 @@
 
 #include "cpl_conv.h"
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 /************************************************************************/
 /*                           Parse()                                    */
 /************************************************************************/
 
 bool GMLRegistry::Parse()
 {
+#ifndef USE_ONLY_EMBEDDED_RESOURCE_FILES
     if (osRegistryPath.empty())
     {
+#ifdef EMBED_RESOURCE_FILES
+        CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
         const char *pszFilename = CPLFindFile("gdal", "gml_registry.xml");
         if (pszFilename)
             osRegistryPath = pszFilename;
     }
-    if (osRegistryPath.empty())
-        return false;
-    CPLXMLNode *psRootNode = CPLParseXMLFile(osRegistryPath);
+#endif
+    CPLXMLNode *psRootNode = nullptr;
+    if (!osRegistryPath.empty())
+    {
+        psRootNode = CPLParseXMLFile(osRegistryPath);
+    }
+#ifdef EMBED_RESOURCE_FILES
+    else
+    {
+        const char *pszContent = GMLGetFileContent("gml_registry.xml");
+        if (pszContent)
+        {
+            static const bool bOnce [[maybe_unused]] = []()
+            {
+                CPLDebug("GML", "Using embedded gml_registry.xml");
+                return true;
+            }();
+            psRootNode = CPLParseXMLString(pszContent);
+        }
+    }
+#endif
     if (psRootNode == nullptr)
         return false;
     CPLXMLNode *psRegistryNode = CPLGetXMLNode(psRootNode, "=gml_registry");
@@ -116,7 +142,8 @@ bool GMLRegistryFeatureType::Parse(const char *pszRegistryFilename,
 
     if (pszSchemaLocation != nullptr)
     {
-        if (!STARTS_WITH(pszSchemaLocation, "http://") &&
+        if (pszRegistryFilename[0] &&
+            !STARTS_WITH(pszSchemaLocation, "http://") &&
             !STARTS_WITH(pszSchemaLocation, "https://") &&
             CPLIsFilenameRelative(pszSchemaLocation))
         {
@@ -127,7 +154,8 @@ bool GMLRegistryFeatureType::Parse(const char *pszRegistryFilename,
     }
     else if (pszGFSSchemaLocation != nullptr)
     {
-        if (!STARTS_WITH(pszGFSSchemaLocation, "http://") &&
+        if (pszRegistryFilename[0] &&
+            !STARTS_WITH(pszGFSSchemaLocation, "http://") &&
             !STARTS_WITH(pszGFSSchemaLocation, "https://") &&
             CPLIsFilenameRelative(pszGFSSchemaLocation))
         {

From 3586f2de718a2c23795afcd004d75b88033040cf Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 14:37:09 +0200
Subject: [PATCH 15/87] GMLAS: embed gmlasconf.xml and .xsd if
 EMBED_RESOURCE_FILES

---
 ogr/ogrsf_frmts/gmlas/CMakeLists.txt         | 13 +++-
 ogr/ogrsf_frmts/gmlas/embedded_resources.c   | 22 ++++++
 ogr/ogrsf_frmts/gmlas/embedded_resources.h   | 11 +++
 ogr/ogrsf_frmts/gmlas/ogr_gmlas.h            | 11 +++
 ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp       | 72 +++++++++++++++++++-
 ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp | 30 +++++---
 ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp     | 11 +--
 7 files changed, 153 insertions(+), 17 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/gmlas/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/gmlas/embedded_resources.h

diff --git a/ogr/ogrsf_frmts/gmlas/CMakeLists.txt b/ogr/ogrsf_frmts/gmlas/CMakeLists.txt
index 2c8d69fc7c43..8481d88f1e01 100644
--- a/ogr/ogrsf_frmts/gmlas/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/gmlas/CMakeLists.txt
@@ -28,9 +28,13 @@ endif()
 gdal_standard_includes(ogr_GMLAS)
 
 set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/gmlasconf.xml
     ${CMAKE_CURRENT_SOURCE_DIR}/data/gmlasconf.xsd
 )
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    list(APPEND GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/gmlasconf.xml
+    )
+endif()
 set_property(
   TARGET ${GDAL_LIB_TARGET_NAME}
   APPEND
@@ -40,6 +44,13 @@ target_include_directories(
   ogr_GMLAS PRIVATE ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/mem
                     ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/pgdump)
 
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_GMLAS OGR_ENABLE_DRIVER_GMLAS_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_GMLAS PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
+
 # Internal libs first
 if (GDAL_USE_JSONC_INTERNAL)
   gdal_add_vendored_lib(ogr_GMLAS libjson)
diff --git a/ogr/ogrsf_frmts/gmlas/embedded_resources.c b/ogr/ogrsf_frmts/gmlas/embedded_resources.c
new file mode 100644
index 000000000000..73a0c5a74372
--- /dev/null
+++ b/ogr/ogrsf_frmts/gmlas/embedded_resources.c
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char gmlasconf_xsd[] = {
+#embed "data/gmlasconf.xsd"
+    , 0};
+
+static const char gmlasconf_xml[] = {
+#embed "data/gmlasconf.xml"
+    , 0};
+
+const char *GMLASConfXSDGetFileContent(void)
+{
+    return gmlasconf_xsd;
+}
+
+const char *GMLASConfXMLGetFileContent(void)
+{
+    return gmlasconf_xml;
+}
diff --git a/ogr/ogrsf_frmts/gmlas/embedded_resources.h b/ogr/ogrsf_frmts/gmlas/embedded_resources.h
new file mode 100644
index 000000000000..c01b0c4495f9
--- /dev/null
+++ b/ogr/ogrsf_frmts/gmlas/embedded_resources.h
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *GMLASConfXSDGetFileContent(void);
+const char *GMLASConfXMLGetFileContent(void);
+
+CPL_C_END
diff --git a/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h b/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
index a4f1d34bc769..db51233537a9 100644
--- a/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
+++ b/ogr/ogrsf_frmts/gmlas/ogr_gmlas.h
@@ -453,6 +453,8 @@ class GMLASConfiguration
     void Finalize();
 
     static CPLString GetBaseCacheDirectory();
+
+    static std::string GetDefaultConfFile(bool &bUnlinkAfterUse);
 };
 
 /************************************************************************/
@@ -1374,6 +1376,13 @@ class OGRGMLASDataSource final : public GDALDataset
     // Pointers are also included in m_apoLayers
     std::vector<OGRGMLASLayer *> m_apoSWEDataArrayLayersRef{};
 
+    // Path to gmlasconf.xml. It is a /vsimem temporary file if
+    // m_bUnlinkConfigFileAfterUse is set.
+    std::string m_osConfigFile{};
+
+    // Whether m_osConfigFile should be removed at closing.
+    bool m_bUnlinkConfigFileAfterUse = false;
+
     void TranslateClasses(OGRGMLASLayer *poParentLayer,
                           const GMLASFeatureClass &oFC);
 
@@ -1394,6 +1403,8 @@ class OGRGMLASDataSource final : public GDALDataset
   public:
     OGRGMLASDataSource();
 
+    ~OGRGMLASDataSource();
+
     virtual int GetLayerCount() override;
     virtual OGRLayer *GetLayer(int) override;
     virtual OGRLayer *GetLayerByName(const char *pszName) override;
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp
index bf7f9a2b7d6f..6e0e966c490b 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp
@@ -18,6 +18,10 @@
 
 #include <algorithm>
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 /************************************************************************/
 /*                        GetBaseCacheDirectory()                       */
 /************************************************************************/
@@ -195,6 +199,40 @@ static void ParseNamespaces(CPLXMLNode *psContainerNode,
     }
 }
 
+/************************************************************************/
+/*                           GetDefaultConfFile()                       */
+/************************************************************************/
+
+/* static */
+std::string GMLASConfiguration::GetDefaultConfFile(bool &bUnlinkAfterUse)
+{
+    bUnlinkAfterUse = false;
+#if !defined(USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    const char *pszConfigFile = CPLFindFile("gdal", szDEFAULT_CONF_FILENAME);
+    if (pszConfigFile)
+        return pszConfigFile;
+#endif
+#ifdef EMBED_RESOURCE_FILES
+    static const bool bOnce [[maybe_unused]] = []()
+    {
+        CPLDebug("GMLAS", "Using embedded %s", szDEFAULT_CONF_FILENAME);
+        return true;
+    }();
+    bUnlinkAfterUse = true;
+    const std::string osTmpFilename =
+        VSIMemGenerateHiddenFilename(szDEFAULT_CONF_FILENAME);
+    VSIFCloseL(VSIFileFromMemBuffer(
+        osTmpFilename.c_str(),
+        const_cast<GByte *>(
+            reinterpret_cast<const GByte *>(GMLASConfXMLGetFileContent())),
+        static_cast<int>(strlen(GMLASConfXMLGetFileContent())),
+        /* bTakeOwnership = */ false));
+    return osTmpFilename;
+#else
+    return std::string();
+#endif
+}
+
 /************************************************************************/
 /*                                 Load()                               */
 /************************************************************************/
@@ -216,8 +254,35 @@ bool GMLASConfiguration::Load(const char *pszFilename)
     // Validate the configuration file
     if (CPLTestBool(CPLGetConfigOption("GDAL_XML_VALIDATION", "YES")))
     {
+#ifdef EMBED_RESOURCE_FILES
+        std::string osTmpFilename;
+        CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+#endif
+#ifdef USE_ONLY_EMBEDDED_RESOURCE_FILES
+        const char *pszXSD = nullptr;
+#else
         const char *pszXSD = CPLFindFile("gdal", "gmlasconf.xsd");
-        if (pszXSD != nullptr)
+#endif
+#ifdef EMBED_RESOURCE_FILES
+        if (!pszXSD)
+        {
+            static const bool bOnce [[maybe_unused]] = []()
+            {
+                CPLDebug("GMLAS", "Using embedded gmlasconf.xsd");
+                return true;
+            }();
+            osTmpFilename = VSIMemGenerateHiddenFilename("gmlasconf.xsd");
+            pszXSD = osTmpFilename.c_str();
+            VSIFCloseL(VSIFileFromMemBuffer(
+                osTmpFilename.c_str(),
+                const_cast<GByte *>(reinterpret_cast<const GByte *>(
+                    GMLASConfXSDGetFileContent())),
+                static_cast<int>(strlen(GMLASConfXSDGetFileContent())),
+                /* bTakeOwnership = */ false));
+        }
+#else
+        if (pszXSD)
+#endif
         {
             std::vector<CPLString> aosErrors;
             const CPLErr eErrClass = CPLGetLastErrorType();
@@ -241,6 +306,11 @@ bool GMLASConfiguration::Load(const char *pszFilename)
                 CPLErrorSetState(eErrClass, nErrNum, osErrMsg);
             }
         }
+
+#ifdef EMBED_RESOURCE_FILES
+        if (!osTmpFilename.empty())
+            VSIUnlink(osTmpFilename.c_str());
+#endif
     }
 
     m_bAllowRemoteSchemaDownload =
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp
index 6ca63b627d09..4e2261d76a56 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp
@@ -174,6 +174,18 @@ OGRGMLASDataSource::OGRGMLASDataSource()
     }
 }
 
+/************************************************************************/
+/*                        ~OGRGMLASDataSource()                         */
+/************************************************************************/
+
+OGRGMLASDataSource::~OGRGMLASDataSource()
+{
+    if (m_bUnlinkConfigFileAfterUse)
+    {
+        VSIUnlink(m_osConfigFile.c_str());
+    }
+}
+
 /************************************************************************/
 /*                            GetLayerCount()                           */
 /************************************************************************/
@@ -658,16 +670,14 @@ OGRGMLASDataSource::BuildXSDVector(const CPLString &osXSDFilenames)
 
 bool OGRGMLASDataSource::Open(GDALOpenInfo *poOpenInfo)
 {
-    CPLString osConfigFile = CSLFetchNameValueDef(poOpenInfo->papszOpenOptions,
-                                                  szCONFIG_FILE_OPTION, "");
-    if (osConfigFile.empty())
+    m_osConfigFile = CSLFetchNameValueDef(poOpenInfo->papszOpenOptions,
+                                          szCONFIG_FILE_OPTION, "");
+    if (m_osConfigFile.empty())
     {
-        const char *pszConfigFile =
-            CPLFindFile("gdal", szDEFAULT_CONF_FILENAME);
-        if (pszConfigFile)
-            osConfigFile = pszConfigFile;
+        m_osConfigFile =
+            GMLASConfiguration::GetDefaultConfFile(m_bUnlinkConfigFileAfterUse);
     }
-    if (osConfigFile.empty())
+    if (m_osConfigFile.empty())
     {
         CPLError(CE_Warning, CPLE_AppDefined,
                  "No configuration file found. Using hard-coded defaults");
@@ -675,7 +685,7 @@ bool OGRGMLASDataSource::Open(GDALOpenInfo *poOpenInfo)
     }
     else
     {
-        if (!m_oConf.Load(osConfigFile))
+        if (!m_oConf.Load(m_osConfigFile.c_str()))
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Loading of configuration failed");
@@ -866,7 +876,7 @@ bool OGRGMLASDataSource::Open(GDALOpenInfo *poOpenInfo)
 
     const std::set<CPLString> &oSetSchemaURLs = oAnalyzer.GetSchemaURLS();
 
-    FillOtherMetadataLayer(poOpenInfo, osConfigFile, aoXSDs, oSetSchemaURLs);
+    FillOtherMetadataLayer(poOpenInfo, m_osConfigFile, aoXSDs, oSetSchemaURLs);
 
     if (CPLFetchBool(poOpenInfo->papszOpenOptions,
                      szEXPOSE_METADATA_LAYERS_OPTION,
diff --git a/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp b/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp
index c5c503531e1f..dd2791daf8f3 100644
--- a/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp
+++ b/ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp
@@ -234,12 +234,10 @@ bool GMLASWriter::Write(GDALProgressFunc pfnProgress, void *pProgressData)
     // Load configuration file
     CPLString osConfigFile =
         m_aosOptions.FetchNameValueDef(szCONFIG_FILE_OPTION, "");
+    bool bUnlinkAfterUse = false;
     if (osConfigFile.empty())
     {
-        const char *pszConfigFile =
-            CPLFindFile("gdal", szDEFAULT_CONF_FILENAME);
-        if (pszConfigFile)
-            osConfigFile = pszConfigFile;
+        osConfigFile = GMLASConfiguration::GetDefaultConfFile(bUnlinkAfterUse);
     }
     if (osConfigFile.empty())
     {
@@ -249,7 +247,10 @@ bool GMLASWriter::Write(GDALProgressFunc pfnProgress, void *pProgressData)
     }
     else
     {
-        if (!m_oConf.Load(osConfigFile))
+        const bool bOK = m_oConf.Load(osConfigFile);
+        if (bUnlinkAfterUse)
+            VSIUnlink(osConfigFile.c_str());
+        if (!bOK)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "Loading of configuration failed");

From e75028df6e6a5f57f7c76b24300ef4e2daa07059 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 14:53:19 +0200
Subject: [PATCH 16/87] MiraMon: embed MM_m_idofic.csv if EMBED_RESOURCE_FILES

---
 ogr/ogrsf_frmts/miramon/CMakeLists.txt       | 23 +++++---
 ogr/ogrsf_frmts/miramon/embedded_resources.c | 13 +++++
 ogr/ogrsf_frmts/miramon/embedded_resources.h | 10 ++++
 ogr/ogrsf_frmts/miramon/mm_wrlayr.c          | 57 +++++++++++++++-----
 4 files changed, 82 insertions(+), 21 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/miramon/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/miramon/embedded_resources.h

diff --git a/ogr/ogrsf_frmts/miramon/CMakeLists.txt b/ogr/ogrsf_frmts/miramon/CMakeLists.txt
index aac8dccc64cb..f1ccb0ec4108 100644
--- a/ogr/ogrsf_frmts/miramon/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/miramon/CMakeLists.txt
@@ -5,10 +5,19 @@ add_gdal_driver(
 gdal_standard_includes(ogr_MiraMon)
 target_include_directories(ogr_MiraMon PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/MM_m_idofic.csv
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/MM_m_idofic.csv
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_MiraMon OGR_ENABLE_DRIVER_MIRAMON_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_MiraMon PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
diff --git a/ogr/ogrsf_frmts/miramon/embedded_resources.c b/ogr/ogrsf_frmts/miramon/embedded_resources.c
new file mode 100644
index 000000000000..551bfeed1c6b
--- /dev/null
+++ b/ogr/ogrsf_frmts/miramon/embedded_resources.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char MM_m_idofic_csv[] = {
+#embed "data/MM_m_idofic.csv"
+    , 0};
+
+const char *MiraMonGetMM_m_idofic_csv(void)
+{
+    return MM_m_idofic_csv;
+}
diff --git a/ogr/ogrsf_frmts/miramon/embedded_resources.h b/ogr/ogrsf_frmts/miramon/embedded_resources.h
new file mode 100644
index 000000000000..3db4bf2b4415
--- /dev/null
+++ b/ogr/ogrsf_frmts/miramon/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *MiraMonGetMM_m_idofic_csv(void);
+
+CPL_C_END
diff --git a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
index 976adb4d1589..9ec93327be0c 100644
--- a/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
+++ b/ogr/ogrsf_frmts/miramon/mm_wrlayr.c
@@ -37,6 +37,10 @@
 #endif
 #endif
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 #ifdef GDAL_COMPILATION
 CPL_C_START  // Necessary for compiling in GDAL project
 #endif       // GDAL_COMPILATION
@@ -5313,7 +5317,7 @@ int MMReturnCodeFromMM_m_idofic(char *pMMSRS_or_pSRS, char *szResult,
                                 MM_BYTE direction)
 {
     char *aMMIDDBFFile = nullptr;  //m_idofic.dbf
-    FILE_TYPE *pfMMSRS;
+    FILE_TYPE *pfMMSRS = nullptr;
     const char *pszLine;
     size_t nLong;
     char *id_geodes, *psidgeodes, *epsg;
@@ -5328,7 +5332,27 @@ int MMReturnCodeFromMM_m_idofic(char *pMMSRS_or_pSRS, char *szResult,
     }
 
 #ifdef GDAL_COMPILATION
-    aMMIDDBFFile = strdup_function(CPLFindFile("gdal", "MM_m_idofic.csv"));
+    {
+#ifdef USE_ONLY_EMBEDDED_RESOURCE_FILES
+        const char *pszFilename = nullptr;
+#else
+        const char *pszFilename = CPLFindFile("gdal", "MM_m_idofic.csv");
+#endif
+#ifdef EMBED_RESOURCE_FILES
+        if (!pszFilename || EQUAL(pszFilename, "MM_m_idofic.csv"))
+        {
+            pfMMSRS = VSIFileFromMemBuffer(
+                nullptr, (GByte *)(MiraMonGetMM_m_idofic_csv()),
+                (int)(strlen(MiraMonGetMM_m_idofic_csv())),
+                /* bTakeOwnership = */ false);
+        }
+        else
+#endif
+            if (pszFilename)
+        {
+            aMMIDDBFFile = strdup_function(pszFilename);
+        }
+    }
 #else
     {
         char temp_file[MM_CPL_PATH_BUF_SIZE];
@@ -5337,22 +5361,27 @@ int MMReturnCodeFromMM_m_idofic(char *pMMSRS_or_pSRS, char *szResult,
     }
 #endif
 
-    if (!aMMIDDBFFile)
+#ifdef EMBED_RESOURCE_FILES
+    if (!pfMMSRS)
+#endif
     {
-        MMCPLError(CE_Failure, CPLE_OpenFailed,
-                   "Error opening data\\MM_m_idofic.csv.\n");
-        return 1;
-    }
+        if (!aMMIDDBFFile)
+        {
+            MMCPLError(CE_Failure, CPLE_OpenFailed,
+                       "Error opening data\\MM_m_idofic.csv.\n");
+            return 1;
+        }
 
-    // Opening the file with SRS information
-    if (nullptr == (pfMMSRS = fopen_function(aMMIDDBFFile, "r")))
-    {
+        // Opening the file with SRS information
+        if (nullptr == (pfMMSRS = fopen_function(aMMIDDBFFile, "r")))
+        {
+            free_function(aMMIDDBFFile);
+            MMCPLError(CE_Failure, CPLE_OpenFailed,
+                       "Error opening data\\MM_m_idofic.csv.\n");
+            return 1;
+        }
         free_function(aMMIDDBFFile);
-        MMCPLError(CE_Failure, CPLE_OpenFailed,
-                   "Error opening data\\MM_m_idofic.csv.\n");
-        return 1;
     }
-    free_function(aMMIDDBFFile);
 
 // Checking the header of the csv file
 #ifndef GDAL_COMPILATION

From 8fecf88dbe109347c2031491b1af4e74107e288d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 15:06:17 +0200
Subject: [PATCH 17/87] OSM: embed osmconf.ini if EMBED_RESOURCE_FILES

---
 autotest/ogr/ogr_osm.py                  |  7 ++++
 ogr/ogrsf_frmts/osm/CMakeLists.txt       | 23 +++++++----
 ogr/ogrsf_frmts/osm/embedded_resources.c | 13 ++++++
 ogr/ogrsf_frmts/osm/embedded_resources.h | 10 +++++
 ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp | 51 +++++++++++++++++++-----
 5 files changed, 88 insertions(+), 16 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/osm/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/osm/embedded_resources.h

diff --git a/autotest/ogr/ogr_osm.py b/autotest/ogr/ogr_osm.py
index 65c141a12399..70f664fc5b28 100755
--- a/autotest/ogr/ogr_osm.py
+++ b/autotest/ogr/ogr_osm.py
@@ -921,6 +921,13 @@ def test_ogr_osm_tags_json_special_characters():
 
 def test_ogr_osmconf_ini():
 
+    if "EMBED_RESOURCE_FILES=YES" in gdal.VersionInfo(
+        "BUILD_INFO"
+    ) or "USE_ONLY_EMBEDDED_RESOURCE_FILES=YES" in gdal.VersionInfo("BUILD_INFO"):
+        pytest.skip(
+            "Test cannot work with EMBED_RESOURCE_FILES=YES/USE_ONLY_EMBEDDED_RESOURCE_FILES=YES"
+        )
+
     import configparser
 
     with ogr.Open("data/osm/test_json.pbf") as ds:
diff --git a/ogr/ogrsf_frmts/osm/CMakeLists.txt b/ogr/ogrsf_frmts/osm/CMakeLists.txt
index 7b78fbc2309c..113c11917387 100644
--- a/ogr/ogrsf_frmts/osm/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/osm/CMakeLists.txt
@@ -6,13 +6,22 @@ add_gdal_driver(
   STRONG_CXX_WFLAGS)
 gdal_standard_includes(ogr_OSM)
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/osmconf.ini
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/osmconf.ini
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_OSM OGR_ENABLE_DRIVER_OSM_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_OSM PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
 
 target_include_directories(ogr_OSM PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>
                                            ${GDAL_VECTOR_FORMAT_SOURCE_DIR}/sqlite)
diff --git a/ogr/ogrsf_frmts/osm/embedded_resources.c b/ogr/ogrsf_frmts/osm/embedded_resources.c
new file mode 100644
index 000000000000..d00fad3be189
--- /dev/null
+++ b/ogr/ogrsf_frmts/osm/embedded_resources.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char osmconf_ini[] = {
+#embed "data/osmconf.ini"
+    , 0};
+
+const char *OSMGetOSMConfIni(void)
+{
+    return osmconf_ini;
+}
diff --git a/ogr/ogrsf_frmts/osm/embedded_resources.h b/ogr/ogrsf_frmts/osm/embedded_resources.h
new file mode 100644
index 000000000000..41f5e64879d3
--- /dev/null
+++ b/ogr/ogrsf_frmts/osm/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *OSMGetOSMConfIni(void);
+
+CPL_C_END
diff --git a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
index 82b2c0138824..f8ca69fb883a 100644
--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
@@ -52,6 +52,10 @@
 #include "ogr_swq.h"
 #include "sqlite3.h"
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 #undef SQLITE_STATIC
 #define SQLITE_STATIC (static_cast<sqlite3_destructor_type>(nullptr))
 
@@ -3356,23 +3360,52 @@ void OGROSMDataSource::AddComputedAttributes(
 
 bool OGROSMDataSource::ParseConf(CSLConstList papszOpenOptionsIn)
 {
+    VSILFILE *fpConf = nullptr;
+
     const char *pszFilename =
         CSLFetchNameValueDef(papszOpenOptionsIn, "CONFIG_FILE",
                              CPLGetConfigOption("OSM_CONFIG_FILE", nullptr));
-    if (pszFilename == nullptr)
-        pszFilename = CPLFindFile("gdal", "osmconf.ini");
     if (pszFilename == nullptr)
     {
-        CPLError(CE_Warning, CPLE_AppDefined,
-                 "Cannot find osmconf.ini configuration file");
-        return false;
+#if !defined(USE_ONLY_EMBEDDED_RESOURCE_FILES)
+        pszFilename = CPLFindFile("gdal", "osmconf.ini");
+#endif
+#ifdef EMBED_RESOURCE_FILES
+        if (!pszFilename || EQUAL(pszFilename, "osmconf.ini"))
+        {
+            static const bool bOnce [[maybe_unused]] = []()
+            {
+                CPLDebug("OSM", "Using embedded osmconf.ini");
+                return true;
+            }();
+            fpConf = VSIFileFromMemBuffer(
+                nullptr,
+                const_cast<GByte *>(
+                    reinterpret_cast<const GByte *>(OSMGetOSMConfIni())),
+                static_cast<int>(strlen(OSMGetOSMConfIni())),
+                /* bTakeOwnership = */ false);
+        }
+#else
+        if (!pszFilename)
+        {
+            CPLError(CE_Warning, CPLE_AppDefined,
+                     "Cannot find osmconf.ini configuration file");
+            return false;
+        }
+#endif
     }
 
-    m_osConfigFile = pszFilename;
+    if (pszFilename)
+        m_osConfigFile = pszFilename;
 
-    VSILFILE *fpConf = VSIFOpenL(pszFilename, "rb");
-    if (fpConf == nullptr)
-        return false;
+#if defined(EMBED_RESOURCE_FILES)
+    if (!fpConf)
+#endif
+    {
+        fpConf = VSIFOpenL(pszFilename, "rb");
+        if (fpConf == nullptr)
+            return false;
+    }
 
     const char *pszLine = nullptr;
     int iCurLayer = -1;

From 7838e5c8248f2c35ab600b32a6397b5034ee3ca7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 15:17:35 +0200
Subject: [PATCH 18/87] PLScenes: embed plscenesconf.json if
 EMBED_RESOURCE_FILES

---
 ogr/ogrsf_frmts/plscenes/CMakeLists.txt       | 23 +++++++++-----
 ogr/ogrsf_frmts/plscenes/embedded_resources.c | 13 ++++++++
 ogr/ogrsf_frmts/plscenes/embedded_resources.h | 10 +++++++
 .../plscenes/ogrplscenesdatav1layer.cpp       | 30 ++++++++++++++++---
 4 files changed, 65 insertions(+), 11 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/plscenes/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/plscenes/embedded_resources.h

diff --git a/ogr/ogrsf_frmts/plscenes/CMakeLists.txt b/ogr/ogrsf_frmts/plscenes/CMakeLists.txt
index 7f378eae5747..ca9ef9456483 100644
--- a/ogr/ogrsf_frmts/plscenes/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/plscenes/CMakeLists.txt
@@ -13,13 +13,22 @@ if(NOT TARGET ogr_PLSCENES)
     return()
 endif()
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/plscenesconf.json
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/plscenesconf.json
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_PLSCENES OGR_ENABLE_DRIVER_PLSCENES_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_PLSCENES PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
 
 gdal_standard_includes(ogr_PLSCENES)
 
diff --git a/ogr/ogrsf_frmts/plscenes/embedded_resources.c b/ogr/ogrsf_frmts/plscenes/embedded_resources.c
new file mode 100644
index 000000000000..2fb62826e168
--- /dev/null
+++ b/ogr/ogrsf_frmts/plscenes/embedded_resources.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char plscenesconf_json[] = {
+#embed "data/plscenesconf.json"
+    , 0};
+
+const char *PLScenesGetConfJson(void)
+{
+    return plscenesconf_json;
+}
diff --git a/ogr/ogrsf_frmts/plscenes/embedded_resources.h b/ogr/ogrsf_frmts/plscenes/embedded_resources.h
new file mode 100644
index 000000000000..3cab682f245a
--- /dev/null
+++ b/ogr/ogrsf_frmts/plscenes/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *PLScenesGetConfJson(void);
+
+CPL_C_END
diff --git a/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp b/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp
index 88cf5fc84921..ddf6df8d4312 100644
--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp
+++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesdatav1layer.cpp
@@ -16,6 +16,10 @@
 #include "ogrgeojsonwriter.h"
 #include <algorithm>
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 /************************************************************************/
 /*                           GetFieldCount()                            */
 /************************************************************************/
@@ -106,21 +110,39 @@ void OGRPLScenesDataV1Layer::EstablishLayerDefn()
         return;
     m_bFeatureDefnEstablished = true;
 
-    const char *pszConfFile = CPLFindFile("gdal", "plscenesconf.json");
+    const char *pzText = nullptr;
+    const char *pszConfFile = nullptr;
+#if !defined(USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    pszConfFile = CPLFindFile("gdal", "plscenesconf.json");
     if (pszConfFile == nullptr)
+#endif
     {
+#ifdef EMBED_RESOURCE_FILES
+        static const bool bOnce [[maybe_unused]] = []()
+        {
+            CPLDebug("PLScenes", "Using embedded plscenes.conf");
+            return true;
+        }();
+        pzText = PLScenesGetConfJson();
+#else
         CPLError(CE_Failure, CPLE_AppDefined, "Cannot find plscenesconf.json");
         return;
+#endif
     }
 
     GByte *pabyRet = nullptr;
-    if (!VSIIngestFile(nullptr, pszConfFile, &pabyRet, nullptr, -1))
+#ifdef EMBED_RESOURCE_FILES
+    if (!pzText)
+#endif
     {
-        return;
+        if (!VSIIngestFile(nullptr, pszConfFile, &pabyRet, nullptr, -1))
+        {
+            return;
+        }
+        pzText = reinterpret_cast<char *>(pabyRet);
     }
 
     json_object *poRoot = nullptr;
-    const char *pzText = reinterpret_cast<char *>(pabyRet);
     if (!OGRJSonParse(pzText, &poRoot))
     {
         VSIFree(pabyRet);

From a9a5b7a236ac5b3409880f5f4e70fd7dc4ab6461 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 15:28:10 +0200
Subject: [PATCH 19/87] S57: embed S57 CSV files if EMBED_RESOURCE_FILES

---
 ogr/ogrsf_frmts/s57/CMakeLists.txt        | 29 +++++++++++++-------
 ogr/ogrsf_frmts/s57/embedded_resources.c  | 33 +++++++++++++++++++++++
 ogr/ogrsf_frmts/s57/embedded_resources.h  | 10 +++++++
 ogr/ogrsf_frmts/s57/s57classregistrar.cpp | 33 ++++++++++++++++++++++-
 4 files changed, 94 insertions(+), 11 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/s57/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/s57/embedded_resources.h

diff --git a/ogr/ogrsf_frmts/s57/CMakeLists.txt b/ogr/ogrsf_frmts/s57/CMakeLists.txt
index 197481208910..d8e05a950446 100644
--- a/ogr/ogrsf_frmts/s57/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/s57/CMakeLists.txt
@@ -16,16 +16,25 @@ add_gdal_driver(
 target_include_directories(ogr_S57 PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
 gdal_standard_includes(ogr_S57)
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/s57agencies.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/s57attributes.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/s57expectedinput.csv
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/s57objectclasses.csv
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/s57agencies.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/s57attributes.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/s57expectedinput.csv
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/s57objectclasses.csv
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_S57 OGR_ENABLE_DRIVER_S57_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
 
 add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp)
 gdal_standard_includes(s57dump)
diff --git a/ogr/ogrsf_frmts/s57/embedded_resources.c b/ogr/ogrsf_frmts/s57/embedded_resources.c
new file mode 100644
index 000000000000..6d59db32dddb
--- /dev/null
+++ b/ogr/ogrsf_frmts/s57/embedded_resources.c
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char s57agencies_csv[] = {
+#embed "data/s57agencies.csv"
+    , 0};
+
+static const char s57attributes_csv[] = {
+#embed "data/s57attributes.csv"
+    , 0};
+
+static const char s57expectedinput_csv[] = {
+#embed "data/s57expectedinput.csv"
+    , 0};
+
+static const char s57objectclasses_csv[] = {
+#embed "data/s57objectclasses.csv"
+    , 0};
+
+const char *S57GetEmbeddedCSV(const char *pszFilename)
+{
+    if (EQUAL(pszFilename, "s57agencies.csv"))
+        return s57agencies_csv;
+    if (EQUAL(pszFilename, "s57attributes.csv"))
+        return s57attributes_csv;
+    if (EQUAL(pszFilename, "s57expectedinput.csv"))
+        return s57expectedinput_csv;
+    if (EQUAL(pszFilename, "s57objectclasses.csv"))
+        return s57objectclasses_csv;
+    return NULL;
+}
diff --git a/ogr/ogrsf_frmts/s57/embedded_resources.h b/ogr/ogrsf_frmts/s57/embedded_resources.h
new file mode 100644
index 000000000000..9efbc50a4152
--- /dev/null
+++ b/ogr/ogrsf_frmts/s57/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *S57GetEmbeddedCSV(const char *pszFilename);
+
+CPL_C_END
diff --git a/ogr/ogrsf_frmts/s57/s57classregistrar.cpp b/ogr/ogrsf_frmts/s57/s57classregistrar.cpp
index c5ff24ddda5d..1b6da0c11d33 100644
--- a/ogr/ogrsf_frmts/s57/s57classregistrar.cpp
+++ b/ogr/ogrsf_frmts/s57/s57classregistrar.cpp
@@ -20,6 +20,10 @@
 #include "s57tables.h"
 #endif
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 /************************************************************************/
 /*                         S57ClassRegistrar()                          */
 /************************************************************************/
@@ -81,18 +85,45 @@ bool S57ClassRegistrar::FindFile(const char *pszTarget,
 {
     const char *pszFilename = nullptr;
 
+    *pfp = nullptr;
+
     if (pszDirectory == nullptr)
     {
+#if defined(USE_ONLY_EMBEDDED_RESOURCE_FILES)
+        pszFilename = pszTarget;
+#else
         pszFilename = CPLFindFile("s57", pszTarget);
         if (pszFilename == nullptr)
             pszFilename = pszTarget;
+#endif
+        if (EQUAL(pszFilename, pszTarget))
+        {
+#ifdef EMBED_RESOURCE_FILES
+            const char *pszContent = S57GetEmbeddedCSV(pszTarget);
+            if (pszContent)
+            {
+                CPLDebug("S57", "Using embedded %s", pszTarget);
+                *pfp = VSIFileFromMemBuffer(
+                    nullptr,
+                    const_cast<GByte *>(
+                        reinterpret_cast<const GByte *>(pszContent)),
+                    static_cast<int>(strlen(pszContent)),
+                    /* bTakeOwnership = */ false);
+            }
+#endif
+        }
     }
     else
     {
         pszFilename = CPLFormFilename(pszDirectory, pszTarget, nullptr);
     }
 
-    *pfp = VSIFOpenL(pszFilename, "rb");
+#ifdef EMBED_RESOURCE_FILES
+    if (!(*pfp))
+#endif
+    {
+        *pfp = VSIFOpenL(pszFilename, "rb");
+    }
 
 #ifdef S57_BUILTIN_CLASSES
     if (*pfp == NULL)

From 91b8819771f5f8ea86e0cfad268a97485f88f459 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 15:29:29 +0200
Subject: [PATCH 20/87] S57: remove previous mechanism to embed part of the CSV
 files

---
 ogr/ogrsf_frmts/s57/CMakeLists.txt        |   1 -
 ogr/ogrsf_frmts/s57/s57classregistrar.cpp |  14 -
 ogr/ogrsf_frmts/s57/s57tables.h           | 848 ----------------------
 ogr/ogrsf_frmts/s57/s57tables.py          |  55 --
 4 files changed, 918 deletions(-)
 delete mode 100644 ogr/ogrsf_frmts/s57/s57tables.h
 delete mode 100755 ogr/ogrsf_frmts/s57/s57tables.py

diff --git a/ogr/ogrsf_frmts/s57/CMakeLists.txt b/ogr/ogrsf_frmts/s57/CMakeLists.txt
index d8e05a950446..36eb96ffd629 100644
--- a/ogr/ogrsf_frmts/s57/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/s57/CMakeLists.txt
@@ -2,7 +2,6 @@ add_gdal_driver(
   TARGET ogr_S57
   SOURCES ogr_s57.h
           s57.h
-          s57tables.h
           ogrs57driver.cpp
           ogrs57datasource.cpp
           ogrs57layer.cpp
diff --git a/ogr/ogrsf_frmts/s57/s57classregistrar.cpp b/ogr/ogrsf_frmts/s57/s57classregistrar.cpp
index 1b6da0c11d33..18f66cc04fec 100644
--- a/ogr/ogrsf_frmts/s57/s57classregistrar.cpp
+++ b/ogr/ogrsf_frmts/s57/s57classregistrar.cpp
@@ -16,10 +16,6 @@
 #include "cpl_string.h"
 #include "s57.h"
 
-#ifdef S57_BUILTIN_CLASSES
-#include "s57tables.h"
-#endif
-
 #ifdef EMBED_RESOURCE_FILES
 #include "embedded_resources.h"
 #endif
@@ -125,15 +121,6 @@ bool S57ClassRegistrar::FindFile(const char *pszTarget,
         *pfp = VSIFOpenL(pszFilename, "rb");
     }
 
-#ifdef S57_BUILTIN_CLASSES
-    if (*pfp == NULL)
-    {
-        if (EQUAL(pszTarget, "s57objectclasses.csv"))
-            papszNextLine = gpapszS57Classes;
-        else
-            papszNextLine = gpapszS57attributes;
-    }
-#else
     if (*pfp == nullptr)
     {
         if (bReportErr)
@@ -141,7 +128,6 @@ bool S57ClassRegistrar::FindFile(const char *pszTarget,
                      pszFilename);
         return FALSE;
     }
-#endif
 
     return TRUE;
 }
diff --git a/ogr/ogrsf_frmts/s57/s57tables.h b/ogr/ogrsf_frmts/s57/s57tables.h
deleted file mode 100644
index 8fc53c5060a3..000000000000
--- a/ogr/ogrsf_frmts/s57/s57tables.h
+++ /dev/null
@@ -1,848 +0,0 @@
-/******************************************************************************
- * $Id$
- *
- * Project:  S-57 Translator
- * Purpose:  Inline tables.
- * Author:   Frank Warmerdam, warmerdam@pobox.com
- *
- ******************************************************************************
- * Copyright (c) 1999, 2001, Frank Warmerdam
- *
- * SPDX-License-Identifier: MIT
- *****************************************************************************/
-
-// Only included in s57classregistrar.cpp.
-
-static const char *gpapszS57Classes[] = {
-    "\"Code\",\"ObjectClass\",\"Acronym\",\"Attribute_A\",\"Attribute_B\","
-    "\"Attribute_C\",\"Class\",\"Primitives\"",
-    "1,Administration area "
-    "(Named),ADMARE,JRSDTN;NATION;NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;PICREP;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "2,Airport / "
-    "airfield,AIRARE,CATAIR;CONDTN;CONVIS;NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;"
-    "Area;",
-    "3,Anchor "
-    "berth,ACHBRT,CATACH;DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;RADIUS;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;Area;",
-    "4,Anchorage "
-    "area,ACHARE,CATACH;DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;RESTRN;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;Area;",
-    "5,\"Beacon, "
-    "cardinal\",BCNCAR,BCNSHP;CATCAM;COLOUR;COLPAT;CONDTN;CONVIS;CONRAD;DATEND;"
-    "DATSTA;ELEVAT;HEIGHT;MARSYS;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;"
-    "VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "6,\"Beacon, isolated "
-    "danger\",BCNISD,BCNSHP;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;"
-    "ELEVAT;HEIGHT;MARSYS;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;"
-    "VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,G,Point;",
-    "7,\"Beacon, "
-    "lateral\",BCNLAT,BCNSHP;CATLAM;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;"
-    "DATSTA;ELEVAT;HEIGHT;MARSYS;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;"
-    "VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "8,\"Beacon, safe "
-    "water\",BCNSAW,BCNSHP;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;"
-    "ELEVAT;HEIGHT;MARSYS;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;"
-    "VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,G,Point;",
-    "9,\"Beacon, special "
-    "purpose/"
-    "general\",BCNSPP,BCNSHP;CATSPM;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;"
-    "DATSTA;ELEVAT;HEIGHT;MARSYS;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;"
-    "VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "10,Berth,BERTHS,DATEND;DATSTA;DRVAL1;NOBJNM;OBJNAM;PEREND;PERSTA;QUASOU;"
-    "SOUACC;STATUS;VERDAT;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "11,Bridge,BRIDGE,CATBRG;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;"
-    "HORACC;HORCLR;NATCON;NOBJNM;OBJNAM;VERACC;VERCCL;VERCLR;VERCOP;VERDAT;,"
-    "INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;Line;Area;",
-    "12,\"Building, "
-    "single\",BUISGL,BUISHP;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;ELEVAT;FUNCTN;"
-    "HEIGHT;NATCON;NOBJNM;OBJNAM;STATUS;VERACC;VERDAT;VERLEN;,INFORM;NINFOM;"
-    "NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;"
-    "Area;",
-    "13,Built-up "
-    "area,BUAARE,CATBUA;CONDTN;CONRAD;CONVIS;HEIGHT;NOBJNM;OBJNAM;VERACC;"
-    "VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;Area;",
-    "14,\"Buoy, "
-    "cardinal\",BOYCAR,BOYSHP;CATCAM;COLOUR;COLPAT;CONRAD;DATEND;DATSTA;MARSYS;"
-    "NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;VERLEN;,INFORM;NINFOM;"
-    "NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "15,\"Buoy, "
-    "installation\",BOYINB,BOYSHP;CATINB;COLOUR;COLPAT;CONRAD;DATEND;DATSTA;"
-    "MARSYS;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;PRODCT;STATUS;VERACC;VERLEN;,"
-    "INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;",
-    "16,\"Buoy, isolated "
-    "danger\",BOYISD,BOYSHP;COLOUR;COLPAT;CONRAD;DATEND;DATSTA;MARSYS;NATCON;"
-    "NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;VERLEN;,INFORM;NINFOM;NTXTDS;"
-    "PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "17,\"Buoy, "
-    "lateral\",BOYLAT,BOYSHP;CATLAM;COLOUR;COLPAT;CONRAD;DATEND;DATSTA;MARSYS;"
-    "NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;VERLEN;,INFORM;NINFOM;"
-    "NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "18,\"Buoy, safe "
-    "water\",BOYSAW,BOYSHP;COLOUR;COLPAT;CONRAD;DATEND;DATSTA;MARSYS;NATCON;"
-    "NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;VERLEN;,INFORM;NINFOM;NTXTDS;"
-    "PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "19,\"Buoy, special "
-    "purpose/"
-    "general\",BOYSPP,BOYSHP;CATSPM;COLOUR;COLPAT;CONRAD;DATEND;DATSTA;MARSYS;"
-    "NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;VERLEN;,INFORM;NINFOM;"
-    "NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "20,Cable "
-    "area,CBLARE,CATCBL;DATEND;DATSTA;NOBJNM;OBJNAM;RESTRN;STATUS;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "21,\"Cable, "
-    "overhead\",CBLOHD,CATCBL;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;ICEFAC;NOBJNM;"
-    "OBJNAM;STATUS;VERACC;VERCLR;VERCSA;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "22,\"Cable, "
-    "submarine\",CBLSUB,BURDEP;CATCBL;CONDTN;DATEND;DATSTA;NOBJNM;OBJNAM;"
-    "STATUS;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Line;",
-    "23,Canal,CANALS,CATCAN;CONDTN;DATEND;DATSTA;HORACC;HORCLR;HORWID;NOBJNM;"
-    "OBJNAM;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Line;Area;",
-    "24,Canal "
-    "bank,CANBNK,CONDTN;DATEND;DATSTA;NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;Area;",
-    "25,Cargo transshipment "
-    "area,CTSARE,DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;,INFORM;"
-    "NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,"
-    "Point;Area;",
-    "26,Causeway,CAUSWY,CONDTN;NATCON;NOBJNM;OBJNAM;STATUS;WATLEV;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;"
-    "Area;",
-    "27,Caution "
-    "area,CTNARE,DATEND;DATSTA;PEREND;PERSTA;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "28,Checkpoint,CHKPNT,CATCHP;NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "29,Coastguard "
-    "station,CGUSTA,DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "30,Coastline,COALNE,CATCOA;COLOUR;CONRAD;CONVIS;ELEVAT;NOBJNM;OBJNAM;"
-    "VERACC;VERDAT;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,G,Line;",
-    "31,Contiguous "
-    "zone,CONZNE,DATEND;DATSTA;NATION;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "32,Continental shelf "
-    "area,COSARE,NATION;NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "33,Control "
-    "point,CTRPNT,CATCTR;DATEND;DATSTA;ELEVAT;NOBJNM;OBJNAM;VERACC;VERDAT;,"
-    "INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;",
-    "34,Conveyor,CONVYR,CATCON;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;"
-    "DATSTA;HEIGHT;LIFCAP;NOBJNM;OBJNAM;PRODCT;STATUS;VERACC;VERCLR;VERDAT;"
-    "VERLEN;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Line;Area;",
-    "35,Crane,CRANES,CATCRN;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;HEIGHT;LIFCAP;"
-    "NOBJNM;OBJNAM;ORIENT;RADIUS;STATUS;VERACC;VERCLR;VERDAT;VERLEN;,INFORM;"
-    "NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,"
-    "Point;Area;",
-    "36,Current - non - "
-    "gravitational,CURENT,CURVEL;DATEND;DATSTA;NOBJNM;OBJNAM;ORIENT;PEREND;"
-    "PERSTA;,INFORM;NINFOM;SCAMAX;SCAMIN;,RECDAT;RECIND;SORDAT;SORIND;,G,"
-    "Point;",
-    "37,Custom "
-    "zone,CUSZNE,NATION;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,G,Area;",
-    "38,Dam,DAMCON,CATDAM;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;"
-    "HEIGHT;NATCON;NOBJNM;OBJNAM;VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "39,Daymark,DAYMAR,CATSPM;COLOUR;COLPAT;DATEND;DATSTA;ELEVAT;HEIGHT;NATCON;"
-    "NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;TOPSHP;VERACC;VERDAT;VERLEN;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "40,Deep water route "
-    "centerline,DWRTCL,CATTRK;DATEND;DATSTA;DRVAL1;DRVAL2;NOBJNM;OBJNAM;ORIENT;"
-    "QUASOU;SOUACC;STATUS;TECSOU;TRAFIC;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "41,Deep water route "
-    "part,DWRTPT,DATEND;DATSTA;DRVAL1;DRVAL2;NOBJNM;OBJNAM;ORIENT;QUASOU;"
-    "SOUACC;STATUS;TECSOU;TRAFIC;VERDAT;RESTRN;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "42,Depth "
-    "area,DEPARE,DRVAL1;DRVAL2;QUASOU;SOUACC;VERDAT;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;Area;",
-    "43,Depth "
-    "contour,DEPCNT,VALDCO;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "44,Distance "
-    "mark,DISMAR,CATDIS;DATEND;DATSTA;NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "45,Dock "
-    "area,DOCARE,CATDOC;CONDTN;DATEND;DATSTA;HORACC;HORCLR;NOBJNM;OBJNAM;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Area;",
-    "46,Dredged "
-    "area,DRGARE,DRVAL1;DRVAL2;NOBJNM;OBJNAM;QUASOU;RESTRN;SOUACC;TECSOU;"
-    "VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Area;",
-    "47,Dry "
-    "dock,DRYDOC,CONDTN;HORACC;HORCLR;HORLEN;HORWID;NOBJNM;OBJNAM;STATUS;"
-    "DRVAL1;QUASOU;SOUACC;VERDAT;,INFORM;NINFOM;SCAMAX;SCAMIN;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Area;",
-    "48,Dumping "
-    "ground,DMPGRD,CATDPG;NOBJNM;OBJNAM;RESTRN;STATUS;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "49,Dyke,DYKCON,CONDTN;CONRAD;DATEND;DATSTA;HEIGHT;NATCON;VERACC;VERDAT;"
-    "VERLEN;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Line;Area;",
-    "50,Exclusive Economic "
-    "Zone,EXEZNE,NATION;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,G,Area;",
-    "51,Fairway,FAIRWY,DATEND;DATSTA;DRVAL1;NOBJNM;OBJNAM;ORIENT;QUASOU;RESTRN;"
-    "SOUACC;STATUS;TRAFIC;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "52,Fence/"
-    "wall,FNCLNE,CATFNC;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;ELEVAT;HEIGHT;"
-    "NATCON;NOBJNM;OBJNAM;STATUS;VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;"
-    "PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "53,Ferry "
-    "route,FERYRT,CATFRY;DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;,"
-    "INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,"
-    "Line;Area;",
-    "54,Fishery "
-    "zone,FSHZNE,NATION;NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "55,Fishing "
-    "facility,FSHFAC,CATFIF;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;VERLEN;,"
-    "INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,"
-    "Point;Line;Area;",
-    "56,Fishing "
-    "ground,FSHGRD,NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "57,Floating "
-    "dock,FLODOC,COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;DRVAL1;"
-    "HORACC;HORCLR;HORLEN;HORWID;LIFCAP;NOBJNM;OBJNAM;STATUS;VERACC;VERLEN;"
-    "VERDAT;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Line;Area;",
-    "58,Fog "
-    "signal,FOGSIG,CATFOG;DATEND;DATSTA;NOBJNM;OBJNAM;SIGFRQ;SIGGEN;SIGGRP;"
-    "SIGPER;SIGSEQ;STATUS;VALMXR;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "59,Fortified "
-    "structure,FORSTC,CATFOR;CONDTN;CONRAD;CONVIS;HEIGHT;NATCON;NOBJNM;OBJNAM;"
-    "VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "60,Free port "
-    "area,FRPARE,NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "61,Gate,GATCON,CATGAT;CONDTN;DRVAL1;HORACC;HORCLR;NATCON;NOBJNM;OBJNAM;"
-    "QUASOU;SOUACC;STATUS;VERACC;VERCLR;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "62,Gridiron,GRIDRN,HORACC;HORLEN;HORWID;NATCON;NOBJNM;OBJNAM;STATUS;"
-    "VERACC;VERLEN;WATLEV;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "63,Harbour area "
-    "(administrative),HRBARE,NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "64,Harbour "
-    "facility,HRBFAC,CATHAF;CONDTN;DATEND;DATSTA;NATCON;NOBJNM;OBJNAM;PEREND;"
-    "PERSTA;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Point;Area;",
-    "65,Hulk,HULKES,CATHLK;COLOUR;COLPAT;CONRAD;CONVIS;HORACC;HORLEN;HORWID;"
-    "NOBJNM;OBJNAM;VERACC;VERLEN;CONDTN;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "66,Ice "
-    "area,ICEARE,CATICE;CONVIS;ELEVAT;HEIGHT;NOBJNM;OBJNAM;PEREND;PERSTA;"
-    "STATUS;VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "67,Incineration "
-    "area,ICNARE,NOBJNM;OBJNAM;PEREND;PERSTA;RESTRN;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "68,Inshore traffic "
-    "zone,ISTZNE,CATTSS;DATEND;DATSTA;RESTRN;STATUS;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "69,Lake,LAKARE,ELEVAT;NOBJNM;OBJNAM;VERACC;VERDAT;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "70,Lake "
-    "shore,LAKSHR,NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Line;Area;",
-    "71,Land "
-    "area,LNDARE,CONDTN;NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "72,Land "
-    "elevation,LNDELV,CONVIS;ELEVAT;NOBJNM;OBJNAM;VERACC;VERDAT;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;",
-    "73,Land "
-    "region,LNDRGN,CATLND;NATQUA;NATSUR;NOBJNM;OBJNAM;WATLEV;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "74,Landmark,LNDMRK,CATLMK;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;ELEVAT;"
-    "FUNCTN;HEIGHT;NATCON;NOBJNM;OBJNAM;STATUS;VERACC;VERDAT;VERLEN;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;"
-    "Line;Area;",
-    "75,Light,LIGHTS,CATLIT;COLOUR;DATEND;DATSTA;EXCLIT;HEIGHT;LITCHR;LITVIS;"
-    "MARSYS;MLTYLT;NOBJNM;OBJNAM;ORIENT;PEREND;PERSTA;SECTR1;SECTR2;SIGGRP;"
-    "SIGPER;SIGSEQ;STATUS;VERACC;VALNMR;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "76,Light "
-    "float,LITFLT,COLOUR;COLPAT;CONRAD;CONVIS;DATEND;DATSTA;HORACC;HORLEN;"
-    "HORWID;MARSYS;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;VERLEN;,"
-    "INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;",
-    "77,Light "
-    "vessel,LITVES,COLOUR;COLPAT;CONRAD;CONVIS;DATEND;DATSTA;HORACC;HORLEN;"
-    "HORWID;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;VERLEN;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "78,Local magnetic "
-    "anomaly,LOCMAG,NOBJNM;OBJNAM;VALLMA;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "79,Lock "
-    "basin,LOKBSN,DATEND;DATSTA;HORACC;HORCLR;HORLEN;HORWID;NOBJNM;OBJNAM;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Area;",
-    "80,Log "
-    "pond,LOGPON,NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "81,Magnetic "
-    "variation,MAGVAR,DATEND;DATSTA;RYRMGV;VALACM;VALMAG;,INFORM;NINFOM;SCAMAX;"
-    "SCAMIN;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "82,Marine "
-    "farm/"
-    "culture,MARCUL,CATMFA;DATEND;DATSTA;EXPSOU;NOBJNM;OBJNAM;PEREND;PERSTA;"
-    "QUASOU;RESTRN;SOUACC;STATUS;VALSOU;VERACC;VERDAT;VERLEN;WATLEV;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;"
-    "Line;Area;",
-    "83,Military practice "
-    "area,MIPARE,CATMPA;DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;RESTRN;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;Area;",
-    "84,Mooring/warping "
-    "facility,MORFAC,BOYSHP;CATMOR;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;"
-    "DATSTA;HEIGHT;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;VERACC;VERDAT;"
-    "VERLEN;WATLEV;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "85,Navigation "
-    "line,NAVLNE,CATNAV;DATEND;DATSTA;ORIENT;PEREND;PERSTA;STATUS;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "86,Obstruction,OBSTRN,CATOBS;CONDTN;EXPSOU;HEIGHT;NATCON;NATQUA;NOBJNM;"
-    "OBJNAM;PRODCT;QUASOU;SOUACC;STATUS;TECSOU;VALSOU;VERACC;VERDAT;VERLEN;"
-    "WATLEV;NATSUR;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Point;Line;Area;",
-    "87,Offshore "
-    "platform,OFSPLF,CATOFP;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;"
-    "HEIGHT;NATCON;NOBJNM;OBJNAM;PRODCT;STATUS;VERACC;VERDAT;VERLEN;,INFORM;"
-    "NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,"
-    "Point;Area;",
-    "88,Offshore production "
-    "area,OSPARE,CATPRA;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;HEIGHT;NOBJNM;"
-    "OBJNAM;PRODCT;RESTRN;STATUS;VERACC;VERLEN;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "89,Oil "
-    "barrier,OILBAR,CATOLB;CONDTN;DATEND;DATSTA;NOBJNM;OBJNAM;STATUS;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "90,Pile,PILPNT,CATPLE;COLOUR;COLPAT;CONDTN;CONVIS;DATEND;DATSTA;HEIGHT;"
-    "NOBJNM;OBJNAM;VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "91,Pilot boarding "
-    "place,PILBOP,CATPIL;COMCHA;DATEND;DATSTA;NOBJNM;NPLDST;OBJNAM;PEREND;"
-    "PERSTA;PILDST;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "92,Pipeline "
-    "area,PIPARE,CONDTN;DATEND;DATSTA;NOBJNM;OBJNAM;PRODCT;RESTRN;STATUS;"
-    "CATPIP;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;Area;",
-    "93,\"Pipeline, "
-    "overhead\",PIPOHD,CATPIP;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;NOBJNM;OBJNAM;"
-    "PRODCT;STATUS;VERACC;VERCLR;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "94,\"Pipeline, submarine/on "
-    "land\",PIPSOL,BURDEP;CATPIP;CONDTN;DATEND;DATSTA;DRVAL1;DRVAL2;NOBJNM;"
-    "OBJNAM;PRODCT;STATUS;VERACC;VERLEN;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;",
-    "95,Pontoon,PONTON,CONDTN;CONRAD;CONVIS;DATEND;DATSTA;NATCON;NOBJNM;OBJNAM;"
-    "PEREND;PERSTA;STATUS;VERACC;VERLEN;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;Area;",
-    "96,Precautionary "
-    "area,PRCARE,DATEND;DATSTA;RESTRN;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "97,Production / storage "
-    "area,PRDARE,CATPRA;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;ELEVAT;HEIGHT;"
-    "NOBJNM;OBJNAM;PRODCT;STATUS;VERACC;VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;"
-    "PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "98,Pylon/bridge "
-    "support,PYLONS,CATPYL;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;DATSTA;"
-    "HEIGHT;NATCON;NOBJNM;OBJNAM;VERACC;VERDAT;VERLEN;WATLEV;,INFORM;NINFOM;"
-    "NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;"
-    "Area;",
-    "99,Radar "
-    "line,RADLNE,NOBJNM;OBJNAM;ORIENT;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "100,Radar "
-    "range,RADRNG,COMCHA;DATEND;DATSTA;NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "101,Radar "
-    "reflector,RADRFL,HEIGHT;STATUS;VERACC;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "102,Radar "
-    "station,RADSTA,CATRAS;DATEND;DATSTA;HEIGHT;NOBJNM;OBJNAM;STATUS;VERACC;"
-    "VALMXR;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Point;",
-    "103,Radar transponder "
-    "beacon,RTPBCN,CATRTB;DATEND;DATSTA;NOBJNM;OBJNAM;RADWAL;SECTR1;SECTR2;"
-    "SIGGRP;SIGSEQ;STATUS;VALMXR;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "104,Radio calling-in "
-    "point,RDOCAL,COMCHA;DATEND;DATSTA;NOBJNM;OBJNAM;ORIENT;PEREND;PERSTA;"
-    "STATUS;TRAFIC;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Point;Line;",
-    "105,Radio "
-    "station,RDOSTA,CALSGN;CATROS;COMCHA;DATEND;DATSTA;ESTRNG;NOBJNM;OBJNAM;"
-    "ORIENT;PEREND;PERSTA;SIGFRQ;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "106,Railway,RAILWY,CONDTN;HEIGHT;NOBJNM;OBJNAM;STATUS;VERACC;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "107,Rapids,RAPIDS,NOBJNM;OBJNAM;VERACC;VERLEN;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "108,Recommended route "
-    "centerline,RCRTCL,CATTRK;DATEND;DATSTA;DRVAL1;DRVAL2;NOBJNM;OBJNAM;ORIENT;"
-    "PEREND;PERSTA;QUASOU;SOUACC;STATUS;TECSOU;TRAFIC;VERDAT;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "109,Recommended "
-    "track,RECTRC,CATTRK;DATEND;DATSTA;DRVAL1;DRVAL2;NOBJNM;OBJNAM;ORIENT;"
-    "PEREND;PERSTA;QUASOU;SOUACC;STATUS;TECSOU;TRAFIC;VERDAT;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;Area;",
-    "110,Recommended Traffic Lane "
-    "Part,RCTLPT,DATEND;DATSTA;ORIENT;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "111,Rescue "
-    "station,RSCSTA,CATRSC;DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;,"
-    "INFORM;NINFOM;SCAMAX;SCAMIN;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "112,Restricted "
-    "area,RESARE,CATREA;DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;RESTRN;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Area;",
-    "113,Retro-reflector,RETRFL,COLOUR;COLPAT;HEIGHT;MARSYS;STATUS;VERACC;"
-    "VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;",
-    "114,River,RIVERS,NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;Area;",
-    "115,River "
-    "bank,RIVBNK,NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Line;Area;",
-    "116,Road,ROADWY,CATROD;CONDTN;NATCON;NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;"
-    "Area;",
-    "117,Runway,RUNWAY,CATRUN;CONDTN;CONVIS;NATCON;NOBJNM;OBJNAM;PEREND;PERSTA;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;Line;Area;",
-    "118,Sand "
-    "waves,SNDWAV,VERACC;VERLEN;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "119,Sea area / named water "
-    "area,SEAARE,CATSEA;NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "120,Sea-plane landing "
-    "area,SPLARE,NOBJNM;OBJNAM;PEREND;PERSTA;RESTRN;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;VALDCO;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;"
-    "Area;",
-    "121,Seabed "
-    "area,SBDARE,COLOUR;NATQUA;NATSUR;WATLEV;OBJNAM;NOBJNM;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;"
-    "Area;",
-    "122,Shoreline "
-    "Construction,SLCONS,CATSLC;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;DATEND;"
-    "DATSTA;HEIGHT;HORACC;HORCLR;HORLEN;HORWID;NATCON;NOBJNM;OBJNAM;STATUS;"
-    "VERACC;VERDAT;VERLEN;WATLEV;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "123,\"Signal station, "
-    "traffic\",SISTAT,CATSIT;COMCHA;DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;",
-    "124,\"Signal station, "
-    "warning\",SISTAW,CATSIW;COMCHA;DATEND;DATSTA;NOBJNM;OBJNAM;PEREND;PERSTA;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;",
-    "125,Silo / "
-    "tank,SILTNK,BUISHP;CATSIL;COLOUR;COLPAT;CONDTN;CONRAD;CONVIS;ELEVAT;"
-    "HEIGHT;NATCON;NOBJNM;OBJNAM;PRODCT;STATUS;VERACC;VERDAT;VERLEN;,INFORM;"
-    "NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,"
-    "Point;Area;",
-    "126,Slope "
-    "topline,SLOTOP,CATSLO;COLOUR;CONRAD;CONVIS;ELEVAT;NATCON;NATQUA;NATSUR;"
-    "NOBJNM;OBJNAM;VERACC;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "127,Sloping "
-    "ground,SLOGRD,CATSLO;COLOUR;CONRAD;CONVIS;NATCON;NATQUA;NATSUR;NOBJNM;"
-    "OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;Area;",
-    "128,Small craft "
-    "facility,SMCFAC,CATSCF;NOBJNM;OBJNAM;PEREND;PERSTA;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "129,Sounding,SOUNDG,EXPSOU;NOBJNM;OBJNAM;QUASOU;SOUACC;TECSOU;VERDAT;"
-    "STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;",
-    "130,Spring,SPRING,NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "131,Square,SQUARE,CONDTN;NATCON;NOBJNM;OBJNAM;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;"
-    "Area;",
-    "132,Straight territorial sea "
-    "baseline,STSLNE,NATION;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,G,Line;",
-    "133,Submarine transit "
-    "lane,SUBTLN,NOBJNM;OBJNAM;RESTRN;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "134,Swept "
-    "Area,SWPARE,DRVAL1;QUASOU;SOUACC;TECSOU;VERDAT;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "135,Territorial sea "
-    "area,TESARE,NATION;RESTRN;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "136,Tidal stream - harmonic "
-    "prediction,TS_PRH,NOBJNM;OBJNAM;T_MTOD;T_VAHC;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "137,Tidal stream - non-harmonic "
-    "prediction,TS_PNH,NOBJNM;OBJNAM;T_MTOD;T_THDF;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "138,Tidal stream panel "
-    "data,TS_PAD,NOBJNM;OBJNAM;TS_TSP;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "139,Tidal stream - time "
-    "series,TS_TIS,NOBJNM;OBJNAM;STATUS;TIMEND;TIMSTA;T_TINT;TS_TSV;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;"
-    "Area;",
-    "140,Tide - harmonic "
-    "prediction,T_HMON,NOBJNM;OBJNAM;T_ACWL;T_MTOD;T_VAHC;STATUS;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;"
-    "Area;",
-    "141,Tide - non-harmonic "
-    "prediction,T_NHMN,NOBJNM;OBJNAM;T_ACWL;T_MTOD;T_THDF;STATUS;,INFORM;"
-    "NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;"
-    "Area;",
-    "142,Tidal stream - time "
-    "series,T_TIMS,NOBJNM;OBJNAM;T_HWLW;T_TINT;T_TSVL;TIMEND;TIMSTA;STATUS;T_"
-    "ACWL;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,G,Point;Area;",
-    "143,Tideway,TIDEWY,NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;Area;",
-    "144,Top "
-    "mark,TOPMAR,COLOUR;COLPAT;HEIGHT;MARSYS;STATUS;TOPSHP;VERACC;VERDAT;"
-    "VERLEN;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Point;",
-    "145,Traffic Separation "
-    "Line,TSELNE,CATTSS;DATEND;DATSTA;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "146,Traffic Separation Scheme  "
-    "Boundary,TSSBND,CATTSS;DATEND;DATSTA;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Line;",
-    "147,Traffic Separation Scheme "
-    "Crossing,TSSCRS,CATTSS;DATEND;DATSTA;RESTRN;STATUS;,INFORM;NINFOM;NTXTDS;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "148,Traffic Separation Scheme  Lane "
-    "part,TSSLPT,CATTSS;DATEND;DATSTA;ORIENT;RESTRN;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "149,Traffic Separation Scheme  "
-    "Roundabout,TSSRON,CATTSS;DATEND;DATSTA;RESTRN;STATUS;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "150,Traffic Separation "
-    "Zone,TSEZNE,CATTSS;DATEND;DATSTA;STATUS;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "151,Tunnel,TUNNEL,BURDEP;CONDTN;HORACC;HORCLR;NOBJNM;OBJNAM;STATUS;VERACC;"
-    "VERCLR;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Point;Line;Area;",
-    "152,Two-way route  "
-    "part,TWRTPT,CATTRK;DATEND;DATSTA;DRVAL1;DRVAL2;ORIENT;QUASOU;SOUACC;"
-    "STATUS;TECSOU;TRAFIC;VERDAT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Area;",
-    "153,Underwater rock / awash "
-    "rock,UWTROC,EXPSOU;NATSUR;NATQUA;NOBJNM;OBJNAM;QUASOU;SOUACC;STATUS;"
-    "TECSOU;VALSOU;VERDAT;WATLEV;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,G,Point;",
-    "154,Unsurveyed "
-    "area,UNSARE,,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Area;",
-    "155,Vegetation,VEGATN,CATVEG;CONVIS;ELEVAT;HEIGHT;NOBJNM;OBJNAM;VERACC;"
-    "VERDAT;VERLEN;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,G,Point;Line;Area;",
-    "156,Water "
-    "turbulence,WATTUR,CATWAT;NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;Area;",
-    "157,Waterfall,WATFAL,CONVIS;NOBJNM;OBJNAM;VERACC;VERLEN;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Line;",
-    "158,Weed/"
-    "Kelp,WEDKLP,CATWED;NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "159,Wreck,WRECKS,CATWRK;CONRAD;CONVIS;EXPSOU;HEIGHT;NOBJNM;OBJNAM;QUASOU;"
-    "SOUACC;STATUS;TECSOU;VALSOU;VERACC;VERDAT;VERLEN;WATLEV;,INFORM;NINFOM;"
-    "NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,G,Point;Area;",
-    "160,Tidal stream - "
-    "flood/"
-    "ebb,TS_FEB,CAT_TS;CURVEL;DATEND;DATSTA;NOBJNM;OBJNAM;ORIENT;PEREND;PERSTA;"
-    ",INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,"
-    "G,Point;Area;",
-    "300,Accuracy of "
-    "data,M_ACCY,HORACC;POSACC;SOUACC;VERACC;,INFORM;NINFOM;NTXTDS;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,M,Area;",
-    "301,Compilation scale of "
-    "data,M_CSCL,CSCALE;,INFORM;NINFOM;NTXTDS;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,M,Area;",
-    "302,Coverage,M_COVR,CATCOV;,INFORM;NINFOM;,RECDAT;RECIND;SORDAT;SORIND;,M,"
-    "Area;",
-    "303,Horizontal datum of "
-    "data,M_HDAT,HORDAT;,INFORM;NINFOM;NTXTDS;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,M,Area;",
-    "304,Horizontal datum shift "
-    "parameters,M_HOPA,HORDAT;SHIPAM;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;"
-    "TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,M,Area;",
-    "305,Nautical publication "
-    "information,M_NPUB,,INFORM;NINFOM;NTXTDS;PICREP;PUBREF;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,M,Area;",
-    "306,Navigational system of "
-    "marks,M_NSYS,MARSYS;ORIENT;,INFORM;NINFOM;NTXTDS;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,M,Area;",
-    "307,Production "
-    "information,M_PROD,AGENCY;CPDATE;NATION;NMDATE;PRCTRY;,INFORM;NINFOM;"
-    "NTXTDS;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,M,Area;",
-    "308,Quality of "
-    "data,M_QUAL,CATQUA;CATZOC;DRVAL1;DRVAL2;POSACC;SOUACC;SUREND;SURSTA;"
-    "TECSOU;VERDAT;,INFORM;NINFOM;NTXTDS;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,"
-    "M,Area;",
-    "309,Sounding "
-    "datum,M_SDAT,VERDAT;,INFORM;NINFOM;NTXTDS;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,M,Area;",
-    "310,Survey "
-    "reliability,M_SREL,QUAPOS;QUASOU;SCVAL1;SCVAL2;SDISMN;SDISMX;SURATH;"
-    "SUREND;SURSTA;SURTYP;TECSOU;,INFORM;NINFOM;NTXTDS;TXTDSC;,RECDAT;RECIND;"
-    "SORDAT;SORIND;,M,Area;",
-    "311,Units of measurement of "
-    "data,M_UNIT,DUNITS;HUNITS;PUNITS;,INFORM;NINFOM;NTXTDS;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,M,Area;",
-    "312,Vertical datum of "
-    "data,M_VDAT,VERDAT;,INFORM;NINFOM;NTXTDS;TXTDSC;,RECDAT;RECIND;SORDAT;"
-    "SORIND;,M,Area;",
-    "400,Aggregation,C_AGGR,NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,C,",
-    "401,Association,C_ASSO,NOBJNM;OBJNAM;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,C,",
-    "402,Stacked on/stacked "
-    "under,C_STAC,,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;"
-    "RECIND;SORDAT;SORIND;,C,",
-    "500,Cartographic "
-    "area,$AREAS,COLOUR;ORIENT;$SCODE;$TINTS;,INFORM;NINFOM;NTXTDS;PICREP;"
-    "SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,$,",
-    "501,Cartographic "
-    "line,$LINES,$SCODE;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,"
-    "RECDAT;RECIND;SORDAT;SORIND;,$,",
-    "502,Cartographic "
-    "symbol,$CSYMB,ORIENT;$SCALE;$SCODE;,INFORM;NINFOM;NTXTDS;PICREP;SCAMAX;"
-    "SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,$,",
-    "503,Compass,$COMPS,$CSIZE;RYRMGV;VALACM;VALMAG;,INFORM;NINFOM;NTXTDS;"
-    "PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,$,",
-    "504,Text,$TEXTS,$CHARS;COLOUR;$JUSTH;$JUSTV;$NTXST;$SPACE;$TXSTR;,INFORM;"
-    "NINFOM;NTXTDS;PICREP;SCAMAX;SCAMIN;TXTDSC;,RECDAT;RECIND;SORDAT;SORIND;,$"
-    ",",
-    NULL};
-static const char *gpapszS57attributes[] = {
-    "\"Code\",\"Attribute\",\"Acronym\",\"Attributetype\",\"Class\"",
-    "1,Agency responsible for production,AGENCY,A,F",
-    "2,Beacon shape,BCNSHP,E,F",
-    "3,Building shape,BUISHP,E,F",
-    "4,Buoy shape,BOYSHP,E,F",
-    "5,Buried depth,BURDEP,F,F",
-    "6,Call sign,CALSGN,S,F",
-    "7,Category of airport/airfield,CATAIR,L,F",
-    "8,Category of anchorage,CATACH,L,F",
-    "9,Category of bridge,CATBRG,L,F",
-    "10,Category of built-up area,CATBUA,E,F",
-    "11,Category of cable,CATCBL,E,F",
-    "12,Category of canal,CATCAN,E,F",
-    "13,Category of cardinal mark,CATCAM,E,F",
-    "14,Category of checkpoint,CATCHP,E,F",
-    "15,Category of coastline,CATCOA,E,F",
-    "16,Category of control point,CATCTR,E,F",
-    "17,Category of conveyor,CATCON,E,F",
-    "18,Category of coverage,CATCOV,E,F",
-    "19,Category of crane,CATCRN,E,F",
-    "20,Category of dam,CATDAM,E,F",
-    "21,Category of distance mark,CATDIS,E,F",
-    "22,Category of dock,CATDOC,E,F",
-    "23,Category of dumping ground,CATDPG,L,F",
-    "24,Category of  fence/wall,CATFNC,E,F",
-    "25,Category of ferry,CATFRY,E,F",
-    "26,Category of  fishing  facility,CATFIF,E,F",
-    "27,Category of  fog signal,CATFOG,E,F",
-    "28,Category of  fortified structure,CATFOR,E,F",
-    "29,Category of gate,CATGAT,E,F",
-    "30,Category of harbour facility,CATHAF,L,F",
-    "31,Category of hulk,CATHLK,L,F",
-    "32,Category of  ice,CATICE,E,F",
-    "33,Category of installation buoy,CATINB,E,F",
-    "34,Category of land region,CATLND,L,F",
-    "35,Category of landmark,CATLMK,L,F",
-    "36,Category of lateral mark,CATLAM,E,F",
-    "37,Category of light,CATLIT,L,F",
-    "38,Category of marine farm/culture,CATMFA,E,F",
-    "39,Category of military practice area,CATMPA,L,F",
-    "40,Category of mooring/warping facility,CATMOR,E,F",
-    "41,Category of navigation line,CATNAV,E,F",
-    "42,Category of obstruction,CATOBS,E,F",
-    "43,Category of offshore platform,CATOFP,L,F",
-    "44,Category of oil barrier,CATOLB,E,F",
-    "45,Category of pile,CATPLE,E,F",
-    "46,Category of pilot boarding place,CATPIL,E,F",
-    "47,Category of pipeline / pipe,CATPIP,L,F",
-    "48,Category of production area,CATPRA,E,F",
-    "49,Category of pylon,CATPYL,E,F",
-    "50,Category of quality of data,CATQUA,E,F",
-    "51,Category of radar station,CATRAS,E,F",
-    "52,Category of radar transponder beacon,CATRTB,E,F",
-    "53,Category of radio station,CATROS,L,F",
-    "54,Category of recommended track,CATTRK,E,F",
-    "55,Category of rescue station,CATRSC,L,F",
-    "56,Category of restricted area,CATREA,L,F",
-    "57,Category of road,CATROD,E,F",
-    "58,Category of runway,CATRUN,E,F",
-    "59,Category of sea area,CATSEA,E,F",
-    "60,Category of shoreline construction,CATSLC,E,F",
-    "61,\"Category of signal station, traffic\",CATSIT,L,F",
-    "62,\"Category of signal station, warning\",CATSIW,L,F",
-    "63,Category of silo/tank,CATSIL,E,F",
-    "64,Category of slope,CATSLO,E,F",
-    "65,Category of small craft facility,CATSCF,L,F",
-    "66,Category of special purpose mark,CATSPM,L,F",
-    "67,Category of Traffic Separation Scheme,CATTSS,E,F",
-    "68,Category of vegetation,CATVEG,L,F",
-    "69,Category of water turbulence,CATWAT,E,F",
-    "70,Category of weed/kelp,CATWED,E,F",
-    "71,Category of wreck,CATWRK,E,F",
-    "72,Category of zone of confidence data,CATZOC,E,F",
-    "73,Character spacing,$SPACE,E,$",
-    "74,Character specification,$CHARS,A,$",
-    "75,Colour,COLOUR,L,F",
-    "76,Colour pattern,COLPAT,L,F",
-    "77,Communication channel,COMCHA,A,F",
-    "78,Compass size,$CSIZE,F,$",
-    "79,Compilation date,CPDATE,A,F",
-    "80,Compilation scale,CSCALE,I,F",
-    "81,Condition,CONDTN,E,F",
-    "82,\"Conspicuous, Radar\",CONRAD,E,F",
-    "83,\"Conspicuous, visual\",CONVIS,E,F",
-    "84,Current velocity,CURVEL,F,F",
-    "85,Date end,DATEND,A,F",
-    "86,Date start,DATSTA,A,F",
-    "87,Depth range value 1,DRVAL1,F,F",
-    "88,Depth range value 2,DRVAL2,F,F",
-    "89,Depth units,DUNITS,E,F",
-    "90,Elevation,ELEVAT,F,F",
-    "91,Estimated range of transmission,ESTRNG,F,F",
-    "92,Exhibition condition of light,EXCLIT,E,F",
-    "93,Exposition of sounding,EXPSOU,E,F",
-    "94,Function,FUNCTN,L,F",
-    "95,Height,HEIGHT,F,F",
-    "96,Height/length units,HUNITS,E,F",
-    "97,Horizontal accuracy,HORACC,F,F",
-    "98,Horizontal clearance,HORCLR,F,F",
-    "99,Horizontal length,HORLEN,F,F",
-    "100,Horizontal width,HORWID,F,F",
-    "101,Ice factor,ICEFAC,F,F",
-    "102,Information,INFORM,S,F",
-    "103,Jurisdiction,JRSDTN,E,F",
-    "104,Justification - horizontal,$JUSTH,E,$",
-    "105,Justification - vertical,$JUSTV,E,$",
-    "106,Lifting capacity,LIFCAP,F,F",
-    "107,Light characteristic,LITCHR,E,F",
-    "108,Light visibility,LITVIS,L,F",
-    "109,Marks navigational - System of,MARSYS,E,F",
-    "110,Multiplicity of lights,MLTYLT,I,F",
-    "111,Nationality,NATION,A,F",
-    "112,Nature of construction,NATCON,L,F",
-    "113,Nature of surface,NATSUR,L,F",
-    "114,Nature of surface - qualifying terms,NATQUA,L,F",
-    "115,Notice to Mariners date,NMDATE,A,F",
-    "116,Object name,OBJNAM,S,F",
-    "117,Orientation,ORIENT,F,F",
-    "118,Periodic date end,PEREND,A,F",
-    "119,Periodic date start,PERSTA,A,F",
-    "120,Pictorial representation,PICREP,S,F",
-    "121,Pilot district,PILDST,S,F",
-    "122,Producing country,PRCTRY,A,F",
-    "123,Product,PRODCT,L,F",
-    "124,Publication reference,PUBREF,S,F",
-    "125,Quality of sounding measurement,QUASOU,L,F",
-    "126,Radar wave length,RADWAL,A,F",
-    "127,Radius,RADIUS,F,F",
-    "128,Recording date,RECDAT,A,F",
-    "129,Recording indication,RECIND,A,F",
-    "130,Reference year for magnetic variation,RYRMGV,A,F",
-    "131,Restriction,RESTRN,L,F",
-    "132,Scale maximum,SCAMAX,I,F",
-    "133,Scale minimum,SCAMIN,I,F",
-    "134,Scale value one,SCVAL1,I,F",
-    "135,Scale value two,SCVAL2,I,F",
-    "136,Sector limit one,SECTR1,F,F",
-    "137,Sector limit two,SECTR2,F,F",
-    "138,Shift parameters,SHIPAM,A,F",
-    "139,Signal frequency,SIGFRQ,I,F",
-    "140,Signal generation,SIGGEN,E,F",
-    "141,Signal group,SIGGRP,A,F",
-    "142,Signal period,SIGPER,F,F",
-    "143,Signal sequence,SIGSEQ,A,F",
-    "144,Sounding accuracy,SOUACC,F,F",
-    "145,Sounding distance - maximum,SDISMX,I,F",
-    "146,Sounding distance - minimum,SDISMN,I,F",
-    "147,Source date,SORDAT,A,F",
-    "148,Source indication,SORIND,A,F",
-    "149,Status,STATUS,L,F",
-    "150,Survey authority,SURATH,S,F",
-    "151,Survey date - end,SUREND,A,F",
-    "152,Survey date - start,SURSTA,A,F",
-    "153,Survey type,SURTYP,L,F",
-    "154,Symbol scaling factor,$SCALE,F,$",
-    "155,Symbolization code,$SCODE,A,$",
-    "156,Technique of sounding measurement,TECSOU,L,F",
-    "157,Text string,$TXSTR,S,$",
-    "158,Textual description,TXTDSC,S,F",
-    "159,Tidal stream - panel values,TS_TSP,A,F",
-    "160,\"Tidal stream, current - time series values\",TS_TSV,A,F",
-    "161,Tide - accuracy of water level,T_ACWL,E,F",
-    "162,Tide - high and low water values,T_HWLW,A,F",
-    "163,Tide - method of tidal prediction,T_MTOD,E,F",
-    "164,Tide - time and height differences,T_THDF,A,F",
-    "165,\"Tide, current - time interval of values\",T_TINT,I,F",
-    "166,Tide - time series values,T_TSVL,A,F",
-    "167,Tide - value of harmonic constituents,T_VAHC,A,F",
-    "168,Time end,TIMEND,A,F",
-    "169,Time start,TIMSTA,A,F",
-    "170,Tint,$TINTS,E,$",
-    "171,Topmark/daymark shape,TOPSHP,E,F",
-    "172,Traffic flow,TRAFIC,E,F",
-    "173,Value of annual change in magnetic variation,VALACM,F,F",
-    "174,Value of depth contour,VALDCO,F,F",
-    "175,Value of local magnetic anomaly,VALLMA,F,F",
-    "176,Value of magnetic variation,VALMAG,F,F",
-    "177,Value of maximum range,VALMXR,F,F",
-    "178,Value of nominal range,VALNMR,F,F",
-    "179,Value of sounding,VALSOU,F,F",
-    "180,Vertical accuracy,VERACC,F,F",
-    "181,Vertical clearance,VERCLR,F,F",
-    "182,\"Vertical clearance, closed\",VERCCL,F,F",
-    "183,\"Vertical clearance, open\",VERCOP,F,F",
-    "184,\"Vertical clearance, safe\",VERCSA,F,F",
-    "185,Vertical datum,VERDAT,E,F",
-    "186,Vertical length,VERLEN,F,F",
-    "187,Water level effect,WATLEV,E,F",
-    "188,Category of Tidal stream,CAT_TS,E,F",
-    "189,Positional accuracy units,PUNITS,E,F",
-    "300,Information in national language,NINFOM,S,N",
-    "301,Object name in national language,NOBJNM,S,N",
-    "302,Pilot district in national language,NPLDST,S,N",
-    "303,Text string in national language,$NTXST,S,N",
-    "304,Textual description in national language,NTXTDS,S,N",
-    "400,Horizontal datum,HORDAT,E,S",
-    "401,Positional Accuracy,POSACC,F,S",
-    "402,Quality of position,QUAPOS,E,S",
-    NULL};
diff --git a/ogr/ogrsf_frmts/s57/s57tables.py b/ogr/ogrsf_frmts/s57/s57tables.py
deleted file mode 100755
index cc6807437488..000000000000
--- a/ogr/ogrsf_frmts/s57/s57tables.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-# ******************************************************************************
-#  $Id$
-#
-#  Project:  S-57 OGR Translator
-#  Purpose:  Script to translate s57 .csv files into C code "data" statements.
-#  Author:   Frank Warmerdam, warmerdam@pobox.com
-#
-# ******************************************************************************
-#  Copyright (c) 2001, Frank Warmerdam
-#
-# SPDX-License-Identifier: MIT
-# ******************************************************************************
-
-import os
-import sys
-
-# -----------------------------------------------------------------------------
-# EscapeLine - escape anything C-problematic in a line.
-# -----------------------------------------------------------------------------
-
-
-def EscapeLine(ln):
-    return ln.replace('"', '\\"')
-
-
-# -----------------------------------------------------------------------------
-#
-
-
-if __name__ != "__main__":
-    print("This module should only be used as a mainline.")
-    sys.exit(1)
-
-if len(sys.argv) < 2:
-    directory = os.environ["S57_CSV"]
-else:
-    directory = sys.argv[1]
-
-
-print("char *gpapszS57Classes[] = {")
-classes = open(directory + "/s57objectclasses.csv").readlines()
-
-for line in classes:
-    print('"%s",' % EscapeLine(line.strip()))
-
-print("NULL };")
-
-print("char *gpapszS57attributes[] = {")
-classes = open(directory + "/s57attributes.csv").readlines()
-
-for line in classes:
-    print('"%s",' % EscapeLine(line.strip()))
-
-print("NULL };")

From 146b2ed8398e4bc0392faf086ffe3341bd550c39 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 15:43:05 +0200
Subject: [PATCH 21/87] SXF: embed default.rsc if EMBED_RESOURCE_FILES

---
 ogr/ogrsf_frmts/sxf/CMakeLists.txt       | 25 ++++++++++-----
 ogr/ogrsf_frmts/sxf/embedded_resources.c | 14 ++++++++
 ogr/ogrsf_frmts/sxf/embedded_resources.h | 10 ++++++
 ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp | 41 ++++++++++++++++++++++--
 4 files changed, 80 insertions(+), 10 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/sxf/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/sxf/embedded_resources.h

diff --git a/ogr/ogrsf_frmts/sxf/CMakeLists.txt b/ogr/ogrsf_frmts/sxf/CMakeLists.txt
index 45c1e7aa612b..239a9fd078bf 100644
--- a/ogr/ogrsf_frmts/sxf/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/sxf/CMakeLists.txt
@@ -3,11 +3,20 @@ add_gdal_driver(TARGET ogr_SXF SOURCES ogr_sxf.h ogrsxfdatasource.cpp ogrsxflaye
 target_include_directories(ogr_SXF PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>)
 gdal_standard_includes(ogr_SXF)
 
-set(GDAL_DATA_FILES
-    LICENSE.TXT
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/default.rsc
-)
-set_property(
-  TARGET ${GDAL_LIB_TARGET_NAME}
-  APPEND
-  PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    set(GDAL_DATA_FILES
+        LICENSE.TXT
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/default.rsc
+    )
+    set_property(
+      TARGET ${GDAL_LIB_TARGET_NAME}
+      APPEND
+      PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+endif()
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_SXF OGR_ENABLE_DRIVER_SXF_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_SXF PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
diff --git a/ogr/ogrsf_frmts/sxf/embedded_resources.c b/ogr/ogrsf_frmts/sxf/embedded_resources.c
new file mode 100644
index 000000000000..3370a984494e
--- /dev/null
+++ b/ogr/ogrsf_frmts/sxf/embedded_resources.c
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const unsigned char sxf_default_rsc[] = {
+#embed "data/default.rsc"
+};
+
+const unsigned char *SXFGetDefaultRSC(int *pnSize)
+{
+    *pnSize = (int)sizeof(sxf_default_rsc);
+    return sxf_default_rsc;
+}
diff --git a/ogr/ogrsf_frmts/sxf/embedded_resources.h b/ogr/ogrsf_frmts/sxf/embedded_resources.h
new file mode 100644
index 000000000000..d06a1fcea310
--- /dev/null
+++ b/ogr/ogrsf_frmts/sxf/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const unsigned char *SXFGetDefaultRSC(int *pnSize);
+
+CPL_C_END
diff --git a/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp b/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp
index 7c6adcde8045..3116a2334191 100644
--- a/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp
+++ b/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp
@@ -24,6 +24,10 @@
 #include <map>
 #include <string>
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 // EPSG code range http://gis.stackexchange.com/a/18676/9904
 constexpr int MIN_EPSG = 1000;
 constexpr int MAX_EPSG = 32768;
@@ -229,9 +233,33 @@ int OGRSXFDataSource::Open(const char *pszFilename, bool bUpdateIn,
     // 1. Create layers from RSC file or create default set of layers from
     // gdal_data/default.rsc.
 
+    VSILFILE *fpRSC = nullptr;
     if (soRSCRileName.empty())
     {
+#if defined(USE_ONLY_EMBEDDED_RESOURCE_FILES)
+        pszRSCRileName = nullptr;
+#else
         pszRSCRileName = CPLFindFile("gdal", "default.rsc");
+#endif
+#ifdef EMBED_RESOURCE_FILES
+        if (!pszRSCRileName || EQUAL(pszRSCRileName, "default.rsc"))
+        {
+            static const bool bOnce [[maybe_unused]] = []()
+            {
+                CPLDebug("SXF", "Using embedded default.rsc");
+                return true;
+            }();
+            int sxf_default_rsc_size = 0;
+            const unsigned char *sxf_default_rsc =
+                SXFGetDefaultRSC(&sxf_default_rsc_size);
+            fpRSC = VSIFileFromMemBuffer(
+                nullptr,
+                const_cast<GByte *>(
+                    reinterpret_cast<const GByte *>(sxf_default_rsc)),
+                sxf_default_rsc_size,
+                /* bTakeOwnership = */ false);
+        }
+#endif
         if (nullptr != pszRSCRileName)
         {
             soRSCRileName = pszRSCRileName;
@@ -242,14 +270,23 @@ int OGRSXFDataSource::Open(const char *pszFilename, bool bUpdateIn,
         }
     }
 
-    if (soRSCRileName.empty())
+    if (soRSCRileName.empty()
+#ifdef EMBED_RESOURCE_FILES
+        && !fpRSC
+#endif
+    )
     {
         CPLError(CE_Warning, CPLE_None, "RSC file for %s not exist",
                  pszFilename);
     }
     else
     {
-        VSILFILE *fpRSC = VSIFOpenL(soRSCRileName, "rb");
+#ifdef EMBED_RESOURCE_FILES
+        if (!fpRSC)
+#endif
+        {
+            fpRSC = VSIFOpenL(soRSCRileName, "rb");
+        }
         if (fpRSC == nullptr)
         {
             CPLError(CE_Warning, CPLE_OpenFailed, "RSC file %s open failed",

From d75856fa33314b79a69e3b84e106f4213f2e05aa Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 15:44:03 +0200
Subject: [PATCH 22/87] test_ogr_sxf_3: improve handling of temporary files

---
 autotest/ogr/ogr_sxf.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/autotest/ogr/ogr_sxf.py b/autotest/ogr/ogr_sxf.py
index 8cff70753320..b769f8f34199 100755
--- a/autotest/ogr/ogr_sxf.py
+++ b/autotest/ogr/ogr_sxf.py
@@ -71,11 +71,11 @@ def test_ogr_sxf_2():
 # Open SXF datasource with custom RSC file.
 
 
-def test_ogr_sxf_3():
+def test_ogr_sxf_3(tmp_path):
 
     lyr_names = ["SYSTEM", "Not_Classified"]
-    sxf_name = "tmp/test_ogr_sxf_3.sxf"
-    rsc_name = "tmp/test_ogr_sxf_3.rsc"
+    sxf_name = str(tmp_path / "test_ogr_sxf_3.sxf")
+    rsc_name = str(tmp_path / "test_ogr_sxf_3.rsc")
     fake_rsc = open(rsc_name, "w")
     fake_rsc.close()
     shutil.copy("data/sxf/100_test.sxf", sxf_name)

From a9469dfe1f3c41ae6f858dd8c03969c9233fdf81 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 15:54:34 +0200
Subject: [PATCH 23/87] VDV: embed vdv452.xml if EMBED_RESOURCE_FILES

---
 ogr/ogrsf_frmts/vdv/CMakeLists.txt       | 13 ++++++++++-
 ogr/ogrsf_frmts/vdv/embedded_resources.c | 13 +++++++++++
 ogr/ogrsf_frmts/vdv/embedded_resources.h | 10 +++++++++
 ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp | 28 ++++++++++++++++++++++--
 4 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 ogr/ogrsf_frmts/vdv/embedded_resources.c
 create mode 100644 ogr/ogrsf_frmts/vdv/embedded_resources.h

diff --git a/ogr/ogrsf_frmts/vdv/CMakeLists.txt b/ogr/ogrsf_frmts/vdv/CMakeLists.txt
index f8fec5bcd129..80082056b1cc 100644
--- a/ogr/ogrsf_frmts/vdv/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/vdv/CMakeLists.txt
@@ -2,10 +2,21 @@ add_gdal_driver(TARGET ogr_VDV SOURCES ogr_vdv.h ogrvdvdatasource.cpp PLUGIN_CAP
 gdal_standard_includes(ogr_VDV)
 
 set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/vdv452.xml
     ${CMAKE_CURRENT_SOURCE_DIR}/data/vdv452.xsd
 )
+if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    list(APPEND GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/vdv452.xml
+    )
+endif()
 set_property(
   TARGET ${GDAL_LIB_TARGET_NAME}
   APPEND
   PROPERTY RESOURCE "${GDAL_DATA_FILES}")
+
+if (EMBED_RESOURCE_FILES)
+    add_driver_embedded_resources(ogr_VDV OGR_ENABLE_DRIVER_VDV_PLUGIN embedded_resources.c)
+endif()
+if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    target_compile_definitions(ogr_VDV PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
+endif()
diff --git a/ogr/ogrsf_frmts/vdv/embedded_resources.c b/ogr/ogrsf_frmts/vdv/embedded_resources.c
new file mode 100644
index 000000000000..a37e5d44a2c9
--- /dev/null
+++ b/ogr/ogrsf_frmts/vdv/embedded_resources.c
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "embedded_resources.h"
+
+static const char vdv452_xml[] = {
+#embed "data/vdv452.xml"
+    , 0};
+
+const char *VDVGet452XML(void)
+{
+    return vdv452_xml;
+}
diff --git a/ogr/ogrsf_frmts/vdv/embedded_resources.h b/ogr/ogrsf_frmts/vdv/embedded_resources.h
new file mode 100644
index 000000000000..c4dbd641de24
--- /dev/null
+++ b/ogr/ogrsf_frmts/vdv/embedded_resources.h
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+// Copyright 2024, Even Rouault <even.rouault at spatialys.com>
+
+#include "cpl_port.h"
+
+CPL_C_START
+
+const char *VDVGet452XML(void);
+
+CPL_C_END
diff --git a/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp b/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp
index 3dcb74f59f29..ba9653a3a027 100644
--- a/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp
+++ b/ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp
@@ -15,6 +15,10 @@
 #include "cpl_time.h"
 #include <map>
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 #ifndef STARTS_WITH_CI
 #define STARTS_WITH(a, b) (strncmp(a, b, strlen(b)) == 0)
 #define STARTS_WITH_CI(a, b) EQUALN(a, b, strlen(b))
@@ -1702,14 +1706,34 @@ static bool OGRVDVWriteHeader(VSILFILE *fpL, CSLConstList papszOptions)
 
 static bool OGRVDVLoadVDV452Tables(OGRVDV452Tables &oTables)
 {
+    CPLXMLNode *psRoot = nullptr;
+#if defined(USE_ONLY_EMBEDDED_RESOURCE_FILES)
+    const char *pszXMLDescFilename = nullptr;
+#else
     const char *pszXMLDescFilename = CPLFindFile("gdal", "vdv452.xml");
-    if (pszXMLDescFilename == nullptr)
+#endif
+    if (pszXMLDescFilename == nullptr ||
+        EQUAL(pszXMLDescFilename, "vdv452.xml"))
     {
+#ifdef EMBED_RESOURCE_FILES
+        static const bool bOnce [[maybe_unused]] = []()
+        {
+            CPLDebug("VDV", "Using embedded vdv452.xml");
+            return true;
+        }();
+        psRoot = CPLParseXMLString(VDVGet452XML());
+#else
         CPLDebug("VDV", "Cannot find XML file : %s", "vdv452.xml");
         return false;
+#endif
     }
 
-    CPLXMLNode *psRoot = CPLParseXMLFile(pszXMLDescFilename);
+#ifdef EMBED_RESOURCE_FILES
+    if (!psRoot)
+#endif
+    {
+        psRoot = CPLParseXMLFile(pszXMLDescFilename);
+    }
     if (psRoot == nullptr)
     {
         return false;

From e80cf53723ff56c6d43529b45ca5448e02a75b88 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 16:01:49 +0200
Subject: [PATCH 24/87] Vicar: embed vicar.json if EMBED_RESOURCE_FILES

---
 frmts/pds/CMakeLists.txt       |  9 +++++----
 frmts/pds/embedded_resources.c |  9 +++++++++
 frmts/pds/embedded_resources.h |  1 +
 frmts/pds/vicardataset.cpp     | 20 ++++++++++++++++++--
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/frmts/pds/CMakeLists.txt b/frmts/pds/CMakeLists.txt
index 12207939d21b..5dced5b9b682 100644
--- a/frmts/pds/CMakeLists.txt
+++ b/frmts/pds/CMakeLists.txt
@@ -14,11 +14,12 @@ add_gdal_driver(
   NO_SHARED_SYMBOL_WITH_CORE
 )
 
-set(GDAL_DATA_FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/data/vicar.json
-)
+
 if (NOT USE_ONLY_EMBEDDED_RESOURCE_FILES)
-    list(APPEND GDAL_DATA_FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pds4_template.xml)
+    set(GDAL_DATA_FILES
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/vicar.json
+        ${CMAKE_CURRENT_SOURCE_DIR}/data/pds4_template.xml
+    )
 endif()
 
 set_property(
diff --git a/frmts/pds/embedded_resources.c b/frmts/pds/embedded_resources.c
index e75cf2e29e90..ad8988b7b64a 100644
--- a/frmts/pds/embedded_resources.c
+++ b/frmts/pds/embedded_resources.c
@@ -11,3 +11,12 @@ const char *PDS4GetEmbeddedTemplate()
 {
     return szPDS4Template;
 }
+
+static const char szVICARJson[] = {
+#embed "data/vicar.json"
+    , 0};
+
+const char *VICARGetEmbeddedConf(void)
+{
+    return szVICARJson;
+}
diff --git a/frmts/pds/embedded_resources.h b/frmts/pds/embedded_resources.h
index fd3850eb5f43..3eb6ac78bc2b 100644
--- a/frmts/pds/embedded_resources.h
+++ b/frmts/pds/embedded_resources.h
@@ -6,5 +6,6 @@
 CPL_C_START
 
 const char *PDS4GetEmbeddedTemplate(void);
+const char *VICARGetEmbeddedConf(void);
 
 CPL_C_END
diff --git a/frmts/pds/vicardataset.cpp b/frmts/pds/vicardataset.cpp
index 0fe1be702b8a..5a665644f713 100644
--- a/frmts/pds/vicardataset.cpp
+++ b/frmts/pds/vicardataset.cpp
@@ -40,6 +40,10 @@ constexpr double VICAR_NULL3 = -32768.0;
 #include <limits>
 #include <string>
 
+#ifdef EMBED_RESOURCE_FILES
+#include "embedded_resources.h"
+#endif
+
 #if defined(HAVE_TIFF) && defined(HAVE_GEOTIFF)
 /* GeoTIFF 1.0 geokeys */
 
@@ -2645,7 +2649,20 @@ GDALDataset *VICARDataset::Open(GDALOpenInfo *poOpenInfo)
     if (nNBB != 0)
     {
         const char *pszBLType = poDS->GetKeyword("BLTYPE", nullptr);
+#ifdef USE_ONLY_EMBEDDED_RESOURCE_FILES
+        const char *pszVicarConf = nullptr;
+#else
         const char *pszVicarConf = CPLFindFile("gdal", "vicar.json");
+#endif
+        CPLJSONDocument oDoc;
+        if (!pszVicarConf || EQUAL(pszVicarConf, "vicar.json"))
+        {
+#ifdef EMBED_RESOURCE_FILES
+            oDoc.LoadMemory(VICARGetEmbeddedConf());
+            pszVicarConf = "__embedded__";
+#endif
+        }
+
         if (pszBLType && pszVicarConf && poDS->m_nRecordSize > 0)
         {
 
@@ -2687,8 +2704,7 @@ GDALDataset *VICARDataset::Open(GDALOpenInfo *poOpenInfo)
                          "BREALFMT=%s layout not supported.", value);
             }
 
-            CPLJSONDocument oDoc;
-            if (oDoc.Load(pszVicarConf))
+            if (EQUAL(pszVicarConf, "__embedded__") || oDoc.Load(pszVicarConf))
             {
                 const auto oRoot = oDoc.GetRoot();
                 if (oRoot.GetType() == CPLJSONObject::Type::Object)

From a5fde40c2b0f996784c43ec309191f8a894013dd Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 9 Oct 2024 16:15:47 +0200
Subject: [PATCH 25/87] Doc: document EMBED_RESOURCE_FILES and
 USE_ONLY_EMBEDDED_RESOURCE_FILES

---
 .../development/building_from_source.rst      | 30 +++++++++++++++++++
 doc/source/spelling_wordlist.txt              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/doc/source/development/building_from_source.rst b/doc/source/development/building_from_source.rst
index adaa100d5bb8..8ca9f74d05f8 100644
--- a/doc/source/development/building_from_source.rst
+++ b/doc/source/development/building_from_source.rst
@@ -224,6 +224,36 @@ All cached entries can be viewed using ``cmake -LAH`` from a build directory.
     `CMAKE_SKIP_INSTALL_RPATH <https://cmake.org/cmake/help/latest/variable/CMAKE_SKIP_INSTALL_RPATH.html>`__
     variable is not set.
 
+Resource files embedding
+++++++++++++++++++++++++
+
+Starting with GDAL 3.11, if a C23-compatible compiler is used, such as
+clang >= 19 or GCC >= 15, it is possible to embed resource files inside
+the GDAL library, without relying on resource files to be available on the file
+system (such resource files are located through an hard-coded
+path at build time in ``${CMAKE_INSTALL_PREFIX}/share/gdal``, or at run-time
+through the :config:`GDAL_DATA` configuration option).
+
+The following CMake options control that behavior:
+
+.. option:: EMBED_RESOURCE_FILES=ON/OFF
+
+    .. versionadded:: 3.11
+
+    Default is OFF for shared library builds (BUILD_SHARED_LIBS=ON), and ON
+    for static library builds (BUILD_SHARED_LIBS=OFF).
+    When ON, resource files needed by GDAL will be embedded into the GDAL library
+    and/or relevant plugins.
+
+.. option:: USE_ONLY_EMBEDDED_RESOURCE_FILES=ON/OFF
+
+    .. versionadded:: 3.11
+
+    Even if EMBED_RESOURCE_FILES=ON, GDAL will still try to locate resource
+    files on the file system by default , and fallback to the embedded version if
+    not found. By setting USE_ONLY_EMBEDDED_RESOURCE_FILES=ON, no attempt
+    at locating resource files on the file system is made. Default is OFF.
+
 CMake package dependent options
 +++++++++++++++++++++++++++++++
 
diff --git a/doc/source/spelling_wordlist.txt b/doc/source/spelling_wordlist.txt
index 77d3e4e14e6c..83ee2e933390 100644
--- a/doc/source/spelling_wordlist.txt
+++ b/doc/source/spelling_wordlist.txt
@@ -369,6 +369,7 @@ cid
 CInt
 circularstrings
 ClampRequests
+clang
 ClassificationCode
 Clayers
 CleanTimeout

From 7d93c723fbf0c5c1f6dedc4496c469b381dee5e0 Mon Sep 17 00:00:00 2001
From: Emil Albin Ryberg <ear@akson-robotics.dk>
Date: Wed, 16 Oct 2024 18:49:38 +0200
Subject: [PATCH 26/87] Add VSIGetMemFileBuffer to CSharp SWIG bindings

---
 swig/include/csharp/gdal_csharp.i | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/swig/include/csharp/gdal_csharp.i b/swig/include/csharp/gdal_csharp.i
index 3b0fd5212843..416a690ae22e 100644
--- a/swig/include/csharp/gdal_csharp.i
+++ b/swig/include/csharp/gdal_csharp.i
@@ -378,3 +378,20 @@ public CPLErr SetGCPs(GCP[] pGCPs, string pszGCPProjection) {
    }
 
 %}
+
+%rename (GetMemFileBuffer) wrapper_VSIGetMemFileBuffer;
+
+%typemap(cstype) (GIntBig *pnDataLength) "out int";
+%typemap(imtype) (GIntBig *pnDataLength) "out int";
+%apply (int *OUTPUT) {(GIntBig *pnDataLength)}
+%typemap(cstype) (int bUnlinkAndSeize) "bool";
+%typemap(csin) (int bUnlinkAndSeize) "$csinput ? 1 : 0";
+
+%inline {
+GByte* wrapper_VSIGetMemFileBuffer(const char *utf8_path, GIntBig *pnDataLength, int bUnlinkAndSeize)
+{
+    return VSIGetMemFileBuffer(utf8_path, reinterpret_cast<vsi_l_offset *>(pnDataLength), bUnlinkAndSeize);
+}
+}
+
+%clear (GIntBig *pnDataLength);
\ No newline at end of file

From 34afc2d2c4d123964bfdae0d02b31317858034be Mon Sep 17 00:00:00 2001
From: Emil Albin Ryberg <ear@akson-robotics.dk>
Date: Wed, 16 Oct 2024 19:19:14 +0200
Subject: [PATCH 27/87] Update to ulong

---
 swig/include/csharp/gdal_csharp.i | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/swig/include/csharp/gdal_csharp.i b/swig/include/csharp/gdal_csharp.i
index 416a690ae22e..83d2073b1c7e 100644
--- a/swig/include/csharp/gdal_csharp.i
+++ b/swig/include/csharp/gdal_csharp.i
@@ -381,17 +381,17 @@ public CPLErr SetGCPs(GCP[] pGCPs, string pszGCPProjection) {
 
 %rename (GetMemFileBuffer) wrapper_VSIGetMemFileBuffer;
 
-%typemap(cstype) (GIntBig *pnDataLength) "out int";
-%typemap(imtype) (GIntBig *pnDataLength) "out int";
-%apply (int *OUTPUT) {(GIntBig *pnDataLength)}
+%typemap(cstype) (vsi_l_offset *pnDataLength) "out ulong";
+%typemap(imtype) (vsi_l_offset *pnDataLength) "out ulong";
+%apply (unsigned long long *OUTPUT) {(vsi_l_offset *pnDataLength)}
 %typemap(cstype) (int bUnlinkAndSeize) "bool";
 %typemap(csin) (int bUnlinkAndSeize) "$csinput ? 1 : 0";
 
 %inline {
-GByte* wrapper_VSIGetMemFileBuffer(const char *utf8_path, GIntBig *pnDataLength, int bUnlinkAndSeize)
+GByte* wrapper_VSIGetMemFileBuffer(const char *utf8_path, vsi_l_offset *pnDataLength, int bUnlinkAndSeize)
 {
-    return VSIGetMemFileBuffer(utf8_path, reinterpret_cast<vsi_l_offset *>(pnDataLength), bUnlinkAndSeize);
+    return VSIGetMemFileBuffer(utf8_path, pnDataLength, bUnlinkAndSeize);
 }
 }
 
-%clear (GIntBig *pnDataLength);
\ No newline at end of file
+%clear (vsi_l_offset *pnDataLength);
\ No newline at end of file

From 40ce085598dc2f9966ed1e6a75544fd452738d2a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 19 Oct 2024 18:17:54 +0200
Subject: [PATCH 28/87] Warper: improve (a bit) performance of multi-band
 bicubic warping

On extracted2.tif dataset from
https://github.com/OSGeo/gdal/issues/11042#issuecomment-2420556574 (12500 x 10000 pixels, 3 bands, Byte)
``gdalwarp -s_srs EPSG:8353 -t_srs EPSG:3857 -r cubic extracted2.tif tmp.tif -overwrite``
goes from 30.4 seconds to 26.0.
---
 alg/gdalwarpkernel.cpp | 307 +++++++++++++++++++++++------------------
 1 file changed, 169 insertions(+), 138 deletions(-)

diff --git a/alg/gdalwarpkernel.cpp b/alg/gdalwarpkernel.cpp
index 565a6657a189..9053cb24cddf 100644
--- a/alg/gdalwarpkernel.cpp
+++ b/alg/gdalwarpkernel.cpp
@@ -4100,14 +4100,76 @@ static bool GWKResampleOptimizedLanczos(const GDALWarpKernel *poWK, int iBand,
     return true;
 }
 
+/************************************************************************/
+/*                        GWKComputeWeights()                           */
+/************************************************************************/
+
+static void GWKComputeWeights(GDALResampleAlg eResample, int iMin, int iMax,
+                              double dfDeltaX, double dfXScale, int jMin,
+                              int jMax, double dfDeltaY, double dfYScale,
+                              double *padfWeightsHorizontal,
+                              double *padfWeightsVertical, double &dfInvWeights)
+{
+
+    const FilterFuncType pfnGetWeight = apfGWKFilter[eResample];
+    CPLAssert(pfnGetWeight);
+    const FilterFunc4ValuesType pfnGetWeight4Values =
+        apfGWKFilter4Values[eResample];
+    CPLAssert(pfnGetWeight4Values);
+
+    int i = iMin;  // Used after for.
+    int iC = 0;    // Used after for.
+    double dfAccumulatorWeightHorizontal = 0.0;
+    for (; i + 2 < iMax; i += 4, iC += 4)
+    {
+        padfWeightsHorizontal[iC] = (i - dfDeltaX) * dfXScale;
+        padfWeightsHorizontal[iC + 1] = padfWeightsHorizontal[iC] + dfXScale;
+        padfWeightsHorizontal[iC + 2] =
+            padfWeightsHorizontal[iC + 1] + dfXScale;
+        padfWeightsHorizontal[iC + 3] =
+            padfWeightsHorizontal[iC + 2] + dfXScale;
+        dfAccumulatorWeightHorizontal +=
+            pfnGetWeight4Values(padfWeightsHorizontal + iC);
+    }
+    for (; i <= iMax; ++i, ++iC)
+    {
+        const double dfWeight = pfnGetWeight((i - dfDeltaX) * dfXScale);
+        padfWeightsHorizontal[iC] = dfWeight;
+        dfAccumulatorWeightHorizontal += dfWeight;
+    }
+
+    int j = jMin;  // Used after for.
+    int jC = 0;    // Used after for.
+    double dfAccumulatorWeightVertical = 0.0;
+    for (; j + 2 < jMax; j += 4, jC += 4)
+    {
+        padfWeightsVertical[jC] = (j - dfDeltaY) * dfYScale;
+        padfWeightsVertical[jC + 1] = padfWeightsVertical[jC] + dfYScale;
+        padfWeightsVertical[jC + 2] = padfWeightsVertical[jC + 1] + dfYScale;
+        padfWeightsVertical[jC + 3] = padfWeightsVertical[jC + 2] + dfYScale;
+        dfAccumulatorWeightVertical +=
+            pfnGetWeight4Values(padfWeightsVertical + jC);
+    }
+    for (; j <= jMax; ++j, ++jC)
+    {
+        const double dfWeight = pfnGetWeight((j - dfDeltaY) * dfYScale);
+        padfWeightsVertical[jC] = dfWeight;
+        dfAccumulatorWeightVertical += dfWeight;
+    }
+
+    dfInvWeights =
+        1. / (dfAccumulatorWeightHorizontal * dfAccumulatorWeightVertical);
+}
+
 /************************************************************************/
 /*                        GWKResampleNoMasksT()                         */
 /************************************************************************/
 
 template <class T>
-static bool GWKResampleNoMasksT(const GDALWarpKernel *poWK, int iBand,
-                                double dfSrcX, double dfSrcY, T *pValue,
-                                double *padfWeight)
+static bool
+GWKResampleNoMasksT(const GDALWarpKernel *poWK, int iBand, double dfSrcX,
+                    double dfSrcY, T *pValue, double *padfWeightsHorizontal,
+                    double *padfWeightsVertical, double &dfInvWeights)
 
 {
     // Commonly used; save locally.
@@ -4132,52 +4194,33 @@ static bool GWKResampleNoMasksT(const GDALWarpKernel *poWK, int iBand,
     const double dfDeltaX = dfSrcX - 0.5 - iSrcX;
     const double dfDeltaY = dfSrcY - 0.5 - iSrcY;
 
-    const FilterFuncType pfnGetWeight = apfGWKFilter[poWK->eResample];
-    CPLAssert(pfnGetWeight);
-    const FilterFunc4ValuesType pfnGetWeight4Values =
-        apfGWKFilter4Values[poWK->eResample];
-    CPLAssert(pfnGetWeight4Values);
-
     const double dfXScale = std::min(poWK->dfXScale, 1.0);
     const double dfYScale = std::min(poWK->dfYScale, 1.0);
 
-    // Loop over all rows in the kernel.
-    double dfAccumulatorWeightHorizontal = 0.0;
-    double dfAccumulatorWeightVertical = 0.0;
-
     int iMin = 1 - nXRadius;
     if (iSrcX + iMin < 0)
         iMin = -iSrcX;
     int iMax = nXRadius;
     if (iSrcX + iMax >= nSrcXSize - 1)
         iMax = nSrcXSize - 1 - iSrcX;
-    int i = iMin;  // Used after for.
-    int iC = 0;    // Used after for.
-    for (; i + 2 < iMax; i += 4, iC += 4)
-    {
-        padfWeight[iC] = (i - dfDeltaX) * dfXScale;
-        padfWeight[iC + 1] = padfWeight[iC] + dfXScale;
-        padfWeight[iC + 2] = padfWeight[iC + 1] + dfXScale;
-        padfWeight[iC + 3] = padfWeight[iC + 2] + dfXScale;
-        dfAccumulatorWeightHorizontal += pfnGetWeight4Values(padfWeight + iC);
-    }
-    for (; i <= iMax; ++i, ++iC)
-    {
-        const double dfWeight = pfnGetWeight((i - dfDeltaX) * dfXScale);
-        padfWeight[iC] = dfWeight;
-        dfAccumulatorWeightHorizontal += dfWeight;
-    }
 
-    int j = 1 - nYRadius;
-    if (iSrcY + j < 0)
-        j = -iSrcY;
+    int jMin = 1 - nYRadius;
+    if (iSrcY + jMin < 0)
+        jMin = -iSrcY;
     int jMax = nYRadius;
     if (iSrcY + jMax >= nSrcYSize - 1)
         jMax = nSrcYSize - 1 - iSrcY;
 
-    double dfAccumulator = 0.0;
+    if (iBand == 0)
+    {
+        GWKComputeWeights(poWK->eResample, iMin, iMax, dfDeltaX, dfXScale, jMin,
+                          jMax, dfDeltaY, dfYScale, padfWeightsHorizontal,
+                          padfWeightsVertical, dfInvWeights);
+    }
 
-    for (; j <= jMax; ++j)
+    // Loop over all rows in the kernel.
+    double dfAccumulator = 0.0;
+    for (int jC = 0, j = jMin; j <= jMax; ++j, ++jC)
     {
         const GPtrDiff_t iSampJ =
             iSrcOffset + static_cast<GPtrDiff_t>(j) * nSrcXSize;
@@ -4185,42 +4228,41 @@ static bool GWKResampleNoMasksT(const GDALWarpKernel *poWK, int iBand,
         // Loop over all pixels in the row.
         double dfAccumulatorLocal = 0.0;
         double dfAccumulatorLocal2 = 0.0;
-        iC = 0;
-        i = iMin;
+        int iC = 0;
+        int i = iMin;
         // Process by chunk of 4 cols.
         for (; i + 2 < iMax; i += 4, iC += 4)
         {
             // Retrieve the pixel & accumulate.
-            dfAccumulatorLocal += pSrcBand[i + iSampJ] * padfWeight[iC];
-            dfAccumulatorLocal += pSrcBand[i + 1 + iSampJ] * padfWeight[iC + 1];
+            dfAccumulatorLocal +=
+                pSrcBand[i + iSampJ] * padfWeightsHorizontal[iC];
+            dfAccumulatorLocal +=
+                pSrcBand[i + 1 + iSampJ] * padfWeightsHorizontal[iC + 1];
             dfAccumulatorLocal2 +=
-                pSrcBand[i + 2 + iSampJ] * padfWeight[iC + 2];
+                pSrcBand[i + 2 + iSampJ] * padfWeightsHorizontal[iC + 2];
             dfAccumulatorLocal2 +=
-                pSrcBand[i + 3 + iSampJ] * padfWeight[iC + 3];
+                pSrcBand[i + 3 + iSampJ] * padfWeightsHorizontal[iC + 3];
         }
         dfAccumulatorLocal += dfAccumulatorLocal2;
         if (i < iMax)
         {
-            dfAccumulatorLocal += pSrcBand[i + iSampJ] * padfWeight[iC];
-            dfAccumulatorLocal += pSrcBand[i + 1 + iSampJ] * padfWeight[iC + 1];
+            dfAccumulatorLocal +=
+                pSrcBand[i + iSampJ] * padfWeightsHorizontal[iC];
+            dfAccumulatorLocal +=
+                pSrcBand[i + 1 + iSampJ] * padfWeightsHorizontal[iC + 1];
             i += 2;
             iC += 2;
         }
         if (i == iMax)
         {
-            dfAccumulatorLocal += pSrcBand[i + iSampJ] * padfWeight[iC];
+            dfAccumulatorLocal +=
+                pSrcBand[i + iSampJ] * padfWeightsHorizontal[iC];
         }
 
-        // Calculate the Y weight.
-        const double dfWeight = pfnGetWeight((j - dfDeltaY) * dfYScale);
-        dfAccumulator += dfWeight * dfAccumulatorLocal;
-        dfAccumulatorWeightVertical += dfWeight;
+        dfAccumulator += padfWeightsVertical[jC] * dfAccumulatorLocal;
     }
 
-    const double dfAccumulatorWeight =
-        dfAccumulatorWeightHorizontal * dfAccumulatorWeightVertical;
-
-    *pValue = GWKClampValueT<T>(dfAccumulator / dfAccumulatorWeight);
+    *pValue = GWKClampValueT<T>(dfAccumulator * dfInvWeights);
 
     return true;
 }
@@ -4236,7 +4278,9 @@ static bool GWKResampleNoMasksT(const GDALWarpKernel *poWK, int iBand,
 template <class T>
 static bool GWKResampleNoMasks_SSE2_T(const GDALWarpKernel *poWK, int iBand,
                                       double dfSrcX, double dfSrcY, T *pValue,
-                                      double *padfWeight)
+                                      double *padfWeightsHorizontal,
+                                      double *padfWeightsVertical,
+                                      double &dfInvWeights)
 {
     // Commonly used; save locally.
     const int nSrcXSize = poWK->nSrcXSize;
@@ -4258,60 +4302,42 @@ static bool GWKResampleNoMasks_SSE2_T(const GDALWarpKernel *poWK, int iBand,
     const T *pSrcBand =
         reinterpret_cast<const T *>(poWK->papabySrcImage[iBand]);
 
-    const FilterFuncType pfnGetWeight = apfGWKFilter[poWK->eResample];
-    CPLAssert(pfnGetWeight);
-    const FilterFunc4ValuesType pfnGetWeight4Values =
-        apfGWKFilter4Values[poWK->eResample];
-    CPLAssert(pfnGetWeight4Values);
-
     const double dfDeltaX = dfSrcX - 0.5 - iSrcX;
     const double dfDeltaY = dfSrcY - 0.5 - iSrcY;
     const double dfXScale = std::min(poWK->dfXScale, 1.0);
     const double dfYScale = std::min(poWK->dfYScale, 1.0);
 
-    // Loop over all rows in the kernel.
-    double dfAccumulatorWeightHorizontal = 0.0;
-    double dfAccumulatorWeightVertical = 0.0;
-    double dfAccumulator = 0.0;
-
     int iMin = 1 - nXRadius;
     if (iSrcX + iMin < 0)
         iMin = -iSrcX;
     int iMax = nXRadius;
     if (iSrcX + iMax >= nSrcXSize - 1)
         iMax = nSrcXSize - 1 - iSrcX;
-    int i, iC;
-    for (iC = 0, i = iMin; i + 2 < iMax; i += 4, iC += 4)
-    {
-        padfWeight[iC] = (i - dfDeltaX) * dfXScale;
-        padfWeight[iC + 1] = padfWeight[iC] + dfXScale;
-        padfWeight[iC + 2] = padfWeight[iC + 1] + dfXScale;
-        padfWeight[iC + 3] = padfWeight[iC + 2] + dfXScale;
-        dfAccumulatorWeightHorizontal += pfnGetWeight4Values(padfWeight + iC);
-    }
-    for (; i <= iMax; ++i, ++iC)
-    {
-        double dfWeight = pfnGetWeight((i - dfDeltaX) * dfXScale);
-        padfWeight[iC] = dfWeight;
-        dfAccumulatorWeightHorizontal += dfWeight;
-    }
 
-    int j = 1 - nYRadius;
-    if (iSrcY + j < 0)
-        j = -iSrcY;
+    int jMin = 1 - nYRadius;
+    if (iSrcY + jMin < 0)
+        jMin = -iSrcY;
     int jMax = nYRadius;
     if (iSrcY + jMax >= nSrcYSize - 1)
         jMax = nSrcYSize - 1 - iSrcY;
 
-    // Process by chunk of 4 rows.
-    for (; j + 2 < jMax; j += 4)
+    if (iBand == 0)
     {
-        const GPtrDiff_t iSampJ =
-            iSrcOffset + static_cast<GPtrDiff_t>(j) * nSrcXSize;
+        GWKComputeWeights(poWK->eResample, iMin, iMax, dfDeltaX, dfXScale, jMin,
+                          jMax, dfDeltaY, dfYScale, padfWeightsHorizontal,
+                          padfWeightsVertical, dfInvWeights);
+    }
 
+    GPtrDiff_t iSampJ = iSrcOffset + static_cast<GPtrDiff_t>(jMin) * nSrcXSize;
+    // Process by chunk of 4 rows.
+    int jC = 0;
+    int j = jMin;
+    double dfAccumulator = 0.0;
+    for (; j + 2 < jMax; j += 4, iSampJ += 4 * nSrcXSize, jC += 4)
+    {
         // Loop over all pixels in the row.
-        iC = 0;
-        i = iMin;
+        int iC = 0;
+        int i = iMin;
         // Process by chunk of 4 cols.
         XMMReg4Double v_acc_1 = XMMReg4Double::Zero();
         XMMReg4Double v_acc_2 = XMMReg4Double::Zero();
@@ -4330,7 +4356,7 @@ static bool GWKResampleNoMasks_SSE2_T(const GDALWarpKernel *poWK, int iBand,
                 XMMReg4Double::Load4Val(pSrcBand + i + iSampJ + 3 * nSrcXSize);
 
             XMMReg4Double v_padfWeight =
-                XMMReg4Double::Load4Val(padfWeight + iC);
+                XMMReg4Double::Load4Val(padfWeightsHorizontal + iC);
 
             v_acc_1 += v_pixels_1 * v_padfWeight;
             v_acc_2 += v_pixels_2 * v_padfWeight;
@@ -4350,7 +4376,7 @@ static bool GWKResampleNoMasks_SSE2_T(const GDALWarpKernel *poWK, int iBand,
                 XMMReg2Double::Load2Val(pSrcBand + i + iSampJ + 3 * nSrcXSize);
 
             XMMReg2Double v_padfWeight =
-                XMMReg2Double::Load2Val(padfWeight + iC);
+                XMMReg2Double::Load2Val(padfWeightsHorizontal + iC);
 
             v_acc_1.AddToLow(v_pixels_1 * v_padfWeight);
             v_acc_2.AddToLow(v_pixels_2 * v_padfWeight);
@@ -4368,40 +4394,29 @@ static bool GWKResampleNoMasks_SSE2_T(const GDALWarpKernel *poWK, int iBand,
 
         if (i == iMax)
         {
-            dfAccumulatorLocal_1 +=
-                static_cast<double>(pSrcBand[i + iSampJ]) * padfWeight[iC];
+            dfAccumulatorLocal_1 += static_cast<double>(pSrcBand[i + iSampJ]) *
+                                    padfWeightsHorizontal[iC];
             dfAccumulatorLocal_2 +=
                 static_cast<double>(pSrcBand[i + iSampJ + nSrcXSize]) *
-                padfWeight[iC];
+                padfWeightsHorizontal[iC];
             dfAccumulatorLocal_3 +=
                 static_cast<double>(pSrcBand[i + iSampJ + 2 * nSrcXSize]) *
-                padfWeight[iC];
+                padfWeightsHorizontal[iC];
             dfAccumulatorLocal_4 +=
                 static_cast<double>(pSrcBand[i + iSampJ + 3 * nSrcXSize]) *
-                padfWeight[iC];
+                padfWeightsHorizontal[iC];
         }
 
-        // Calculate the Y weight.
-        const double dfWeight0 = (j - dfDeltaY) * dfYScale;
-        const double dfWeight1 = dfWeight0 + dfYScale;
-        const double dfWeight2 = dfWeight1 + dfYScale;
-        const double dfWeight3 = dfWeight2 + dfYScale;
-        double adfWeight[4] = {dfWeight0, dfWeight1, dfWeight2, dfWeight3};
-
-        dfAccumulatorWeightVertical += pfnGetWeight4Values(adfWeight);
-        dfAccumulator += adfWeight[0] * dfAccumulatorLocal_1;
-        dfAccumulator += adfWeight[1] * dfAccumulatorLocal_2;
-        dfAccumulator += adfWeight[2] * dfAccumulatorLocal_3;
-        dfAccumulator += adfWeight[3] * dfAccumulatorLocal_4;
+        dfAccumulator += padfWeightsVertical[jC] * dfAccumulatorLocal_1;
+        dfAccumulator += padfWeightsVertical[jC + 1] * dfAccumulatorLocal_2;
+        dfAccumulator += padfWeightsVertical[jC + 2] * dfAccumulatorLocal_3;
+        dfAccumulator += padfWeightsVertical[jC + 3] * dfAccumulatorLocal_4;
     }
-    for (; j <= jMax; ++j)
+    for (; j <= jMax; ++j, iSampJ += nSrcXSize, ++jC)
     {
-        const GPtrDiff_t iSampJ =
-            iSrcOffset + static_cast<GPtrDiff_t>(j) * nSrcXSize;
-
         // Loop over all pixels in the row.
-        iC = 0;
-        i = iMin;
+        int iC = 0;
+        int i = iMin;
         // Process by chunk of 4 cols.
         XMMReg4Double v_acc = XMMReg4Double::Zero();
         for (; i + 2 < iMax; i += 4, iC += 4)
@@ -4410,7 +4425,7 @@ static bool GWKResampleNoMasks_SSE2_T(const GDALWarpKernel *poWK, int iBand,
             XMMReg4Double v_pixels =
                 XMMReg4Double::Load4Val(pSrcBand + i + iSampJ);
             XMMReg4Double v_padfWeight =
-                XMMReg4Double::Load4Val(padfWeight + iC);
+                XMMReg4Double::Load4Val(padfWeightsHorizontal + iC);
 
             v_acc += v_pixels * v_padfWeight;
         }
@@ -4419,27 +4434,23 @@ static bool GWKResampleNoMasks_SSE2_T(const GDALWarpKernel *poWK, int iBand,
 
         if (i < iMax)
         {
-            dfAccumulatorLocal += pSrcBand[i + iSampJ] * padfWeight[iC];
-            dfAccumulatorLocal += pSrcBand[i + 1 + iSampJ] * padfWeight[iC + 1];
+            dfAccumulatorLocal +=
+                pSrcBand[i + iSampJ] * padfWeightsHorizontal[iC];
+            dfAccumulatorLocal +=
+                pSrcBand[i + 1 + iSampJ] * padfWeightsHorizontal[iC + 1];
             i += 2;
             iC += 2;
         }
         if (i == iMax)
         {
-            dfAccumulatorLocal +=
-                static_cast<double>(pSrcBand[i + iSampJ]) * padfWeight[iC];
+            dfAccumulatorLocal += static_cast<double>(pSrcBand[i + iSampJ]) *
+                                  padfWeightsHorizontal[iC];
         }
 
-        // Calculate the Y weight.
-        double dfWeight = pfnGetWeight((j - dfDeltaY) * dfYScale);
-        dfAccumulator += dfWeight * dfAccumulatorLocal;
-        dfAccumulatorWeightVertical += dfWeight;
+        dfAccumulator += padfWeightsVertical[jC] * dfAccumulatorLocal;
     }
 
-    const double dfAccumulatorWeight =
-        dfAccumulatorWeightHorizontal * dfAccumulatorWeightVertical;
-
-    *pValue = GWKClampValueT<T>(dfAccumulator / dfAccumulatorWeight);
+    *pValue = GWKClampValueT<T>(dfAccumulator * dfInvWeights);
 
     return true;
 }
@@ -4451,10 +4462,13 @@ static bool GWKResampleNoMasks_SSE2_T(const GDALWarpKernel *poWK, int iBand,
 template <>
 bool GWKResampleNoMasksT<GByte>(const GDALWarpKernel *poWK, int iBand,
                                 double dfSrcX, double dfSrcY, GByte *pValue,
-                                double *padfWeight)
+                                double *padfWeightsHorizontal,
+                                double *padfWeightsVertical,
+                                double &dfInvWeights)
 {
     return GWKResampleNoMasks_SSE2_T(poWK, iBand, dfSrcX, dfSrcY, pValue,
-                                     padfWeight);
+                                     padfWeightsHorizontal, padfWeightsVertical,
+                                     dfInvWeights);
 }
 
 /************************************************************************/
@@ -4464,10 +4478,13 @@ bool GWKResampleNoMasksT<GByte>(const GDALWarpKernel *poWK, int iBand,
 template <>
 bool GWKResampleNoMasksT<GInt16>(const GDALWarpKernel *poWK, int iBand,
                                  double dfSrcX, double dfSrcY, GInt16 *pValue,
-                                 double *padfWeight)
+                                 double *padfWeightsHorizontal,
+                                 double *padfWeightsVertical,
+                                 double &dfInvWeights)
 {
     return GWKResampleNoMasks_SSE2_T(poWK, iBand, dfSrcX, dfSrcY, pValue,
-                                     padfWeight);
+                                     padfWeightsHorizontal, padfWeightsVertical,
+                                     dfInvWeights);
 }
 
 /************************************************************************/
@@ -4477,10 +4494,13 @@ bool GWKResampleNoMasksT<GInt16>(const GDALWarpKernel *poWK, int iBand,
 template <>
 bool GWKResampleNoMasksT<GUInt16>(const GDALWarpKernel *poWK, int iBand,
                                   double dfSrcX, double dfSrcY, GUInt16 *pValue,
-                                  double *padfWeight)
+                                  double *padfWeightsHorizontal,
+                                  double *padfWeightsVertical,
+                                  double &dfInvWeights)
 {
     return GWKResampleNoMasks_SSE2_T(poWK, iBand, dfSrcX, dfSrcY, pValue,
-                                     padfWeight);
+                                     padfWeightsHorizontal, padfWeightsVertical,
+                                     dfInvWeights);
 }
 
 /************************************************************************/
@@ -4490,10 +4510,13 @@ bool GWKResampleNoMasksT<GUInt16>(const GDALWarpKernel *poWK, int iBand,
 template <>
 bool GWKResampleNoMasksT<float>(const GDALWarpKernel *poWK, int iBand,
                                 double dfSrcX, double dfSrcY, float *pValue,
-                                double *padfWeight)
+                                double *padfWeightsHorizontal,
+                                double *padfWeightsVertical,
+                                double &dfInvWeights)
 {
     return GWKResampleNoMasks_SSE2_T(poWK, iBand, dfSrcX, dfSrcY, pValue,
-                                     padfWeight);
+                                     padfWeightsHorizontal, padfWeightsVertical,
+                                     dfInvWeights);
 }
 
 #ifdef INSTANTIATE_FLOAT64_SSE2_IMPL
@@ -4505,10 +4528,13 @@ bool GWKResampleNoMasksT<float>(const GDALWarpKernel *poWK, int iBand,
 template <>
 bool GWKResampleNoMasksT<double>(const GDALWarpKernel *poWK, int iBand,
                                  double dfSrcX, double dfSrcY, double *pValue,
-                                 double *padfWeight)
+                                 double *padfWeightsHorizontal,
+                                 double *padfWeightsVertical,
+                                 double &dfInvWeights)
 {
     return GWKResampleNoMasks_SSE2_T(poWK, iBand, dfSrcX, dfSrcY, pValue,
-                                     padfWeight);
+                                     padfWeightsHorizontal, padfWeightsVertical,
+                                     dfInvWeights);
 }
 
 #endif /* INSTANTIATE_FLOAT64_SSE2_IMPL */
@@ -5865,8 +5891,10 @@ static void GWKResampleNoMasksOrDstDensityOnlyThreadInternal(void *pData)
     int *pabSuccess = static_cast<int *>(CPLMalloc(sizeof(int) * nDstXSize));
 
     const int nXRadius = poWK->nXRadius;
-    double *padfWeight =
+    double *padfWeightsX =
         static_cast<double *>(CPLCalloc(1 + nXRadius * 2, sizeof(double)));
+    double *padfWeightsY = static_cast<double *>(
+        CPLCalloc(1 + poWK->nYRadius * 2, sizeof(double)));
     const double dfSrcCoordPrecision = CPLAtof(CSLFetchNameValueDef(
         poWK->papszWarpOptions, "SRC_COORD_PRECISION", "0"));
     const double dfErrorThreshold = CPLAtof(
@@ -5929,6 +5957,7 @@ static void GWKResampleNoMasksOrDstDensityOnlyThreadInternal(void *pData)
             const GPtrDiff_t iDstOffset =
                 iDstX + static_cast<GPtrDiff_t>(iDstY) * nDstXSize;
 
+            [[maybe_unused]] double dfInvWeights = 0;
             for (int iBand = 0; iBand < poWK->nBands; iBand++)
             {
                 T value = 0;
@@ -5952,7 +5981,8 @@ static void GWKResampleNoMasksOrDstDensityOnlyThreadInternal(void *pData)
                 {
                     GWKResampleNoMasksT(
                         poWK, iBand, padfX[iDstX] - poWK->nSrcXOff,
-                        padfY[iDstX] - poWK->nSrcYOff, &value, padfWeight);
+                        padfY[iDstX] - poWK->nSrcYOff, &value, padfWeightsX,
+                        padfWeightsY, dfInvWeights);
                 }
 
                 if (poWK->bApplyVerticalShift)
@@ -5990,7 +6020,8 @@ static void GWKResampleNoMasksOrDstDensityOnlyThreadInternal(void *pData)
     CPLFree(padfY);
     CPLFree(padfZ);
     CPLFree(pabSuccess);
-    CPLFree(padfWeight);
+    CPLFree(padfWeightsX);
+    CPLFree(padfWeightsY);
 }
 
 template <class T, GDALResampleAlg eResample>

From b7845678132f3a025eaf7012d8ac453a99be663c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Thu, 24 Oct 2024 11:37:03 +0200
Subject: [PATCH 29/87] JPEGXL: allow a minimum DISTANCE of 0.01, max of 25 and
 revise QUALITY to DISTANCE formula

to be in sync with latest libjxl

Fixes #11095
---
 autotest/gdrivers/jpegxl.py          |  2 +-
 doc/source/drivers/raster/cog.rst    |  4 ++--
 doc/source/drivers/raster/gtiff.rst  |  4 ++--
 doc/source/drivers/raster/jpegxl.rst |  4 ++--
 frmts/gtiff/cogdriver.cpp            |  4 ++--
 frmts/gtiff/geotiff.cpp              |  4 ++--
 frmts/jpegxl/jpegxl.cpp              | 15 +++++++++------
 frmts/jpegxl/jpegxldrivercore.cpp    |  4 ++--
 8 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/autotest/gdrivers/jpegxl.py b/autotest/gdrivers/jpegxl.py
index 4983e012b119..55ee592a9cc2 100755
--- a/autotest/gdrivers/jpegxl.py
+++ b/autotest/gdrivers/jpegxl.py
@@ -127,7 +127,7 @@ def test_jpegxl_rgba_distance():
 
 
 @pytest.mark.parametrize(
-    "quality,equivalent_distance", [(100, 0), (90, 1), (10, 12.65)]
+    "quality,equivalent_distance", [(100, 0), (10, 15.266666666666667)]
 )
 def test_jpegxl_rgba_quality(quality, equivalent_distance):
 
diff --git a/doc/source/drivers/raster/cog.rst b/doc/source/drivers/raster/cog.rst
index c7a50573c960..c46bac1f5703 100644
--- a/doc/source/drivers/raster/cog.rst
+++ b/doc/source/drivers/raster/cog.rst
@@ -125,7 +125,7 @@ General creation options
       The higher, the smaller file and slower compression time.
 
 -  .. co:: JXL_DISTANCE
-      :choices: 0.1-15
+      :choices: 0.01-25
       :default: 1.0
 
       Distance level for lossy JPEG-XL compression.
@@ -137,7 +137,7 @@ General creation options
       The recommended range is [0.5,3].
 
 -  .. co:: JXL_ALPHA_DISTANCE
-      :choices: -1, 0, 0.1-15
+      :choices: -1, 0, 0.01-25
       :default: -1
       :since: 3.7
 
diff --git a/doc/source/drivers/raster/gtiff.rst b/doc/source/drivers/raster/gtiff.rst
index 0ba9c0de89bc..2a8c02d43a96 100644
--- a/doc/source/drivers/raster/gtiff.rst
+++ b/doc/source/drivers/raster/gtiff.rst
@@ -634,7 +634,7 @@ This driver supports the following creation options:
       The higher, the smaller file and slower compression time.
 
 -  .. co:: JXL_DISTANCE
-      :choices: [0.1-15]
+      :choices: [0.01-25]
       :default: 1.0
 
       Distance level for lossy JPEG-XL compression.
@@ -646,7 +646,7 @@ This driver supports the following creation options:
       The recommended range is [0.5,3].
 
 -  .. co:: JXL_ALPHA_DISTANCE
-      :choices: -1,0,[0.1-15]
+      :choices: -1,0,[0.01-25]
       :default: -1
       :since: 3.7
 
diff --git a/doc/source/drivers/raster/jpegxl.rst b/doc/source/drivers/raster/jpegxl.rst
index f1453995c310..4ad829843a4d 100644
--- a/doc/source/drivers/raster/jpegxl.rst
+++ b/doc/source/drivers/raster/jpegxl.rst
@@ -108,7 +108,7 @@ The following creation options are available:
       The higher, the smaller file and slower compression time.
 
 -  .. co:: DISTANCE
-      :choices: 0.1-15
+      :choices: 0.01-25
       :default: 1.0
 
       Distance level for lossy JPEG-XL compression.
@@ -120,7 +120,7 @@ The following creation options are available:
       The recommended range is [0.5,3].
 
 -  .. co:: ALPHA_DISTANCE
-      :choices: -1, 0, 0.1-15
+      :choices: -1, 0, 0.01-25
       :default: -1.0
       :since: 3.7
 
diff --git a/frmts/gtiff/cogdriver.cpp b/frmts/gtiff/cogdriver.cpp
index 69a72ec7488d..ac56ca0d2845 100644
--- a/frmts/gtiff/cogdriver.cpp
+++ b/frmts/gtiff/cogdriver.cpp
@@ -1505,13 +1505,13 @@ void GDALCOGDriver::InitializeCreationOptionList()
         "1(fast)-9(slow)' default='5'/>"
         "   <Option name='JXL_DISTANCE' type='float' description='Distance "
         "level for lossy compression (0=mathematically lossless, 1.0=visually "
-        "lossless, usual range [0.5,3])' default='1.0' min='0.1' max='15.0'/>";
+        "lossless, usual range [0.5,3])' default='1.0' min='0.01' max='25.0'/>";
 #ifdef HAVE_JxlEncoderSetExtraChannelDistance
     osOptions += "   <Option name='JXL_ALPHA_DISTANCE' type='float' "
                  "description='Distance level for alpha channel "
                  "(-1=same as non-alpha channels, "
                  "0=mathematically lossless, 1.0=visually lossless, "
-                 "usual range [0.5,3])' default='-1' min='-1' max='15.0'/>";
+                 "usual range [0.5,3])' default='-1' min='-1' max='25.0'/>";
 #endif
 #endif
     osOptions +=
diff --git a/frmts/gtiff/geotiff.cpp b/frmts/gtiff/geotiff.cpp
index 7afa7acefc7d..854c9cf91b7b 100644
--- a/frmts/gtiff/geotiff.cpp
+++ b/frmts/gtiff/geotiff.cpp
@@ -1412,13 +1412,13 @@ void GDALRegister_GTiff()
         "1(fast)-9(slow)' default='5'/>"
         "   <Option name='JXL_DISTANCE' type='float' description='Distance "
         "level for lossy compression (0=mathematically lossless, 1.0=visually "
-        "lossless, usual range [0.5,3])' default='1.0' min='0.1' max='15.0'/>";
+        "lossless, usual range [0.5,3])' default='1.0' min='0.01' max='25.0'/>";
 #ifdef HAVE_JxlEncoderSetExtraChannelDistance
     osOptions += "   <Option name='JXL_ALPHA_DISTANCE' type='float' "
                  "description='Distance level for alpha channel "
                  "(-1=same as non-alpha channels, "
                  "0=mathematically lossless, 1.0=visually lossless, "
-                 "usual range [0.5,3])' default='-1' min='-1' max='15.0'/>";
+                 "usual range [0.5,3])' default='-1' min='-1' max='25.0'/>";
 #endif
 #endif
     osOptions +=
diff --git a/frmts/jpegxl/jpegxl.cpp b/frmts/jpegxl/jpegxl.cpp
index 46befd797728..eb2edeaae7e8 100644
--- a/frmts/jpegxl/jpegxl.cpp
+++ b/frmts/jpegxl/jpegxl.cpp
@@ -37,6 +37,8 @@ struct VSILFileReleaser
 };
 }  // namespace
 
+constexpr float MIN_DISTANCE = 0.01f;
+
 /************************************************************************/
 /*                        JPEGXLDataset                                 */
 /************************************************************************/
@@ -2136,18 +2138,19 @@ GDALDataset *JPEGXLDataset::CreateCopy(const char *pszFilename,
             }
             else
             {
-                fDistance = static_cast<float>(
-                    6.4 + pow(2.5, (30 - quality) / 5.0f) / 6.25f);
+                fDistance =
+                    static_cast<float>(53.0 / 3000.0 * quality * quality -
+                                       23.0 / 20.0 * quality + 25.0);
             }
         }
-        if (fDistance >= 0.0f && fDistance < 0.1f)
-            fDistance = 0.1f;
+        if (fDistance >= 0.0f && fDistance < MIN_DISTANCE)
+            fDistance = MIN_DISTANCE;
 
         if (pszAlphaDistance)
         {
             fAlphaDistance = static_cast<float>(CPLAtof(pszAlphaDistance));
-            if (fAlphaDistance > 0.0f && fAlphaDistance < 0.1f)
-                fAlphaDistance = 0.1f;
+            if (fAlphaDistance > 0.0f && fAlphaDistance < MIN_DISTANCE)
+                fAlphaDistance = MIN_DISTANCE;
         }
     }
 
diff --git a/frmts/jpegxl/jpegxldrivercore.cpp b/frmts/jpegxl/jpegxldrivercore.cpp
index 8ce943e54576..b179896d1d50 100644
--- a/frmts/jpegxl/jpegxldrivercore.cpp
+++ b/frmts/jpegxl/jpegxldrivercore.cpp
@@ -96,13 +96,13 @@ void JPEGXLDriverSetCommonMetadata(GDALDriver *poDriver)
         "1(fast)-9(slow)' default='5'/>"
         "   <Option name='DISTANCE' type='float' description='Distance level "
         "for lossy compression (0=mathematically lossless, 1.0=visually "
-        "lossless, usual range [0.5,3])' default='1.0' min='0.1' max='15.0'/>"
+        "lossless, usual range [0.5,3])' default='1.0' min='0.01' max='25.0'/>"
 #ifdef HAVE_JxlEncoderSetExtraChannelDistance
         "  <Option name='ALPHA_DISTANCE' type='float' "
         "description='Distance level for alpha channel "
         "(-1=same as non-alpha channels, "
         "0=mathematically lossless, 1.0=visually lossless, "
-        "usual range [0.5,3])' default='-1' min='-1' max='15.0'/>"
+        "usual range [0.5,3])' default='-1' min='-1' max='25.0'/>"
 #endif
         "   <Option name='QUALITY' type='float' description='Alternative "
         "setting to DISTANCE to specify lossy compression, roughly matching "

From 461e1ad7c85ebf6837cf4b4af0f833dc2b831f7d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 19 Oct 2024 23:38:43 +0200
Subject: [PATCH 30/87] Warper: improve performance of Byte/UInt16 multi-band
 bicubic warping with XSCALE=1 and YSCALE=1 on SSE2 / x86_64

On extracted2.tif dataset from
https://github.com/OSGeo/gdal/issues/11042#issuecomment-2420556574 (12500 x 10000 pixels, 3 bands, Byte) ``gdalwarp -s_srs EPSG:8353 -t_srs EPSG:3857 -r cubic extracted2.tif tmp.tif -overwrite -wo XSCALE=1 -wo YSCALE=1`` goes from 19.0 seconds to 15.7.
---
 alg/gdalwarpkernel.cpp                  | 202 +++++++++++++++++++++---
 autotest/utilities/test_gdalwarp_lib.py |  77 +++++++++
 2 files changed, 254 insertions(+), 25 deletions(-)

diff --git a/alg/gdalwarpkernel.cpp b/alg/gdalwarpkernel.cpp
index 9053cb24cddf..f6c10a08df84 100644
--- a/alg/gdalwarpkernel.cpp
+++ b/alg/gdalwarpkernel.cpp
@@ -2849,11 +2849,14 @@ static bool GWKBilinearResampleNoMasks4SampleT(const GDALWarpKernel *poWK,
 // or http://en.wikipedia.org/wiki/Cubic_Hermite_spline : CINTx(p_1,p0,p1,p2)
 // http://en.wikipedia.org/wiki/Bicubic_interpolation: matrix notation
 
-// TODO(schwehr): Use an inline function.
-#define CubicConvolution(distance1, distance2, distance3, f0, f1, f2, f3)      \
-    (f1 + 0.5 * (distance1 * (f2 - f0) +                                       \
-                 distance2 * (2.0 * f0 - 5.0 * f1 + 4.0 * f2 - f3) +           \
-                 distance3 * (3.0 * (f1 - f2) + f3 - f0)))
+template <typename T>
+static inline T CubicConvolution(T distance1, T distance2, T distance3, T f0,
+                                 T f1, T f2, T f3)
+{
+    return (f1 + T(0.5) * (distance1 * (f2 - f0) +
+                           distance2 * (2 * f0 - 5 * f1 + 4 * f2 - f3) +
+                           distance3 * (3 * (f1 - f2) + f3 - f0)));
+}
 
 /************************************************************************/
 /*                       GWKCubicComputeWeights()                       */
@@ -2861,19 +2864,18 @@ static bool GWKBilinearResampleNoMasks4SampleT(const GDALWarpKernel *poWK,
 
 // adfCoeffs[2] = 1.0 - (adfCoeffs[0] + adfCoeffs[1] - adfCoeffs[3]);
 
-// TODO(schwehr): Use an inline function.
-#define GWKCubicComputeWeights(dfX_, adfCoeffs)                                \
-    {                                                                          \
-        const double dfX = dfX_;                                               \
-        const double dfHalfX = 0.5 * dfX;                                      \
-        const double dfThreeX = 3.0 * dfX;                                     \
-        const double dfHalfX2 = dfHalfX * dfX;                                 \
-                                                                               \
-        adfCoeffs[0] = dfHalfX * (-1 + dfX * (2 - dfX));                       \
-        adfCoeffs[1] = 1 + dfHalfX2 * (-5 + dfThreeX);                         \
-        adfCoeffs[2] = dfHalfX * (1 + dfX * (4 - dfThreeX));                   \
-        adfCoeffs[3] = dfHalfX2 * (-1 + dfX);                                  \
-    }
+template <typename T>
+static inline void GWKCubicComputeWeights(T x, T coeffs[4])
+{
+    const T halfX = T(0.5) * x;
+    const T threeX = T(3.0) * x;
+    const T halfX2 = halfX * x;
+
+    coeffs[0] = halfX * (-1 + x * (2 - x));
+    coeffs[1] = 1 + halfX2 * (-5 + threeX);
+    coeffs[2] = halfX * (1 + x * (4 - threeX));
+    coeffs[3] = halfX2 * (-1 + x);
+}
 
 // TODO(schwehr): Use an inline function.
 #define CONVOL4(v1, v2)                                                        \
@@ -2969,10 +2971,7 @@ static bool GWKCubicResample4Sample(const GDALWarpKernel *poWK, int iBand,
     return true;
 }
 
-// We do not define USE_SSE_CUBIC_IMPL since in practice, it gives zero
-// perf benefit.
-
-#if defined(USE_SSE_CUBIC_IMPL) && (defined(__x86_64) || defined(_M_X64))
+#if defined(__x86_64) || defined(_M_X64)
 
 /************************************************************************/
 /*                           XMMLoad4Values()                           */
@@ -2985,7 +2984,7 @@ static CPL_INLINE __m128 XMMLoad4Values(const GByte *ptr)
 {
     unsigned int i;
     memcpy(&i, ptr, 4);
-    __m128i xmm_i = _mm_cvtsi32_si128(s);
+    __m128i xmm_i = _mm_cvtsi32_si128(i);
     // Zero extend 4 packed unsigned 8-bit integers in a to packed
     // 32-bit integers.
 #if __SSE4_1__
@@ -3001,7 +3000,7 @@ static CPL_INLINE __m128 XMMLoad4Values(const GUInt16 *ptr)
 {
     GUInt64 i;
     memcpy(&i, ptr, 8);
-    __m128i xmm_i = _mm_cvtsi64_si128(s);
+    __m128i xmm_i = _mm_cvtsi64_si128(i);
     // Zero extend 4 packed unsigned 16-bit integers in a to packed
     // 32-bit integers.
 #if __SSE4_1__
@@ -3038,7 +3037,7 @@ static CPL_INLINE float XMMHorizontalAdd(__m128 v)
 }
 #endif
 
-#endif  // defined(USE_SSE_CUBIC_IMPL) && (defined(__x86_64) || defined(_M_X64))
+#endif  // (defined(__x86_64) || defined(_M_X64))
 
 /************************************************************************/
 /*            GWKCubicResampleSrcMaskIsDensity4SampleRealT()            */
@@ -3046,6 +3045,8 @@ static CPL_INLINE float XMMHorizontalAdd(__m128 v)
 
 // Note: if USE_SSE_CUBIC_IMPL, only instantiate that for Byte and UInt16,
 // because there are a few assumptions above those types.
+// We do not define USE_SSE_CUBIC_IMPL since in practice, it gives zero
+// perf benefit.
 
 template <class T>
 static CPL_INLINE bool GWKCubicResampleSrcMaskIsDensity4SampleRealT(
@@ -5853,6 +5854,141 @@ static CPLErr GWKRealCase(GDALWarpKernel *poWK)
     return GWKRun(poWK, "GWKRealCase", GWKRealCaseThread);
 }
 
+/************************************************************************/
+/*                 GWKCubicResampleNoMasks4MultiBandT()                 */
+/************************************************************************/
+
+/* We restrict to 64bit processors because they are guaranteed to have SSE2 */
+/* and enough SSE registries */
+#if defined(__x86_64) || defined(_M_X64)
+
+static inline float Convolute4x4(const __m128 row0, const __m128 row1,
+                                 const __m128 row2, const __m128 row3,
+                                 const __m128 weightsXY0,
+                                 const __m128 weightsXY1,
+                                 const __m128 weightsXY2,
+                                 const __m128 weightsXY3)
+{
+    return XMMHorizontalAdd(_mm_add_ps(
+        _mm_add_ps(_mm_mul_ps(row0, weightsXY0), _mm_mul_ps(row1, weightsXY1)),
+        _mm_add_ps(_mm_mul_ps(row2, weightsXY2),
+                   _mm_mul_ps(row3, weightsXY3))));
+}
+
+template <class T>
+static void GWKCubicResampleNoMasks4MultiBandT(const GDALWarpKernel *poWK,
+                                               double dfSrcX, double dfSrcY,
+                                               const GPtrDiff_t iDstOffset)
+{
+    const double dfSrcXShifted = dfSrcX - 0.5;
+    const int iSrcX = static_cast<int>(dfSrcXShifted);
+    const double dfSrcYShifted = dfSrcY - 0.5;
+    const int iSrcY = static_cast<int>(dfSrcYShifted);
+    const GPtrDiff_t iSrcOffset =
+        iSrcX + static_cast<GPtrDiff_t>(iSrcY) * poWK->nSrcXSize;
+
+    // Get the bilinear interpolation at the image borders.
+    if (iSrcX - 1 < 0 || iSrcX + 2 >= poWK->nSrcXSize || iSrcY - 1 < 0 ||
+        iSrcY + 2 >= poWK->nSrcYSize)
+    {
+        for (int iBand = 0; iBand < poWK->nBands; iBand++)
+        {
+            T value;
+            GWKBilinearResampleNoMasks4SampleT(poWK, iBand, dfSrcX, dfSrcY,
+                                               &value);
+            reinterpret_cast<T *>(poWK->papabyDstImage[iBand])[iDstOffset] =
+                value;
+        }
+    }
+    else
+    {
+        const float fDeltaX = static_cast<float>(dfSrcXShifted) - iSrcX;
+        const float fDeltaY = static_cast<float>(dfSrcYShifted) - iSrcY;
+
+        float afCoeffsX[4];
+        float afCoeffsY[4];
+        GWKCubicComputeWeights(fDeltaX, afCoeffsX);
+        GWKCubicComputeWeights(fDeltaY, afCoeffsY);
+        const auto weightsX = _mm_loadu_ps(afCoeffsX);
+        const auto weightsXY0 =
+            _mm_mul_ps(_mm_load1_ps(&afCoeffsY[0]), weightsX);
+        const auto weightsXY1 =
+            _mm_mul_ps(_mm_load1_ps(&afCoeffsY[1]), weightsX);
+        const auto weightsXY2 =
+            _mm_mul_ps(_mm_load1_ps(&afCoeffsY[2]), weightsX);
+        const auto weightsXY3 =
+            _mm_mul_ps(_mm_load1_ps(&afCoeffsY[3]), weightsX);
+
+        const GPtrDiff_t iOffset = iSrcOffset - poWK->nSrcXSize - 1;
+
+        int iBand = 0;
+        // Process 2 bands at a time
+        for (; iBand + 1 < poWK->nBands; iBand += 2)
+        {
+            const T *CPL_RESTRICT pBand0 =
+                reinterpret_cast<const T *>(poWK->papabySrcImage[iBand]);
+            const auto row0_0 = XMMLoad4Values(pBand0 + iOffset);
+            const auto row1_0 =
+                XMMLoad4Values(pBand0 + iOffset + poWK->nSrcXSize);
+            const auto row2_0 =
+                XMMLoad4Values(pBand0 + iOffset + 2 * poWK->nSrcXSize);
+            const auto row3_0 =
+                XMMLoad4Values(pBand0 + iOffset + 3 * poWK->nSrcXSize);
+
+            const T *CPL_RESTRICT pBand1 =
+                reinterpret_cast<const T *>(poWK->papabySrcImage[iBand + 1]);
+            const auto row0_1 = XMMLoad4Values(pBand1 + iOffset);
+            const auto row1_1 =
+                XMMLoad4Values(pBand1 + iOffset + poWK->nSrcXSize);
+            const auto row2_1 =
+                XMMLoad4Values(pBand1 + iOffset + 2 * poWK->nSrcXSize);
+            const auto row3_1 =
+                XMMLoad4Values(pBand1 + iOffset + 3 * poWK->nSrcXSize);
+
+            const float fValue_0 =
+                Convolute4x4(row0_0, row1_0, row2_0, row3_0, weightsXY0,
+                             weightsXY1, weightsXY2, weightsXY3);
+
+            const float fValue_1 =
+                Convolute4x4(row0_1, row1_1, row2_1, row3_1, weightsXY0,
+                             weightsXY1, weightsXY2, weightsXY3);
+
+            T *CPL_RESTRICT pDstBand0 =
+                reinterpret_cast<T *>(poWK->papabyDstImage[iBand]);
+            pDstBand0[iDstOffset] = GWKClampValueT<T>(fValue_0);
+
+            T *CPL_RESTRICT pDstBand1 =
+                reinterpret_cast<T *>(poWK->papabyDstImage[iBand + 1]);
+            pDstBand1[iDstOffset] = GWKClampValueT<T>(fValue_1);
+        }
+        if (iBand < poWK->nBands)
+        {
+            const T *CPL_RESTRICT pBand0 =
+                reinterpret_cast<const T *>(poWK->papabySrcImage[iBand]);
+            const auto row0 = XMMLoad4Values(pBand0 + iOffset);
+            const auto row1 =
+                XMMLoad4Values(pBand0 + iOffset + poWK->nSrcXSize);
+            const auto row2 =
+                XMMLoad4Values(pBand0 + iOffset + 2 * poWK->nSrcXSize);
+            const auto row3 =
+                XMMLoad4Values(pBand0 + iOffset + 3 * poWK->nSrcXSize);
+
+            const float fValue =
+                Convolute4x4(row0, row1, row2, row3, weightsXY0, weightsXY1,
+                             weightsXY2, weightsXY3);
+
+            T *CPL_RESTRICT pDstBand =
+                reinterpret_cast<T *>(poWK->papabyDstImage[iBand]);
+            pDstBand[iDstOffset] = GWKClampValueT<T>(fValue);
+        }
+    }
+
+    if (poWK->pafDstDensity)
+        poWK->pafDstDensity[iDstOffset] = 1.0f;
+}
+
+#endif  // defined(__x86_64) || defined(_M_X64)
+
 /************************************************************************/
 /*                GWKResampleNoMasksOrDstDensityOnlyThreadInternal()    */
 /************************************************************************/
@@ -5957,6 +6093,22 @@ static void GWKResampleNoMasksOrDstDensityOnlyThreadInternal(void *pData)
             const GPtrDiff_t iDstOffset =
                 iDstX + static_cast<GPtrDiff_t>(iDstY) * nDstXSize;
 
+#if defined(__x86_64) || defined(_M_X64)
+            if constexpr (bUse4SamplesFormula && eResample == GRA_Cubic &&
+                          (std::is_same<T, GByte>::value ||
+                           std::is_same<T, GUInt16>::value))
+            {
+                if (poWK->nBands > 1 && !poWK->bApplyVerticalShift)
+                {
+                    GWKCubicResampleNoMasks4MultiBandT<T>(
+                        poWK, padfX[iDstX] - poWK->nSrcXOff,
+                        padfY[iDstX] - poWK->nSrcYOff, iDstOffset);
+
+                    continue;
+                }
+            }
+#endif  // defined(__x86_64) || defined(_M_X64)
+
             [[maybe_unused]] double dfInvWeights = 0;
             for (int iBand = 0; iBand < poWK->nBands; iBand++)
             {
diff --git a/autotest/utilities/test_gdalwarp_lib.py b/autotest/utilities/test_gdalwarp_lib.py
index 3cb97c04aee6..d89a24d80dcd 100755
--- a/autotest/utilities/test_gdalwarp_lib.py
+++ b/autotest/utilities/test_gdalwarp_lib.py
@@ -4330,3 +4330,80 @@ def test_gdalwarp_lib_src_is_geog_arc_second():
     assert out_ds.RasterXSize == 5464
     assert out_ds.RasterYSize == 5464
     assert out_ds.GetRasterBand(1).Checksum() == 31856
+
+
+###############################################################################
+# Test GWKCubicResampleNoMasks4MultiBandT<Byte>()
+
+
+def test_gdalwarp_lib_cubic_multiband_byte_4sample_optim():
+
+    src_ds = gdal.Open("../gdrivers/data/small_world.tif")
+
+    # RGB only
+    out_ds = gdal.Warp(
+        "",
+        src_ds,
+        options="-f MEM -tr 0.9 0.9 -te -10 40.1 8.9 59 -r cubic",
+    )
+    assert out_ds.RasterXSize == 21
+    assert out_ds.RasterYSize == 21
+    assert [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)] == [
+        4785,
+        4689,
+        5007,
+    ]
+
+    # With dest alpha
+    out_ds = gdal.Warp(
+        "",
+        src_ds,
+        options="-f MEM -tr 0.9 0.9 -te -10 40.1 8.9 59 -r cubic -dstalpha",
+    )
+    assert out_ds.RasterXSize == 21
+    assert out_ds.RasterYSize == 21
+    assert [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)] == [
+        4785,
+        4689,
+        5007,
+    ]
+    assert out_ds.GetRasterBand(4).ComputeRasterMinMax() == (255, 255)
+
+    # Test edge effects
+    # (slightly change the target resolution so that the nearest approximation
+    # doesn't kick in)
+    out_ds = gdal.Warp(
+        "",
+        src_ds,
+        options="-f MEM -r cubic -tr 0.9000001 0.9000001 -wo XSCALE=1 -wo YSCALE=1",
+    )
+    assert out_ds.RasterXSize == 400
+    assert out_ds.RasterYSize == 200
+    assert out_ds.ReadRaster() == src_ds.ReadRaster()
+
+
+###############################################################################
+# Test GWKCubicResampleNoMasks4MultiBandT<GUInt16>()
+
+
+def test_gdalwarp_lib_cubic_multiband_uint16_4sample_optim():
+
+    src_ds = gdal.Open("../gdrivers/data/small_world.tif")
+    src_ds = gdal.Translate(
+        "", src_ds, options="-f MEM -ot UInt16 -scale 0 255 0 65535"
+    )
+
+    # RGB only
+    out_ds = gdal.Warp(
+        "",
+        src_ds,
+        options="-f MEM -tr 0.9 0.9 -te -10 40.1 8.9 59 -r cubic",
+    )
+    out_ds = gdal.Translate("", out_ds, options="-f MEM -ot Byte -scale 0 65535 0 255")
+    assert out_ds.RasterXSize == 21
+    assert out_ds.RasterYSize == 21
+    assert [out_ds.GetRasterBand(i + 1).Checksum() for i in range(3)] == [
+        4785,
+        4689,
+        5007,
+    ]

From bcf774d3483a6614371691d55eef6ec7a26d8682 Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Thu, 24 Oct 2024 11:15:17 -0400
Subject: [PATCH 31/87] CPLParseMemorySize: Accept zero values

---
 autotest/cpp/test_cpl.cpp | 10 ++++++++++
 port/cpl_string.cpp       |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/autotest/cpp/test_cpl.cpp b/autotest/cpp/test_cpl.cpp
index 90e2c33445ad..ba43804e23b4 100644
--- a/autotest/cpp/test_cpl.cpp
+++ b/autotest/cpp/test_cpl.cpp
@@ -1777,6 +1777,16 @@ TEST_F(test_cpl, CPLParseMemorySize)
     EXPECT_GT(nValue, 100 * 1024 * 1024);
     EXPECT_TRUE(bUnitSpecified);
 
+    result = CPLParseMemorySize("0", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_None);
+    EXPECT_EQ(nValue, 0);
+    EXPECT_FALSE(bUnitSpecified);
+
+    result = CPLParseMemorySize("0MB", &nValue, &bUnitSpecified);
+    EXPECT_EQ(result, CE_None);
+    EXPECT_EQ(nValue, 0);
+    EXPECT_TRUE(bUnitSpecified);
+
     result = CPLParseMemorySize("  802  ", &nValue, &bUnitSpecified);
     EXPECT_EQ(result, CE_None);
     EXPECT_EQ(nValue, 802);
diff --git a/port/cpl_string.cpp b/port/cpl_string.cpp
index 1462f5157d88..53853a202bd5 100644
--- a/port/cpl_string.cpp
+++ b/port/cpl_string.cpp
@@ -1779,10 +1779,10 @@ CPLErr CPLParseMemorySize(const char *pszValue, GIntBig *pnValue,
         return CE_Failure;
     }
 
-    if (value <= 0 || !std::isfinite(value))
+    if (value < 0 || !std::isfinite(value))
     {
         CPLError(CE_Failure, CPLE_IllegalArg,
-                 "Memory size must be a positive number.");
+                 "Memory size must be a positive number or zero.");
         return CE_Failure;
     }
 

From 88f06a8854a634759b14c78e5a08370063680a10 Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Thu, 24 Oct 2024 13:57:30 -0400
Subject: [PATCH 32/87] apps: remove gdalwarpsimple

---
 apps/CMakeLists.txt   |   2 -
 apps/gdalwarpsimple.c | 451 ------------------------------------------
 2 files changed, 453 deletions(-)
 delete mode 100644 apps/gdalwarpsimple.c

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 90634aaf4d6c..9e9920db5b57 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -165,7 +165,6 @@ if (BUILD_APPS)
   add_executable(gdaltorture EXCLUDE_FROM_ALL gdaltorture.cpp)
   add_executable(gdal2ogr EXCLUDE_FROM_ALL gdal2ogr.c)
   add_executable(gdalasyncread EXCLUDE_FROM_ALL gdalasyncread.cpp)
-  add_executable(gdalwarpsimple EXCLUDE_FROM_ALL gdalwarpsimple.c)
   add_executable(multireadtest EXCLUDE_FROM_ALL multireadtest.cpp)
   if(NOT MSVC AND CMAKE_THREAD_LIBS_INIT)
     target_link_libraries(multireadtest PRIVATE ${CMAKE_THREAD_LIBS_INIT})
@@ -180,7 +179,6 @@ if (BUILD_APPS)
           gdalasyncread
           gdaltorture
           gdalflattenmask
-          gdalwarpsimple
           multireadtest
           test_ogrsf
           testreprojmulti)
diff --git a/apps/gdalwarpsimple.c b/apps/gdalwarpsimple.c
deleted file mode 100644
index 781b9a03bbfd..000000000000
--- a/apps/gdalwarpsimple.c
+++ /dev/null
@@ -1,451 +0,0 @@
-/******************************************************************************
- *
- * Project:  Mapinfo Image Warper
- * Purpose:  Commandline program for doing a variety of image warps, including
- *           image reprojection.
- * Author:   Frank Warmerdam <warmerdam@pobox.com>
- *
- ******************************************************************************
- * Copyright (c) 2002, i3 - information integration and imaging
- *                          Fort Collin, CO
- *
- * SPDX-License-Identifier: MIT
- ****************************************************************************/
-
-#include "gdal_alg.h"
-#include "cpl_string.h"
-#include "ogr_srs_api.h"
-
-static GDALDatasetH GDALWarpCreateOutput(GDALDatasetH hSrcDS,
-                                         const char *pszFilename,
-                                         const char *pszFormat,
-                                         const char *pszSourceSRS,
-                                         const char *pszTargetSRS, int nOrder,
-                                         char **papszCreateOptions);
-
-static double dfMinX = 0.0, dfMinY = 0.0, dfMaxX = 0.0, dfMaxY = 0.0;
-static double dfXRes = 0.0, dfYRes = 0.0;
-static int nForcePixels = 0, nForceLines = 0;
-
-/************************************************************************/
-/*                               Usage()                                */
-/************************************************************************/
-
-static void Usage()
-
-{
-    printf("Usage: gdalwarpsimple [--version] [--formats]\n"
-           "    [-s_srs <srs_def>] [-t_srs <srs_def>] [-order <n>] [-et "
-           "<err_threshold>]\n"
-           "    [-te <xmin> <ymin> <xmax> <ymax>] [-tr <xres> <yres>] [-ts "
-           "<width> <height>]\n"
-           "    [-of <format>] [-co <NAME>=<VALUE>]... <srcfile> <dstfile>\n");
-    exit(1);
-}
-
-/************************************************************************/
-/*                             SanitizeSRS                              */
-/************************************************************************/
-
-char *SanitizeSRS(const char *pszUserInput)
-
-{
-    OGRSpatialReferenceH hSRS;
-    char *pszResult = NULL;
-
-    CPLErrorReset();
-
-    hSRS = OSRNewSpatialReference(NULL);
-    if (OSRSetFromUserInput(hSRS, pszUserInput) == OGRERR_NONE)
-        OSRExportToWkt(hSRS, &pszResult);
-    else
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "Translating source or target SRS failed:\n%s", pszUserInput);
-        exit(1);
-    }
-
-    OSRDestroySpatialReference(hSRS);
-
-    return pszResult;
-}
-
-/************************************************************************/
-/*                                main()                                */
-/************************************************************************/
-
-int main(int argc, char **argv)
-
-{
-    GDALDatasetH hSrcDS, hDstDS;
-    const char *pszFormat = "GTiff";
-    char *pszTargetSRS = NULL;
-    char *pszSourceSRS = NULL;
-    const char *pszSrcFilename = NULL, *pszDstFilename = NULL;
-    int bCreateOutput = FALSE, i, nOrder = 0;
-    void *hTransformArg, *hGenImgProjArg = NULL, *hApproxArg = NULL;
-    char **papszWarpOptions = NULL;
-    double dfErrorThreshold = 0.125;
-    GDALTransformerFunc pfnTransformer = NULL;
-    char **papszCreateOptions = NULL;
-
-    GDALAllRegister();
-
-    /* -------------------------------------------------------------------- */
-    /*      Parse arguments.                                                */
-    /* -------------------------------------------------------------------- */
-    for (i = 1; i < argc; i++)
-    {
-        if (EQUAL(argv[i], "--version"))
-        {
-            printf("%s\n", GDALVersionInfo("--version"));
-            exit(0);
-        }
-        else if (EQUAL(argv[i], "--formats"))
-        {
-            int iDr;
-
-            printf("Supported Formats:\n");
-            for (iDr = 0; iDr < GDALGetDriverCount(); iDr++)
-            {
-                GDALDriverH hDriver = GDALGetDriver(iDr);
-
-                printf("  %s: %s\n", GDALGetDriverShortName(hDriver),
-                       GDALGetDriverLongName(hDriver));
-            }
-
-            exit(0);
-        }
-        else if (EQUAL(argv[i], "-co") && i < argc - 1)
-        {
-            papszCreateOptions = CSLAddString(papszCreateOptions, argv[++i]);
-            bCreateOutput = TRUE;
-        }
-        else if (EQUAL(argv[i], "-of") && i < argc - 1)
-        {
-            pszFormat = argv[++i];
-            bCreateOutput = TRUE;
-        }
-        else if (EQUAL(argv[i], "-t_srs") && i < argc - 1)
-        {
-            pszTargetSRS = SanitizeSRS(argv[++i]);
-        }
-        else if (EQUAL(argv[i], "-s_srs") && i < argc - 1)
-        {
-            pszSourceSRS = SanitizeSRS(argv[++i]);
-        }
-        else if (EQUAL(argv[i], "-order") && i < argc - 1)
-        {
-            nOrder = atoi(argv[++i]);
-        }
-        else if (EQUAL(argv[i], "-et") && i < argc - 1)
-        {
-            dfErrorThreshold = CPLAtof(argv[++i]);
-        }
-        else if (EQUAL(argv[i], "-tr") && i < argc - 2)
-        {
-            dfXRes = CPLAtof(argv[++i]);
-            dfYRes = fabs(CPLAtof(argv[++i]));
-            bCreateOutput = TRUE;
-        }
-        else if (EQUAL(argv[i], "-ts") && i < argc - 2)
-        {
-            nForcePixels = atoi(argv[++i]);
-            nForceLines = atoi(argv[++i]);
-            bCreateOutput = TRUE;
-        }
-        else if (EQUAL(argv[i], "-te") && i < argc - 4)
-        {
-            dfMinX = CPLAtof(argv[++i]);
-            dfMinY = CPLAtof(argv[++i]);
-            dfMaxX = CPLAtof(argv[++i]);
-            dfMaxY = CPLAtof(argv[++i]);
-            bCreateOutput = TRUE;
-        }
-        else if (argv[i][0] == '-')
-            Usage();
-        else if (pszSrcFilename == NULL)
-            pszSrcFilename = argv[i];
-        else if (pszDstFilename == NULL)
-            pszDstFilename = argv[i];
-        else
-            Usage();
-    }
-
-    if (pszDstFilename == NULL)
-        Usage();
-
-    /* -------------------------------------------------------------------- */
-    /*      Open source dataset.                                            */
-    /* -------------------------------------------------------------------- */
-    hSrcDS = GDALOpen(pszSrcFilename, GA_ReadOnly);
-
-    if (hSrcDS == NULL)
-        exit(2);
-
-    /* -------------------------------------------------------------------- */
-    /*      Check that there's at least one raster band                     */
-    /* -------------------------------------------------------------------- */
-    if (GDALGetRasterCount(hSrcDS) == 0)
-    {
-        fprintf(stderr, "Input file %s has no raster bands.\n", pszSrcFilename);
-        exit(2);
-    }
-
-    if (pszSourceSRS == NULL)
-    {
-        if (GDALGetProjectionRef(hSrcDS) != NULL &&
-            strlen(GDALGetProjectionRef(hSrcDS)) > 0)
-            pszSourceSRS = CPLStrdup(GDALGetProjectionRef(hSrcDS));
-
-        else if (GDALGetGCPProjection(hSrcDS) != NULL &&
-                 strlen(GDALGetGCPProjection(hSrcDS)) > 0 &&
-                 GDALGetGCPCount(hSrcDS) > 1)
-            pszSourceSRS = CPLStrdup(GDALGetGCPProjection(hSrcDS));
-        else
-            pszSourceSRS = CPLStrdup("");
-    }
-
-    if (pszTargetSRS == NULL)
-        pszTargetSRS = CPLStrdup(pszSourceSRS);
-
-    /* -------------------------------------------------------------------- */
-    /*      Does the output dataset already exist?                          */
-    /* -------------------------------------------------------------------- */
-    CPLPushErrorHandler(CPLQuietErrorHandler);
-    hDstDS = GDALOpen(pszDstFilename, GA_Update);
-    CPLPopErrorHandler();
-
-    if (hDstDS != NULL && bCreateOutput)
-    {
-        fprintf(
-            stderr,
-            "Output dataset %s exists,\n"
-            "but some commandline options were provided indicating a new "
-            "dataset\n"
-            "should be created.  Please delete existing dataset and run again.",
-            pszDstFilename);
-        exit(1);
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      If not, we need to create it.                                   */
-    /* -------------------------------------------------------------------- */
-    if (hDstDS == NULL)
-    {
-        hDstDS = GDALWarpCreateOutput(hSrcDS, pszDstFilename, pszFormat,
-                                      pszSourceSRS, pszTargetSRS, nOrder,
-                                      papszCreateOptions);
-        papszWarpOptions = CSLSetNameValue(papszWarpOptions, "INIT", "0");
-        CSLDestroy(papszCreateOptions);
-        papszCreateOptions = NULL;
-    }
-
-    if (hDstDS == NULL)
-        exit(1);
-
-    /* -------------------------------------------------------------------- */
-    /*      Create a transformation object from the source to               */
-    /*      destination coordinate system.                                  */
-    /* -------------------------------------------------------------------- */
-    hTransformArg = hGenImgProjArg = GDALCreateGenImgProjTransformer(
-        hSrcDS, pszSourceSRS, hDstDS, pszTargetSRS, TRUE, 1000.0, nOrder);
-
-    if (hTransformArg == NULL)
-        exit(1);
-
-    pfnTransformer = GDALGenImgProjTransform;
-
-    /* -------------------------------------------------------------------- */
-    /*      Warp the transformer with a linear approximator unless the      */
-    /*      acceptable error is zero.                                       */
-    /* -------------------------------------------------------------------- */
-    if (dfErrorThreshold != 0.0)
-    {
-        hTransformArg = hApproxArg = GDALCreateApproxTransformer(
-            GDALGenImgProjTransform, hGenImgProjArg, dfErrorThreshold);
-        pfnTransformer = GDALApproxTransform;
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Now actually invoke the warper to do the work.                  */
-    /* -------------------------------------------------------------------- */
-    GDALSimpleImageWarp(hSrcDS, hDstDS, 0, NULL, pfnTransformer, hTransformArg,
-                        GDALTermProgress, NULL, papszWarpOptions);
-
-    CSLDestroy(papszWarpOptions);
-
-    if (hApproxArg != NULL)
-        GDALDestroyApproxTransformer(hApproxArg);
-
-    if (hGenImgProjArg != NULL)
-        GDALDestroyGenImgProjTransformer(hGenImgProjArg);
-
-    /* -------------------------------------------------------------------- */
-    /*      Cleanup.                                                        */
-    /* -------------------------------------------------------------------- */
-    GDALClose(hDstDS);
-    GDALClose(hSrcDS);
-
-    GDALDumpOpenDatasets(stderr);
-
-    GDALDestroyDriverManager();
-
-    exit(0);
-}
-
-/************************************************************************/
-/*                        GDALWarpCreateOutput()                        */
-/*                                                                      */
-/*      Create the output file based on various commandline options,    */
-/*      and the input file.                                             */
-/************************************************************************/
-
-static GDALDatasetH GDALWarpCreateOutput(GDALDatasetH hSrcDS,
-                                         const char *pszFilename,
-                                         const char *pszFormat,
-                                         const char *pszSourceSRS,
-                                         const char *pszTargetSRS, int nOrder,
-                                         char **papszCreateOptions)
-
-{
-    GDALDriverH hDriver;
-    GDALDatasetH hDstDS;
-    void *hTransformArg;
-    double adfDstGeoTransform[6];
-    int nPixels = 0, nLines = 0;
-    GDALColorTableH hCT;
-
-    /* -------------------------------------------------------------------- */
-    /*      Find the output driver.                                         */
-    /* -------------------------------------------------------------------- */
-    hDriver = GDALGetDriverByName(pszFormat);
-    if (hDriver == NULL ||
-        GDALGetMetadataItem(hDriver, GDAL_DCAP_CREATE, NULL) == NULL)
-    {
-        int iDr;
-
-        printf("Output driver `%s' not recognised or does not support\n",
-               pszFormat);
-        printf("direct output file creation.  The following format drivers are "
-               "configured\n"
-               "and support direct output:\n");
-
-        for (iDr = 0; iDr < GDALGetDriverCount(); iDr++)
-        {
-            GDALDriverH hDriver = GDALGetDriver(iDr);
-
-            if (GDALGetMetadataItem(hDriver, GDAL_DCAP_CREATE, NULL) != NULL)
-            {
-                printf("  %s: %s\n", GDALGetDriverShortName(hDriver),
-                       GDALGetDriverLongName(hDriver));
-            }
-        }
-        printf("\n");
-        exit(1);
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Create a transformation object from the source to               */
-    /*      destination coordinate system.                                  */
-    /* -------------------------------------------------------------------- */
-    hTransformArg = GDALCreateGenImgProjTransformer(
-        hSrcDS, pszSourceSRS, NULL, pszTargetSRS, TRUE, 1000.0, nOrder);
-
-    if (hTransformArg == NULL)
-        return NULL;
-
-    /* -------------------------------------------------------------------- */
-    /*      Get approximate output definition.                              */
-    /* -------------------------------------------------------------------- */
-    if (GDALSuggestedWarpOutput(hSrcDS, GDALGenImgProjTransform, hTransformArg,
-                                adfDstGeoTransform, &nPixels,
-                                &nLines) != CE_None)
-        return NULL;
-
-    GDALDestroyGenImgProjTransformer(hTransformArg);
-
-    /* -------------------------------------------------------------------- */
-    /*      Did the user override some parameters?                          */
-    /* -------------------------------------------------------------------- */
-    if (dfXRes != 0.0 && dfYRes != 0.0)
-    {
-        CPLAssert(nPixels == 0 && nLines == 0);
-        if (dfMinX == 0.0 && dfMinY == 0.0 && dfMaxX == 0.0 && dfMaxY == 0.0)
-        {
-            dfMinX = adfDstGeoTransform[0];
-            dfMaxX = adfDstGeoTransform[0] + adfDstGeoTransform[1] * nPixels;
-            dfMaxY = adfDstGeoTransform[3];
-            dfMinY = adfDstGeoTransform[3] + adfDstGeoTransform[5] * nLines;
-        }
-
-        nPixels = (int)((dfMaxX - dfMinX + (dfXRes / 2.0)) / dfXRes);
-        nLines = (int)((dfMaxY - dfMinY + (dfYRes / 2.0)) / dfYRes);
-        adfDstGeoTransform[0] = dfMinX;
-        adfDstGeoTransform[3] = dfMaxY;
-        adfDstGeoTransform[1] = dfXRes;
-        adfDstGeoTransform[5] = -dfYRes;
-    }
-
-    else if (nForcePixels != 0 && nForceLines != 0)
-    {
-        if (dfMinX == 0.0 && dfMinY == 0.0 && dfMaxX == 0.0 && dfMaxY == 0.0)
-        {
-            dfMinX = adfDstGeoTransform[0];
-            dfMaxX = adfDstGeoTransform[0] + adfDstGeoTransform[1] * nPixels;
-            dfMaxY = adfDstGeoTransform[3];
-            dfMinY = adfDstGeoTransform[3] + adfDstGeoTransform[5] * nLines;
-        }
-
-        dfXRes = (dfMaxX - dfMinX) / nForcePixels;
-        dfYRes = (dfMaxY - dfMinY) / nForceLines;
-
-        adfDstGeoTransform[0] = dfMinX;
-        adfDstGeoTransform[3] = dfMaxY;
-        adfDstGeoTransform[1] = dfXRes;
-        adfDstGeoTransform[5] = -dfYRes;
-
-        nPixels = nForcePixels;
-        nLines = nForceLines;
-    }
-
-    else if (dfMinX != 0.0 || dfMinY != 0.0 || dfMaxX != 0.0 || dfMaxY != 0.0)
-    {
-        dfXRes = adfDstGeoTransform[1];
-        dfYRes = fabs(adfDstGeoTransform[5]);
-
-        nPixels = (int)((dfMaxX - dfMinX + (dfXRes / 2.0)) / dfXRes);
-        nLines = (int)((dfMaxY - dfMinY + (dfYRes / 2.0)) / dfYRes);
-
-        adfDstGeoTransform[0] = dfMinX;
-        adfDstGeoTransform[3] = dfMaxY;
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Create the output file.                                         */
-    /* -------------------------------------------------------------------- */
-    printf("Creating output file is that %dP x %dL.\n", nPixels, nLines);
-
-    hDstDS = GDALCreate(hDriver, pszFilename, nPixels, nLines,
-                        GDALGetRasterCount(hSrcDS),
-                        GDALGetRasterDataType(GDALGetRasterBand(hSrcDS, 1)),
-                        papszCreateOptions);
-
-    if (hDstDS == NULL)
-        return NULL;
-
-    /* -------------------------------------------------------------------- */
-    /*      Write out the projection definition.                            */
-    /* -------------------------------------------------------------------- */
-    GDALSetProjection(hDstDS, pszTargetSRS);
-    GDALSetGeoTransform(hDstDS, adfDstGeoTransform);
-
-    /* -------------------------------------------------------------------- */
-    /*      Copy the color table, if required.                              */
-    /* -------------------------------------------------------------------- */
-    hCT = GDALGetRasterColorTable(GDALGetRasterBand(hSrcDS, 1));
-    if (hCT != NULL)
-        GDALSetRasterColorTable(GDALGetRasterBand(hDstDS, 1), hCT);
-
-    return hDstDS;
-}

From c77ea558e22698b4f8bd0d8d0305fd0e8fda9f97 Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Thu, 24 Oct 2024 13:59:45 -0400
Subject: [PATCH 33/87] apps: remove ogrdissolve

---
 apps/ogrdissolve.cpp | 1211 ------------------------------------------
 1 file changed, 1211 deletions(-)
 delete mode 100644 apps/ogrdissolve.cpp

diff --git a/apps/ogrdissolve.cpp b/apps/ogrdissolve.cpp
deleted file mode 100644
index 233c884920cc..000000000000
--- a/apps/ogrdissolve.cpp
+++ /dev/null
@@ -1,1211 +0,0 @@
-/******************************************************************************
- *
- * Project:  OpenGIS Simple Features Reference Implementation
- * Purpose:  Allow a user to dissolve geometries based on an attribute.
- * Author:   Howard Butler, hobu.inc@gmail.com
- *
- ******************************************************************************
- * Copyright (c) 2007, Howard Butler
- *
- * SPDX-License-Identifier: MIT
- ****************************************************************************/
-
-#include "ogrsf_frmts.h"
-#include "ogr_p.h"
-#include "cpl_conv.h"
-#include "cpl_string.h"
-#include "ogr_api.h"
-#include "commonutils.h"
-#include <map>
-#include <list>
-
-static void Usage();
-
-static int DissolveLayer(OGRDataSource *poSrcDS, OGRLayer *poSrcLayer,
-                         OGRDataSource *poDstDS, char **papszLSCO,
-                         const char *pszNewLayerName, int bTransform,
-                         OGRSpatialReference *poOutputSRS,
-                         OGRSpatialReference *poSourceSRS,
-                         char **papszSelFields, int bAppend, int eGType,
-                         int bOverwrite);
-
-static int bSkipFailures = FALSE;
-static int nGroupTransactions = 200;
-static int bPreserveFID = FALSE;
-static int nFIDToFetch = OGRNullFID;
-
-typedef std::multimap<CPLString, OGRGeometry *> StringGeometryMMap;
-typedef std::map<CPLString, OGRGeometryCollection *> StringGeometryColMap;
-typedef std::map<CPLString, OGRGeometry *> StringGeometryMap;
-typedef std::list<OGRGeometry *> GeometriesList;
-
-/************************************************************************/
-/*                                main()                                */
-/************************************************************************/
-
-MAIN_START(nArgc, papszArgv)
-
-{
-    const char *pszFormat = "ESRI Shapefile";
-    const char *pszDataSource = NULL;
-    const char *pszDestDataSource = NULL;
-    char **papszLayers = NULL;
-    char **papszDSCO = NULL, **papszLCO = NULL;
-    int bTransform = FALSE;
-    int bAppend = FALSE, bUpdate = FALSE, bOverwrite = FALSE;
-    const char *pszOutputSRSDef = NULL;
-    const char *pszSourceSRSDef = NULL;
-    OGRSpatialReference *poOutputSRS = NULL;
-    OGRSpatialReference *poSourceSRS = NULL;
-    const char *pszNewLayerName = NULL;
-    const char *pszWHERE = NULL;
-    OGRGeometry *poSpatialFilter = NULL;
-    const char *pszSelect;
-    char **papszSelFields = NULL;
-    const char *pszSQLStatement = NULL;
-    int eGType = -2;
-
-    /* -------------------------------------------------------------------- */
-    /*      Register format(s).                                             */
-    /* -------------------------------------------------------------------- */
-    OGRRegisterAll();
-
-    /* -------------------------------------------------------------------- */
-    /*      Processing command line arguments.                              */
-    /* -------------------------------------------------------------------- */
-    nArgc = OGRGeneralCmdLineProcessor(nArgc, &papszArgv, 0);
-
-    if (nArgc < 1)
-        exit(-nArgc);
-
-    for (int iArg = 1; iArg < nArgc; iArg++)
-    {
-        if (EQUAL(papszArgv[iArg], "--help"))
-        {
-            Usage();
-        }
-        if ((EQUAL(papszArgv[iArg], "-f") || EQUAL(papszArgv[iArg], "-of")) &&
-            iArg < nArgc - 1)
-        {
-            pszFormat = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-dsco") && iArg < nArgc - 1)
-        {
-            papszDSCO = CSLAddString(papszDSCO, papszArgv[++iArg]);
-        }
-        else if (EQUAL(papszArgv[iArg], "-lco") && iArg < nArgc - 1)
-        {
-            papszLCO = CSLAddString(papszLCO, papszArgv[++iArg]);
-        }
-        else if (EQUAL(papszArgv[iArg], "-preserve_fid"))
-        {
-            bPreserveFID = TRUE;
-        }
-        else if (STARTS_WITH_CI(papszArgv[iArg], "-skip"))
-        {
-            bSkipFailures = TRUE;
-        }
-        else if (EQUAL(papszArgv[iArg], "-append"))
-        {
-            bAppend = TRUE;
-        }
-        else if (EQUAL(papszArgv[iArg], "-overwrite"))
-        {
-            bOverwrite = TRUE;
-        }
-        else if (EQUAL(papszArgv[iArg], "-update"))
-        {
-            bUpdate = TRUE;
-        }
-        else if (EQUAL(papszArgv[iArg], "-fid") && papszArgv[iArg + 1] != NULL)
-        {
-            nFIDToFetch = atoi(papszArgv[++iArg]);
-        }
-        else if (EQUAL(papszArgv[iArg], "-sql") && papszArgv[iArg + 1] != NULL)
-        {
-            pszSQLStatement = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-nln") && iArg < nArgc - 1)
-        {
-            pszNewLayerName = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-nlt") && iArg < nArgc - 1)
-        {
-            int bIs3D = FALSE;
-            CPLString osGeomName = papszArgv[iArg + 1];
-            if (strlen(papszArgv[iArg + 1]) > 3 &&
-                STARTS_WITH_CI(papszArgv[iArg + 1] +
-                                   strlen(papszArgv[iArg + 1]) - 3,
-                               "25D"))
-            {
-                bIs3D = TRUE;
-                osGeomName.resize(osGeomName.size() - 3);
-            }
-            else if (strlen(papszArgv[iArg + 1]) > 1 &&
-                     STARTS_WITH_CI(papszArgv[iArg + 1] +
-                                        strlen(papszArgv[iArg + 1]) - 1,
-                                    "Z"))
-            {
-                bIs3D = TRUE;
-                osGeomName.pop_back();
-            }
-            if (EQUAL(osGeomName, "NONE"))
-                eGType = wkbNone;
-            else if (EQUAL(osGeomName, "GEOMETRY"))
-                eGType = wkbUnknown;
-            else
-            {
-                eGType = OGRFromOGCGeomType(osGeomName);
-                if (eGType == wkbUnknown)
-                {
-                    fprintf(stderr, "-nlt %s: type not recognised.\n",
-                            papszArgv[iArg + 1]);
-                    exit(1);
-                }
-            }
-            if (eGType != wkbNone && bIs3D)
-                eGType = wkbSetZ((OGRwkbGeometryType)eGType);
-            iArg++;
-        }
-        else if (EQUAL(papszArgv[iArg], "-tg") && iArg < nArgc - 1)
-        {
-            nGroupTransactions = atoi(papszArgv[++iArg]);
-        }
-        else if (EQUAL(papszArgv[iArg], "-s_srs") && iArg < nArgc - 1)
-        {
-            pszSourceSRSDef = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-a_srs") && iArg < nArgc - 1)
-        {
-            pszOutputSRSDef = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-t_srs") && iArg < nArgc - 1)
-        {
-            pszOutputSRSDef = papszArgv[++iArg];
-            bTransform = TRUE;
-        }
-        else if (EQUAL(papszArgv[iArg], "-spat") &&
-                 papszArgv[iArg + 1] != NULL && papszArgv[iArg + 2] != NULL &&
-                 papszArgv[iArg + 3] != NULL && papszArgv[iArg + 4] != NULL)
-        {
-            OGRLinearRing oRing;
-
-            oRing.addPoint(CPLAtof(papszArgv[iArg + 1]),
-                           CPLAtof(papszArgv[iArg + 2]));
-            oRing.addPoint(CPLAtof(papszArgv[iArg + 1]),
-                           CPLAtof(papszArgv[iArg + 4]));
-            oRing.addPoint(CPLAtof(papszArgv[iArg + 3]),
-                           CPLAtof(papszArgv[iArg + 4]));
-            oRing.addPoint(CPLAtof(papszArgv[iArg + 3]),
-                           CPLAtof(papszArgv[iArg + 2]));
-            oRing.addPoint(CPLAtof(papszArgv[iArg + 1]),
-                           CPLAtof(papszArgv[iArg + 2]));
-
-            poSpatialFilter = new OGRPolygon();
-            poSpatialFilter->toPolygon()->addRing(&oRing);
-            iArg += 4;
-        }
-        else if (EQUAL(papszArgv[iArg], "-where") &&
-                 papszArgv[iArg + 1] != NULL)
-        {
-            pszWHERE = papszArgv[++iArg];
-        }
-        else if (EQUAL(papszArgv[iArg], "-select") &&
-                 papszArgv[iArg + 1] != NULL)
-        {
-            pszSelect = papszArgv[++iArg];
-            papszSelFields =
-                CSLTokenizeStringComplex(pszSelect, " ,", FALSE, FALSE);
-        }
-        else if (papszArgv[iArg][0] == '-')
-        {
-            Usage();
-        }
-        else if (pszDestDataSource == NULL)
-            pszDestDataSource = papszArgv[iArg];
-        else if (pszDataSource == NULL)
-            pszDataSource = papszArgv[iArg];
-        else
-            papszLayers = CSLAddString(papszLayers, papszArgv[iArg]);
-    }
-
-    if (pszDataSource == NULL)
-        Usage();
-
-    /* -------------------------------------------------------------------- */
-    /*      Open data source.                                               */
-    /* -------------------------------------------------------------------- */
-    OGRDataSource *poDS;
-
-    poDS = OGRSFDriverRegistrar::Open(pszDataSource, FALSE);
-
-    /* -------------------------------------------------------------------- */
-    /*      Report failure                                                  */
-    /* -------------------------------------------------------------------- */
-    if (poDS == NULL)
-    {
-        OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
-
-        printf("FAILURE:\n"
-               "Unable to open datasource `%s' with the following drivers.\n",
-               pszDataSource);
-
-        for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
-        {
-            printf("  -> %s\n", poR->GetDriver(iDriver)->GetName());
-        }
-
-        exit(1);
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Try opening the output datasource as an existing, writable      */
-    /* -------------------------------------------------------------------- */
-    OGRDataSource *poODS;
-
-    if (bUpdate)
-    {
-        poODS = OGRSFDriverRegistrar::Open(pszDestDataSource, TRUE);
-        if (poODS == NULL)
-        {
-            printf("FAILURE:\n"
-                   "Unable to open existing output datasource `%s'.\n",
-                   pszDestDataSource);
-            exit(1);
-        }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Find the output driver.                                         */
-    /* -------------------------------------------------------------------- */
-    else
-    {
-        OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
-        OGRSFDriver *poDriver = NULL;
-        int iDriver;
-
-        for (iDriver = 0; iDriver < poR->GetDriverCount() && poDriver == NULL;
-             iDriver++)
-        {
-            if (EQUAL(poR->GetDriver(iDriver)->GetName(), pszFormat))
-            {
-                poDriver = poR->GetDriver(iDriver);
-            }
-        }
-
-        if (poDriver == NULL)
-        {
-            printf("Unable to find driver `%s'.\n", pszFormat);
-            printf("The following drivers are available:\n");
-
-            for (iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
-            {
-                printf("  -> `%s'\n", poR->GetDriver(iDriver)->GetName());
-            }
-            exit(1);
-        }
-
-        if (!poDriver->TestCapability(ODrCCreateDataSource))
-        {
-            printf("%s driver does not support data source creation.\n",
-                   pszFormat);
-            exit(1);
-        }
-
-        /* --------------------------------------------------------------------
-         */
-        /*      Create the output data source. */
-        /* --------------------------------------------------------------------
-         */
-        poODS = poDriver->CreateDataSource(pszDestDataSource, papszDSCO);
-        if (poODS == NULL)
-        {
-            printf("%s driver failed to create %s\n", pszFormat,
-                   pszDestDataSource);
-            exit(1);
-        }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Parse the output SRS definition if possible.                    */
-    /* -------------------------------------------------------------------- */
-    if (pszOutputSRSDef != NULL)
-    {
-        poOutputSRS = new OGRSpatialReference();
-        poOutputSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-        if (poOutputSRS->SetFromUserInput(pszOutputSRSDef) != OGRERR_NONE)
-        {
-            printf("Failed to process SRS definition: %s\n", pszOutputSRSDef);
-            exit(1);
-        }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Parse the source SRS definition if possible.                    */
-    /* -------------------------------------------------------------------- */
-    if (pszSourceSRSDef != NULL)
-    {
-        poSourceSRS = new OGRSpatialReference();
-        poSourceSRS->SetAxisMappingStrategy(OAMS_TRADITIONAL_GIS_ORDER);
-        if (poSourceSRS->SetFromUserInput(pszSourceSRSDef) != OGRERR_NONE)
-        {
-            printf("Failed to process SRS definition: %s\n", pszSourceSRSDef);
-            exit(1);
-        }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Special case for -sql clause.  No source layers required.       */
-    /* -------------------------------------------------------------------- */
-    if (pszSQLStatement != NULL)
-    {
-        OGRLayer *poResultSet;
-
-        if (pszWHERE != NULL)
-            printf("-where clause ignored in combination with -sql.\n");
-        if (CSLCount(papszLayers) > 0)
-            printf("layer names ignored in combination with -sql.\n");
-
-        poResultSet = poDS->ExecuteSQL(pszSQLStatement, poSpatialFilter, NULL);
-
-        if (poResultSet != NULL)
-        {
-            if (!DissolveLayer(poDS, poResultSet, poODS, papszLCO,
-                               pszNewLayerName, bTransform, poOutputSRS,
-                               poSourceSRS, papszSelFields, bAppend, eGType,
-                               bOverwrite))
-            {
-                CPLError(CE_Failure, CPLE_AppDefined,
-                         "Terminating translation prematurely after failed\n"
-                         "translation from sql statement.");
-
-                exit(1);
-            }
-            poDS->ReleaseResultSet(poResultSet);
-        }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Process each data source layer.                                 */
-    /* -------------------------------------------------------------------- */
-    for (int iLayer = 0;
-         pszSQLStatement == NULL && iLayer < poDS->GetLayerCount(); iLayer++)
-    {
-        OGRLayer *poLayer = poDS->GetLayer(iLayer);
-
-        if (poLayer == NULL)
-        {
-            printf("FAILURE: Couldn't fetch advertised layer %d!\n", iLayer);
-            exit(1);
-        }
-
-        if (CSLCount(papszLayers) == 0 ||
-            CSLFindString(papszLayers, poLayer->GetLayerDefn()->GetName()) !=
-                -1)
-        {
-            if (pszWHERE != NULL)
-                poLayer->SetAttributeFilter(pszWHERE);
-
-            if (poSpatialFilter != NULL)
-                poLayer->SetSpatialFilter(poSpatialFilter);
-
-            if (!DissolveLayer(poDS, poLayer, poODS, papszLCO, pszNewLayerName,
-                               bTransform, poOutputSRS, poSourceSRS,
-                               papszSelFields, bAppend, eGType, bOverwrite) &&
-                !bSkipFailures)
-            {
-                CPLError(CE_Failure, CPLE_AppDefined,
-                         "Terminating translation prematurely after failed\n"
-                         "translation of layer %s\n",
-                         poLayer->GetLayerDefn()->GetName());
-
-                exit(1);
-            }
-        }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Close down.                                                     */
-    /* -------------------------------------------------------------------- */
-    OGRSpatialReference::DestroySpatialReference(poOutputSRS);
-    OGRSpatialReference::DestroySpatialReference(poSourceSRS);
-    OGRDataSource::DestroyDataSource(poODS);
-    OGRDataSource::DestroyDataSource(poDS);
-
-    CSLDestroy(papszSelFields);
-    CSLDestroy(papszArgv);
-    CSLDestroy(papszLayers);
-    CSLDestroy(papszDSCO);
-    CSLDestroy(papszLCO);
-
-    OGRCleanupAll();
-
-#ifdef DBMALLOC
-    malloc_dump(1);
-#endif
-
-    return 0;
-}
-
-MAIN_END
-
-/************************************************************************/
-/*                               Usage()                                */
-/************************************************************************/
-
-static void Usage()
-
-{
-    OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
-
-    printf("Usage: ogr2ogr [--help] [--help-general]\n"
-           "               [-skipfailures] [-append] [-update]\n"
-           "               [-select field_list] [-where restricted_where] \n"
-           "               [-sql <sql statement>] \n"
-           "               [-spat xmin ymin xmax ymax] [-preserve_fid] [-fid "
-           "FID]\n"
-           "               [-a_srs srs_def] [-t_srs srs_def] [-s_srs srs_def]\n"
-           "               [-f format_name] [-overwrite] [[-dsco NAME=VALUE] "
-           "...]\n"
-           "               dst_datasource_name src_datasource_name\n"
-           "               [-lco NAME=VALUE] [-nln name] [-nlt type] [layer "
-           "[layer ...]]\n"
-           "\n"
-           " -f format_name: output file format name, possible values are:\n");
-
-    for (int iDriver = 0; iDriver < poR->GetDriverCount(); iDriver++)
-    {
-        OGRSFDriver *poDriver = poR->GetDriver(iDriver);
-
-        if (poDriver->TestCapability(ODrCCreateDataSource))
-            printf("     -f \"%s\"\n", poDriver->GetName());
-    }
-
-    printf(
-        " -append: Append to existing layer instead of creating new if it "
-        "exists\n"
-        " -overwrite: delete the output layer and recreate it empty\n"
-        " -update: Open existing output datasource in update mode\n"
-        " -select field_list: Comma-delimited list of fields from input layer "
-        "to\n"
-        "                     copy to the new layer (defaults to all)\n"
-        " -where restricted_where: Attribute query (like SQL WHERE)\n"
-        " -sql statement: Execute given SQL statement and save result.\n"
-        " -skipfailures: skip features or layers that fail to convert\n"
-        " -spat xmin ymin xmax ymax: spatial query extents\n"
-        " -dsco NAME=VALUE: Dataset creation option (format specific)\n"
-        " -lco  NAME=VALUE: Layer creation option (format specific)\n"
-        " -nln name: Assign an alternate name to the new layer\n"
-        " -nlt type: Force a geometry type for new layer.  One of NONE, "
-        "GEOMETRY,\n"
-        "      POINT, LINESTRING, POLYGON, GEOMETRYCOLLECTION, MULTIPOINT, "
-        "MULTILINE,\n"
-        "      MULTIPOLYGON, or MULTILINESTRING.  Add \"25D\" for 3D layers.\n"
-        "      Default is type of source layer.\n");
-
-    printf(" -a_srs srs_def: Assign an output SRS\n"
-           " -t_srs srs_def: Reproject/transform to this SRS on output\n"
-           " -s_srs srs_def: Override source SRS\n"
-           "\n"
-           " Srs_def can be a full WKT definition (hard to escape properly),\n"
-           " or a well known definition (i.e. EPSG:4326) or a file with a WKT\n"
-           " definition.\n");
-
-    exit(1);
-}
-
-StringGeometryMap *CollectGeometries(OGRLayer *poSrcLayer,
-                                     const char **papszFields)
-{
-
-    /* -------------------------------------------------------------------- */
-    /*      CollectGeometries returns a dictionary where the keys are the   */
-    /*      values in the fields that the user has selected and the values  */
-    /*      are a GeometryCollection of all of the geometries for records   */
-    /*      with that value.                                                */
-    /* -------------------------------------------------------------------- */
-
-    StringGeometryMMap poGeometriesMap;
-
-    poSrcLayer->ResetReading();
-
-    int iField;
-    /* -------------------------------------------------------------------- */
-    /*      Get all of the features and put them in a multi map.  This may   */
-    /*      include values for which the selected fields is NULL.           */
-    /* -------------------------------------------------------------------- */
-
-    for (auto &poFeature : poSrcLayer)
-    {
-        CPLString poKey("");
-
-        for (iField = 0; papszFields[iField] != NULL; iField++)
-        {
-            int nField = poFeature->GetFieldIndex(papszFields[iField]);
-            poKey = poKey + poFeature->GetFieldAsString(nField);
-        }
-
-        if (poFeature->GetGeometryRef()->IsValid())
-        {
-            poGeometriesMap.insert(
-                std::make_pair(CPLString(poKey), poFeature->GetGeometryRef()));
-        }
-        else
-        {
-            CPLDebug("CollectGeometries",
-                     "Geometry was invalid not adding!!!!");
-        }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Loop through our features map and get a unique list of field    */
-    /*      values.  This could be done using something other than a map    */
-    /*      of course, but it was convenient.                               */
-    /* -------------------------------------------------------------------- */
-
-    typedef std::map<CPLString, int> StringIntMap;
-    StringIntMap::const_iterator ipos;
-    StringIntMap poFieldsmap;
-
-    StringGeometryMMap::const_iterator pos;
-
-    for (pos = poGeometriesMap.begin(); pos != poGeometriesMap.end(); ++pos)
-    {
-
-        /* we currently throw out any null field values at this time */
-        //  if (!(pos->first.empty())) {
-        poFieldsmap[CPLString(pos->first.c_str())] = 1;
-        //    }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Make a new map of GeometryCollection for each value in the     */
-    /*      poFieldsmap.  This is a 1:1 relationship, and all of the        */
-    /*      geometries for a given field are all put into the same          */
-    /*      GeometryCollection.  After we build the poCollections, we will  */
-    /*      use GEOS' buffer(0) trick to have GEOS perform the segmentation */
-    /* -------------------------------------------------------------------- */
-
-    StringGeometryColMap poCollections;
-
-    CPLDebug("CollectGeometries", "Field map size: %d", poFieldsmap.size());
-
-    for (ipos = poFieldsmap.begin(); ipos != poFieldsmap.end(); ++ipos)
-    {
-
-        CPLString fid = ipos->first;
-        CPLDebug("CollectGeometries", "First %s Second %d", ipos->first.c_str(),
-                 ipos->second);
-
-        OGRGeometryCollection *geom = new OGRGeometryCollection;
-
-        for (pos = poGeometriesMap.lower_bound(fid);
-             pos != poGeometriesMap.upper_bound(fid); ++pos)
-        {
-            geom->addGeometry(pos->second);
-        }
-        poCollections.insert(std::make_pair(fid, geom));
-    }
-
-    CPLDebug("CollectGeometries", "Geo map size: %d", poCollections.size());
-
-    /* -------------------------------------------------------------------- */
-    /*      Loop through our poCollections map and buffer(0) each           */
-    /*      GeometryCollection.  GEOS will collapse the geometries down     */
-    /* -------------------------------------------------------------------- */
-
-    StringGeometryMap *buffers = new StringGeometryMap;
-
-    StringGeometryColMap::const_iterator collections_i;
-
-    for (collections_i = poCollections.begin();
-         collections_i != poCollections.end(); ++collections_i)
-    {
-        CPLDebug("CollectGeometries", "poCollections Geometry size %d",
-                 collections_i->second->getNumGeometries());
-        OGRGeometry *buffer = collections_i->second->Buffer(0);
-        buffers->insert(std::make_pair(collections_i->first, buffer));
-    }
-
-    for (collections_i = poCollections.begin();
-         collections_i != poCollections.end(); ++collections_i)
-    {
-        delete collections_i->second;
-    }
-
-    return buffers;
-}
-
-GeometriesList *FlattenGeometries(GeometriesList *input)
-{
-
-    GeometriesList::const_iterator geometry_i;
-    GeometriesList *output = new GeometriesList;
-
-    CPLDebug("CollectGeometries",
-             "Input geometries in FlattenGeometries size: %d", input->size());
-    for (geometry_i = input->begin(); geometry_i != input->end(); ++geometry_i)
-    {
-
-        OGRGeometry *buffer = (*geometry_i);
-        // int nGeometries = buffer->getNumGeometries();
-        OGRwkbGeometryType iGType = buffer->getGeometryType();
-
-        if (iGType == wkbPolygon)
-        {
-            output->push_back(buffer);
-            CPLDebug("CollectGeometries",
-                     "Collapsing wkbPolygon geometries......");
-        }
-        if (iGType == wkbMultiPolygon)
-        {
-            OGRMultiPolygon *geom = buffer->toMultiPolygon();
-            for (int i = 0; i < geom->getNumGeometries(); i++)
-            {
-                OGRPolygon *g = geom->getGeometryRef(i)->toPolygon();
-                output->push_back((OGRGeometry *)g);
-            }
-
-            CPLDebug("CollectGeometries",
-                     "Collapsing wkbMultiPolygon geometries......");
-        }
-        if (iGType == wkbGeometryCollection)
-        {
-            OGRGeometryCollection *geom = buffer->toGeometryCollection();
-            GeometriesList *collection = new GeometriesList;
-            GeometriesList::const_iterator g_i;
-            for (int i = 0; i < geom->getNumGeometries(); i++)
-            {
-                OGRGeometry *g = geom->getGeometryRef(i);
-                collection->push_back(g);
-            }
-            GeometriesList *collapsed = FlattenGeometries(collection);
-            for (g_i = collapsed->begin(); g_i != collapsed->end(); g_i++)
-            {
-                output->push_back((OGRGeometry *)(*g_i));
-                CPLDebug("CollectGeometries",
-                         "Collapsing wkbGeometryCollection geometries.");
-            }
-        }
-        // CPLDebug(   "CollectGeometries",
-        //             "Buffered Geometry size %d",
-        //             nGeometries);
-    }
-
-    return output;
-}
-
-/************************************************************************/
-/*                           DissolveLayer()                            */
-/************************************************************************/
-
-static int DissolveLayer(OGRDataSource *poSrcDS, OGRLayer *poSrcLayer,
-                         OGRDataSource *poDstDS, char **papszLCO,
-                         const char *pszNewLayerName, int bTransform,
-                         OGRSpatialReference *poOutputSRS,
-                         OGRSpatialReference *poSourceSRS,
-                         char **papszSelFields, int bAppend, int eGType,
-                         int bOverwrite)
-
-{
-
-    OGRLayer *poDstLayer;
-    OGRFeatureDefn *poFDefn;
-    OGRErr eErr;
-    int bForceToPolygon = FALSE;
-    int bForceToMultiPolygon = FALSE;
-
-    if (pszNewLayerName == NULL)
-        pszNewLayerName = poSrcLayer->GetLayerDefn()->GetName();
-
-    if (wkbFlatten(eGType) == wkbPolygon)
-        bForceToPolygon = TRUE;
-    else if (wkbFlatten(eGType) == wkbMultiPolygon)
-        bForceToMultiPolygon = TRUE;
-
-    /* -------------------------------------------------------------------- */
-    /*      Setup coordinate transformation if we need it.                  */
-    /* -------------------------------------------------------------------- */
-    OGRCoordinateTransformation *poCT = NULL;
-
-    if (bTransform)
-    {
-        if (poSourceSRS == NULL)
-            poSourceSRS = poSrcLayer->GetSpatialRef();
-
-        if (poSourceSRS == NULL)
-        {
-            printf("Can't transform coordinates, source layer has no\n"
-                   "coordinate system.  Use -s_srs to set one.\n");
-            exit(1);
-        }
-
-        CPLAssert(NULL != poSourceSRS);
-        CPLAssert(NULL != poOutputSRS);
-
-        poCT = OGRCreateCoordinateTransformation(poSourceSRS, poOutputSRS);
-        if (poCT == NULL)
-        {
-            char *pszWKT = NULL;
-
-            printf("Failed to create coordinate transformation between the\n"
-                   "following coordinate systems.  This may be because they\n"
-                   "are not transformable, or because projection services\n"
-                   "(PROJ.4 DLL/.so) could not be loaded.\n");
-
-            poSourceSRS->exportToPrettyWkt(&pszWKT, FALSE);
-            printf("Source:\n%s\n", pszWKT);
-
-            poOutputSRS->exportToPrettyWkt(&pszWKT, FALSE);
-            printf("Target:\n%s\n", pszWKT);
-            exit(1);
-        }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Get other info.                                                 */
-    /* -------------------------------------------------------------------- */
-    poFDefn = poSrcLayer->GetLayerDefn();
-
-    if (poOutputSRS == NULL)
-        poOutputSRS = poSrcLayer->GetSpatialRef();
-
-    /* -------------------------------------------------------------------- */
-    /*      Find the layer.                                                 */
-    /* -------------------------------------------------------------------- */
-    int iLayer = -1;
-    poDstLayer = NULL;
-
-    for (iLayer = 0; iLayer < poDstDS->GetLayerCount(); iLayer++)
-    {
-        OGRLayer *poLayer = poDstDS->GetLayer(iLayer);
-
-        if (poLayer != NULL &&
-            EQUAL(poLayer->GetLayerDefn()->GetName(), pszNewLayerName))
-        {
-            poDstLayer = poLayer;
-            break;
-        }
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      If the user requested overwrite, and we have the layer in       */
-    /*      question we need to delete it now so it will get recreated      */
-    /*      (overwritten).                                                  */
-    /* -------------------------------------------------------------------- */
-    if (poDstLayer != NULL && bOverwrite)
-    {
-        if (poDstDS->DeleteLayer(iLayer) != OGRERR_NONE)
-        {
-            fprintf(stderr, "DeleteLayer() failed when overwrite requested.\n");
-            return FALSE;
-        }
-        poDstLayer = NULL;
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      If the layer does not exist, then create it.                    */
-    /* -------------------------------------------------------------------- */
-    if (poDstLayer == NULL)
-    {
-        if (eGType == -2)
-            eGType = poFDefn->GetGeomType();
-
-        if (!poDstDS->TestCapability(ODsCCreateLayer))
-        {
-            fprintf(
-                stderr,
-                "Layer %s not found, and CreateLayer not supported by driver.",
-                pszNewLayerName);
-            return FALSE;
-        }
-
-        CPLErrorReset();
-
-        poDstLayer = poDstDS->CreateLayer(pszNewLayerName, poOutputSRS,
-                                          (OGRwkbGeometryType)eGType, papszLCO);
-
-        if (poDstLayer == NULL)
-            return FALSE;
-
-        bAppend = FALSE;
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Otherwise we will append to it, if append was requested.        */
-    /* -------------------------------------------------------------------- */
-    else if (!bAppend)
-    {
-        printf("FAILED: Layer %s already exists, and -append not specified.\n"
-               "        Consider using -append, or -overwrite.\n",
-               pszNewLayerName);
-        return FALSE;
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Add fields.  Default to copy all field.                         */
-    /*      If only a subset of all fields requested, then output only      */
-    /*      the selected fields, and in the order that they were            */
-    /*      selected.                                                       */
-    /* -------------------------------------------------------------------- */
-    int iField;
-
-    if (papszSelFields && !bAppend)
-    {
-        for (iField = 0; papszSelFields[iField] != NULL; iField++)
-        {
-            int iSrcField = poFDefn->GetFieldIndex(papszSelFields[iField]);
-            if (iSrcField >= 0)
-                poDstLayer->CreateField(poFDefn->GetFieldDefn(iSrcField));
-            else
-            {
-                printf("Field '%s' not found in source layer.\n",
-                       papszSelFields[iField]);
-                if (!bSkipFailures)
-                    return FALSE;
-            }
-        }
-    }
-    else if (!bAppend)
-    {
-        for (iField = 0; iField < poFDefn->GetFieldCount(); iField++)
-            poDstLayer->CreateField(poFDefn->GetFieldDefn(iField));
-    }
-
-    /* -------------------------------------------------------------------- */
-    /*      Transfer features.                                              */
-    /* -------------------------------------------------------------------- */
-    OGRFeature *poFeature;
-    int nFeaturesInTransaction = 0;
-
-    poSrcLayer->ResetReading();
-
-    if (nGroupTransactions)
-        poDstLayer->StartTransaction();
-
-    StringGeometryMap *buffers =
-        CollectGeometries(poSrcLayer, (const char **)papszSelFields);
-
-    StringGeometryMap::const_iterator buffers_i;
-    GeometriesList *input = new GeometriesList;
-
-    CPLDebug("CollectGeometries", "Buffers size: %d", buffers->size());
-    for (buffers_i = buffers->begin(); buffers_i != buffers->end(); ++buffers_i)
-    {
-        input->push_back(buffers_i->second);
-    }
-    GeometriesList *geometries = FlattenGeometries(input);
-
-    GeometriesList::const_iterator g_i;
-    for (g_i = geometries->begin(); g_i != geometries->end(); g_i++)
-    {
-        OGRFeature *feature = new OGRFeature(poFDefn);
-        feature->SetGeometry((*g_i));
-        feature->SetField("TAXDIST", "fid");
-        poDstLayer->CreateFeature(feature);
-    }
-
-    if (nGroupTransactions)
-        poDstLayer->CommitTransaction();
-
-    //  getGeometryType
-    //     if( pszNewLayerName == NULL )
-    //         pszNewLayerName = poSrcLayer->GetLayerDefn()->GetName();
-    //
-    //     if( wkbFlatten(eGType) == wkbPolygon )
-    //         bForceToPolygon = TRUE;
-    //     else if( wkbFlatten(eGType) == wkbMultiPolygon )
-    //         bForceToMultiPolygon = TRUE;
-    //
-    // /* --------------------------------------------------------------------
-    // */
-    // /*      Setup coordinate transformation if we need it. */
-    // /* --------------------------------------------------------------------
-    // */
-    //     OGRCoordinateTransformation *poCT = NULL;
-    //
-    //     if( bTransform )
-    //     {
-    //         if( poSourceSRS == NULL )
-    //             poSourceSRS = poSrcLayer->GetSpatialRef();
-    //
-    //         if( poSourceSRS == NULL )
-    //         {
-    //             printf( "Can't transform coordinates, source layer has no\n"
-    //                     "coordinate system.  Use -s_srs to set one.\n" );
-    //             exit( 1 );
-    //         }
-    //
-    //         CPLAssert( NULL != poSourceSRS );
-    //         CPLAssert( NULL != poOutputSRS );
-    //
-    //         poCT = OGRCreateCoordinateTransformation( poSourceSRS,
-    //         poOutputSRS ); if( poCT == NULL )
-    //         {
-    //             char        *pszWKT = NULL;
-    //
-    //             printf("Failed to create coordinate transformation between
-    //             the\n"
-    //                    "following coordinate systems.  This may be because
-    //                    they\n" "are not transformable, or because projection
-    //                    services\n"
-    //                    "(PROJ.4 DLL/.so) could not be loaded.\n" );
-    //
-    //             poSourceSRS->exportToPrettyWkt( &pszWKT, FALSE );
-    //             printf( "Source:\n%s\n", pszWKT );
-    //
-    //             poOutputSRS->exportToPrettyWkt( &pszWKT, FALSE );
-    //             printf( "Target:\n%s\n", pszWKT );
-    //             exit( 1 );
-    //         }
-    //     }
-    //
-    // /* --------------------------------------------------------------------
-    // */
-    // /*      Get other info. */
-    // /* --------------------------------------------------------------------
-    // */
-    //     poFDefn = poSrcLayer->GetLayerDefn();
-    //
-    //     if( poOutputSRS == NULL )
-    //         poOutputSRS = poSrcLayer->GetSpatialRef();
-    //
-    // /* --------------------------------------------------------------------
-    // */
-    // /*      Find the layer. */
-    // /* --------------------------------------------------------------------
-    // */
-    //     int iLayer = -1;
-    //     poDstLayer = NULL;
-    //
-    //     for( iLayer = 0; iLayer < poDstDS->GetLayerCount(); iLayer++ )
-    //     {
-    //         OGRLayer        *poLayer = poDstDS->GetLayer(iLayer);
-    //
-    //         if( poLayer != NULL
-    //             && EQUAL(poLayer->GetLayerDefn()->GetName(),pszNewLayerName)
-    //             )
-    //         {
-    //             poDstLayer = poLayer;
-    //             break;
-    //         }
-    //     }
-    //
-    // /* --------------------------------------------------------------------
-    // */
-    // /*      If the user requested overwrite, and we have the layer in */
-    // /*      question we need to delete it now so it will get recreated */
-    // /*      (overwritten). */
-    // /* --------------------------------------------------------------------
-    // */
-    //     if( poDstLayer != NULL && bOverwrite )
-    //     {
-    //         if( poDstDS->DeleteLayer( iLayer ) != OGRERR_NONE )
-    //         {
-    //             fprintf( stderr,
-    //                      "DeleteLayer() failed when overwrite requested.\n"
-    //                      );
-    //             return FALSE;
-    //         }
-    //         poDstLayer = NULL;
-    //     }
-    //
-    // /* --------------------------------------------------------------------
-    // */
-    // /*      If the layer does not exist, then create it. */
-    // /* --------------------------------------------------------------------
-    // */
-    //     if( poDstLayer == NULL )
-    //     {
-    //         if( eGType == -2 )
-    //             eGType = poFDefn->GetGeomType();
-    //
-    //         if( !poDstDS->TestCapability( ODsCCreateLayer ) )
-    //         {
-    //             fprintf( stderr,
-    //               "Layer %s not found, and CreateLayer not supported by
-    //               driver.",
-    //                      pszNewLayerName );
-    //             return FALSE;
-    //         }
-    //
-    //         CPLErrorReset();
-    //
-    //         poDstLayer = poDstDS->CreateLayer( pszNewLayerName, poOutputSRS,
-    //                                            (OGRwkbGeometryType) eGType,
-    //                                            papszLCO );
-    //
-    //         if( poDstLayer == NULL )
-    //             return FALSE;
-    //
-    //         bAppend = FALSE;
-    //     }
-    //
-    // /* --------------------------------------------------------------------
-    // */
-    // /*      Otherwise we will append to it, if append was requested. */
-    // /* --------------------------------------------------------------------
-    // */
-    //     else if( !bAppend )
-    //     {
-    //         printf( "FAILED: Layer %s already exists, and -append not
-    //         specified.\n"
-    //                 "        Consider using -append, or -overwrite.\n",
-    //                 pszNewLayerName );
-    //         return FALSE;
-    //     }
-    //
-    // /* --------------------------------------------------------------------
-    // */
-    // /*      Add fields.  Default to copy all field. */
-    // /*      If only a subset of all fields requested, then output only */
-    // /*      the selected fields, and in the order that they were */
-    // /*      selected. */
-    // /* --------------------------------------------------------------------
-    // */
-    //     int         iField;
-    //
-    //     if (papszSelFields && !bAppend )
-    //     {
-    //         for( iField=0; papszSelFields[iField] != NULL; iField++)
-    //         {
-    //             int iSrcField =
-    //             poFDefn->GetFieldIndex(papszSelFields[iField]); if (iSrcField
-    //             >= 0)
-    //                 poDstLayer->CreateField( poFDefn->GetFieldDefn(iSrcField)
-    //                 );
-    //             else
-    //             {
-    //                 printf( "Field '%s' not found in source layer.\n",
-    //                         papszSelFields[iField] );
-    //                 if( !bSkipFailures )
-    //                     return FALSE;
-    //             }
-    //         }
-    //     }
-    //     else if( !bAppend )
-    //     {
-    //         for( iField = 0; iField < poFDefn->GetFieldCount(); iField++ )
-    //             poDstLayer->CreateField( poFDefn->GetFieldDefn(iField) );
-    //     }
-    //
-    // /* --------------------------------------------------------------------
-    // */
-    // /*      Transfer features. */
-    // /* --------------------------------------------------------------------
-    // */
-    //     OGRFeature  *poFeature;
-    //     int         nFeaturesInTransaction = 0;
-    //
-    //     poSrcLayer->ResetReading();
-    //
-    //     if( nGroupTransactions )
-    //         poDstLayer->StartTransaction();
-    //
-    //     while( true )
-    //     {
-    //         OGRFeature      *poDstFeature = NULL;
-    //
-    //         if( nFIDToFetch != OGRNullFID )
-    //         {
-    //             // Only fetch feature on first pass.
-    //             if( nFeaturesInTransaction == 0 )
-    //                 poFeature = poSrcLayer->GetFeature(nFIDToFetch);
-    //             else
-    //                 poFeature = NULL;
-    //         }
-    //         else
-    //             poFeature = poSrcLayer->GetNextFeature();
-    //
-    //         if( poFeature == NULL )
-    //             break;
-    //
-    //         if( ++nFeaturesInTransaction == nGroupTransactions )
-    //         {
-    //             poDstLayer->CommitTransaction();
-    //             poDstLayer->StartTransaction();
-    //             nFeaturesInTransaction = 0;
-    //         }
-    //
-    //         CPLErrorReset();
-    //            poFDefn = poSrcLayer->GetLayerDefn();
-    //
-    //         if( poDstFeature->SetFrom( poFeature, TRUE ) != OGRERR_NONE )
-    //         {
-    //             if( nGroupTransactions )
-    //                 poDstLayer->CommitTransaction();
-    //
-    //             CPLError( CE_Failure, CPLE_AppDefined,
-    //                       "Unable to translate feature %d from layer %s.\n",
-    //                       poFeature->GetFID(), poFDefn->GetName() );
-    //
-    //             OGRFeature::DestroyFeature( poFeature );
-    //             OGRFeature::DestroyFeature( poDstFeature );
-    //             return FALSE;
-    //         }
-    //
-    //         if( bPreserveFID )
-    //             poDstFeature->SetFID( poFeature->GetFID() );
-    //
-    //         if( poCT && poDstFeature->GetGeometryRef() != NULL )
-    //         {
-    //             eErr = poDstFeature->GetGeometryRef()->transform( poCT );
-    //             if( eErr != OGRERR_NONE )
-    //             {
-    //                 if( nGroupTransactions )
-    //                     poDstLayer->CommitTransaction();
-    //
-    //                 printf( "Failed to transform feature %d.\n",
-    //                         static_cast<int>(poFeature->GetFID()) );
-    //                 if( !bSkipFailures )
-    //                 {
-    //                     OGRFeature::DestroyFeature( poFeature );
-    //                     OGRFeature::DestroyFeature( poDstFeature );
-    //                     return FALSE;
-    //                 }
-    //             }
-    //         }
-    //
-    //         if( poDstFeature->GetGeometryRef() != NULL && bForceToPolygon )
-    //         {
-    //             poDstFeature->SetGeometryDirectly(
-    //                 OGRGeometryFactory::forceToPolygon(
-    //                     poDstFeature->StealGeometry() ) );
-    //         }
-    //
-    //         if( poDstFeature->GetGeometryRef() != NULL &&
-    //         bForceToMultiPolygon )
-    //         {
-    //             poDstFeature->SetGeometryDirectly(
-    //                 OGRGeometryFactory::forceToMultiPolygon(
-    //                     poDstFeature->StealGeometry() ) );
-    //         }
-    //
-    //         OGRFeature::DestroyFeature( poFeature );
-    //
-    //         CPLErrorReset();
-    //         if( poDstLayer->CreateFeature( poDstFeature ) != OGRERR_NONE
-    //             && !bSkipFailures )
-    //         {
-    //             if( nGroupTransactions )
-    //                 poDstLayer->RollbackTransaction();
-    //
-    //             OGRFeature::DestroyFeature( poDstFeature );
-    //             return FALSE;
-    //         }
-    //
-    //         OGRFeature::DestroyFeature( poDstFeature );
-    //     }
-    //
-    //     if( nGroupTransactions )
-    //         poDstLayer->CommitTransaction();
-    //
-    // /* --------------------------------------------------------------------
-    // */
-    // /*      Cleaning */
-    // /* --------------------------------------------------------------------
-    // */
-    //     delete poCT;
-
-    return TRUE;
-}

From ef07c7291d8f5afd16798e7139ed4b3303b49cfc Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Thu, 24 Oct 2024 10:37:04 -0400
Subject: [PATCH 34/87] Block cache: Allow memory units in GDAL_CACHEMAX

---
 doc/source/user/configoptions.rst |  7 +++-
 gcore/gdalrasterblock.cpp         | 68 +++++++++----------------------
 port/cpl_string.cpp               |  6 +++
 3 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/doc/source/user/configoptions.rst b/doc/source/user/configoptions.rst
index 425d0292371a..ffc7cfba4152 100644
--- a/doc/source/user/configoptions.rst
+++ b/doc/source/user/configoptions.rst
@@ -222,7 +222,10 @@ Performance and caching
       :program:`gdalwarp`.
       If its value is small (less than 100000), it is assumed to be measured in megabytes,
       otherwise in bytes. Alternatively, the value can be set to "X%" to mean X%
-      of the usable physical RAM. Note that this value is only consulted the first
+      of the usable physical RAM.
+      Since GDAL 3.11, the value of :config:`GDAL_CACHEMAX` may specify the
+      units directly (e.g., "500MB", "2GB").
+      Note that this value is only consulted the first
       time the cache size is requested.  To change this value programmatically
       during operation of the program it is better to use
       :cpp:func:`GDALSetCacheMax` (always in bytes) or or
@@ -421,7 +424,7 @@ General options
       option.
 
 -  .. config:: CPL_VSIL_DEFLATE_CHUNK_SIZE
-      :default: 1 M
+      :default: 1M
 
 -  .. config:: GDAL_DISABLE_CPLLOCALEC
       :choices: YES, NO
diff --git a/gcore/gdalrasterblock.cpp b/gcore/gdalrasterblock.cpp
index cbb0415e6f44..ad9d73ed31cf 100644
--- a/gcore/gdalrasterblock.cpp
+++ b/gcore/gdalrasterblock.cpp
@@ -207,11 +207,12 @@ int CPL_STDCALL GDALGetCacheMax()
  * Gets the maximum amount of memory available to the GDALRasterBlock
  * caching system for caching GDAL read/write imagery.
  *
- * The first type this function is called, it will read the GDAL_CACHEMAX
+ * The first time this function is called, it will read the GDAL_CACHEMAX
  * configuration option to initialize the maximum cache memory.
  * Starting with GDAL 2.1, the value can be expressed as x% of the usable
- * physical RAM (which may potentially be used by other processes). Otherwise
- * it is expected to be a value in MB.
+ * physical RAM (which may potentially be used by other processes). Starting
+ * with GDAL 3.11, the value can include units of memory. If not units are
+ * provided the value is assumed to be in MB.
  *
  * @return maximum in bytes.
  *
@@ -232,60 +233,29 @@ GIntBig CPL_STDCALL GDALGetCacheMax64()
                 CPLTestBool(CPLGetConfigOption("GDAL_DEBUG_BLOCK_CACHE", "NO"));
 
             const char *pszCacheMax = CPLGetConfigOption("GDAL_CACHEMAX", "5%");
-
             GIntBig nNewCacheMax;
-            if (strchr(pszCacheMax, '%') != nullptr)
+            bool bUnitSpecified = false;
+
+            if (CPLParseMemorySize(pszCacheMax, &nNewCacheMax,
+                                   &bUnitSpecified) != CE_None)
             {
-                GIntBig nUsablePhysicalRAM = CPLGetUsablePhysicalRAM();
-                if (nUsablePhysicalRAM > 0)
+                CPLError(CE_Failure, CPLE_NotSupported,
+                         "Invalid value for GDAL_CACHEMAX. "
+                         "Using default value.");
+                if (CPLParseMemorySize("5%", &nNewCacheMax, &bUnitSpecified) !=
+                    CE_None)
                 {
-                    // For some reason, coverity pretends that this will overflow.
-                    // "Multiply operation overflows on operands
-                    // static_cast<double>( nUsablePhysicalRAM ) and
-                    // CPLAtof(pszCacheMax). Example values for operands: CPLAtof(
-                    // pszCacheMax ) = 2251799813685248,
-                    // static_cast<double>(nUsablePhysicalRAM) =
-                    // -9223372036854775808." coverity[overflow,tainted_data]
-                    double dfCacheMax =
-                        static_cast<double>(nUsablePhysicalRAM) *
-                        CPLAtof(pszCacheMax) / 100.0;
-                    if (dfCacheMax >= 0 && dfCacheMax < 1e15)
-                        nNewCacheMax = static_cast<GIntBig>(dfCacheMax);
-                    else
-                        nNewCacheMax = nCacheMax;
-                }
-                else
-                {
-                    CPLDebug("GDAL", "Cannot determine usable physical RAM.");
+                    // This means that usable physical RAM could not be determined.
                     nNewCacheMax = nCacheMax;
                 }
             }
-            else
+
+            if (!bUnitSpecified && nNewCacheMax < 100000)
             {
-                nNewCacheMax = CPLAtoGIntBig(pszCacheMax);
-                if (nNewCacheMax < 100000)
-                {
-                    if (nNewCacheMax < 0)
-                    {
-                        CPLError(CE_Failure, CPLE_NotSupported,
-                                 "Invalid value for GDAL_CACHEMAX. "
-                                 "Using default value.");
-                        GIntBig nUsablePhysicalRAM = CPLGetUsablePhysicalRAM();
-                        if (nUsablePhysicalRAM)
-                            nNewCacheMax = nUsablePhysicalRAM / 20;
-                        else
-                        {
-                            CPLDebug("GDAL",
-                                     "Cannot determine usable physical RAM.");
-                            nNewCacheMax = nCacheMax;
-                        }
-                    }
-                    else
-                    {
-                        nNewCacheMax *= 1024 * 1024;
-                    }
-                }
+                // Assume MB
+                nNewCacheMax *= (1024 * 1024);
             }
+
             nCacheMax = nNewCacheMax;
             CPLDebug("GDAL", "GDAL_CACHEMAX = " CPL_FRMT_GIB " MB",
                      nCacheMax / (1024 * 1024));
diff --git a/port/cpl_string.cpp b/port/cpl_string.cpp
index 53853a202bd5..f44dc3a350ec 100644
--- a/port/cpl_string.cpp
+++ b/port/cpl_string.cpp
@@ -1800,6 +1800,12 @@ CPLErr CPLParseMemorySize(const char *pszValue, GIntBig *pnValue,
                     return CE_Failure;
                 }
                 auto bytes = CPLGetUsablePhysicalRAM();
+                if (bytes == 0)
+                {
+                    CPLError(CE_Failure, CPLE_NotSupported,
+                             "Cannot determine usable physical RAM");
+                    return CE_Failure;
+                }
                 value *= static_cast<double>(bytes / 100);
                 unit = c;
             }

From 73f3f388ee0883979779d1b32e29c46a4ff060d3 Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Thu, 24 Oct 2024 11:37:05 -0400
Subject: [PATCH 35/87] VSI_CACHE_SIZE: Use CPLParseMemorySize

---
 autotest/gcore/vsifile.py         | 10 ++++------
 doc/source/user/configoptions.rst |  3 +++
 port/cpl_vsil_cache.cpp           | 31 ++++++++++++++++++++++++-------
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
index 25d610133971..12b69d9eaca7 100755
--- a/autotest/gcore/vsifile.py
+++ b/autotest/gcore/vsifile.py
@@ -237,16 +237,16 @@ def test_vsifile_4():
 # Test vsicache
 
 
-@pytest.mark.parametrize("cache_size", ("0", "65536", None))
-def test_vsifile_5(cache_size):
+@pytest.mark.parametrize("cache_size", ("0", "64kb", None))
+def test_vsifile_5(tmp_path, cache_size):
 
-    fp = gdal.VSIFOpenL("tmp/vsifile_5.bin", "wb")
+    fp = gdal.VSIFOpenL(tmp_path / "vsifile_5.bin", "wb")
     ref_data = "".join(["%08X" % i for i in range(5 * 32768)])
     gdal.VSIFWriteL(ref_data, 1, len(ref_data), fp)
     gdal.VSIFCloseL(fp)
 
     with gdal.config_options({"VSI_CACHE": "YES", "VSI_CACHE_SIZE": cache_size}):
-        fp = gdal.VSIFOpenL("tmp/vsifile_5.bin", "rb")
+        fp = gdal.VSIFOpenL(tmp_path / "vsifile_5.bin", "rb")
 
         gdal.VSIFSeekL(fp, 50000, 0)
         if gdal.VSIFTellL(fp) != 50000:
@@ -277,8 +277,6 @@ def test_vsifile_5(cache_size):
 
         gdal.VSIFCloseL(fp)
 
-    gdal.Unlink("tmp/vsifile_5.bin")
-
 
 ###############################################################################
 # Test vsicache an read errors (https://github.com/qgis/QGIS/issues/45293)
diff --git a/doc/source/user/configoptions.rst b/doc/source/user/configoptions.rst
index ffc7cfba4152..5e270fad9b01 100644
--- a/doc/source/user/configoptions.rst
+++ b/doc/source/user/configoptions.rst
@@ -321,6 +321,9 @@ Performance and caching
       Set the size of the VSI cache. Be wary of large values for
       ``VSI_CACHE_SIZE`` when opening VRT datasources containing many source
       rasters, as this is a per-file cache.
+      Since GDAL 3.11, the value of ``VSI_CACHE_SIZE`` may be specified using
+      memory units (e.g., "25 MB").
+
 
 Driver management
 ^^^^^^^^^^^^^^^^^
diff --git a/port/cpl_vsil_cache.cpp b/port/cpl_vsil_cache.cpp
index 64b061285c6f..3e7083584205 100644
--- a/port/cpl_vsil_cache.cpp
+++ b/port/cpl_vsil_cache.cpp
@@ -112,13 +112,30 @@ class VSICachedFile final : public VSIVirtualHandle
 
 static size_t GetCacheMax(size_t nCacheSize)
 {
-    return nCacheSize ? nCacheSize
-                      : static_cast<size_t>(std::min(
-                            static_cast<GUIntBig>(
-                                std::numeric_limits<size_t>::max() / 2),
-                            CPLScanUIntBig(CPLGetConfigOption("VSI_CACHE_SIZE",
-                                                              "25000000"),
-                                           40)));
+    if (nCacheSize)
+    {
+        return nCacheSize;
+    }
+
+    const char *pszCacheSize = CPLGetConfigOption("VSI_CACHE_SIZE", "25000000");
+    GIntBig nMemorySize;
+    bool bUnitSpecified;
+    if (CPLParseMemorySize(pszCacheSize, &nMemorySize, &bUnitSpecified) !=
+        CE_None)
+    {
+        CPLError(
+            CE_Failure, CPLE_IllegalArg,
+            "Failed to parse value of VSI_CACHE_SIZE. Using default of 25MB");
+        nMemorySize = 25000000;
+    }
+    else if (static_cast<size_t>(nMemorySize) >
+             std::numeric_limits<size_t>::max() / 2)
+    {
+        nMemorySize =
+            static_cast<GIntBig>(std::numeric_limits<size_t>::max() / 2);
+    }
+
+    return static_cast<size_t>(nMemorySize);
 }
 
 /************************************************************************/

From cab4e4f5e3f8db61aadbcf07957653a59485f590 Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Thu, 24 Oct 2024 12:06:49 -0400
Subject: [PATCH 36/87] VSI: Use CPLParseMemorySize for
 CPL_VSIL_CURL_CACHE_SIZE and CPL_VSIL_CURL_CHUNK_SIZE

---
 doc/source/user/configoptions.rst |  6 +++-
 port/cpl_string.cpp               |  5 ++-
 port/cpl_vsil_curl.cpp            | 54 ++++++++++++++++++++++++-------
 3 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/doc/source/user/configoptions.rst b/doc/source/user/configoptions.rst
index 5e270fad9b01..3c9c4b7d8eaa 100644
--- a/doc/source/user/configoptions.rst
+++ b/doc/source/user/configoptions.rst
@@ -616,7 +616,8 @@ Networking options
       :since: 2.3
 
       Size of global least-recently-used (LRU) cache shared among all downloaded
-      content.
+      content. Value is assumed to represent bytes unless memory units are
+      specified (since GDAL 3.11).
 
 -  .. config:: CPL_VSIL_CURL_USE_HEAD
       :choices: YES, NO
@@ -664,6 +665,9 @@ Networking options
       :choices: <bytes>
       :since: 2.3
 
+      Value is assumed to represent bytes unless memory units are
+      specified (since GDAL 3.11).
+
 -  .. config:: GDAL_INGESTED_BYTES_AT_OPEN
       :since: 2.3
 
diff --git a/port/cpl_string.cpp b/port/cpl_string.cpp
index f44dc3a350ec..f67ea095ce9d 100644
--- a/port/cpl_string.cpp
+++ b/port/cpl_string.cpp
@@ -1848,7 +1848,10 @@ CPLErr CPLParseMemorySize(const char *pszValue, GIntBig *pnValue,
     }
 
     *pnValue = static_cast<GIntBig>(value);
-    *pbUnitSpecified = (unit != nullptr);
+    if (pbUnitSpecified)
+    {
+        *pbUnitSpecified = (unit != nullptr);
+    }
     return CE_None;
 }
 
diff --git a/port/cpl_vsil_curl.cpp b/port/cpl_vsil_curl.cpp
index 633b1636c707..66934f5fa40c 100644
--- a/port/cpl_vsil_curl.cpp
+++ b/port/cpl_vsil_curl.cpp
@@ -137,31 +137,63 @@ static void VSICURLReadGlobalEnvVariables()
         Initializer()
         {
             constexpr int DOWNLOAD_CHUNK_SIZE_DEFAULT = 16384;
+            const char *pszChunkSize =
+                CPLGetConfigOption("CPL_VSIL_CURL_CHUNK_SIZE", nullptr);
+            GIntBig nChunkSize = DOWNLOAD_CHUNK_SIZE_DEFAULT;
+
+            if (pszChunkSize)
+            {
+                if (CPLParseMemorySize(pszChunkSize, &nChunkSize, nullptr) !=
+                    CE_None)
+                {
+                    CPLError(
+                        CE_Warning, CPLE_AppDefined,
+                        "Could not parse value for CPL_VSIL_CURL_CHUNK_SIZE. "
+                        "Using default value of %d instead.",
+                        DOWNLOAD_CHUNK_SIZE_DEFAULT);
+                }
+            }
 
-            DOWNLOAD_CHUNK_SIZE_DO_NOT_USE_DIRECTLY = atoi(CPLGetConfigOption(
-                "CPL_VSIL_CURL_CHUNK_SIZE",
-                CPLSPrintf("%d", DOWNLOAD_CHUNK_SIZE_DEFAULT)));
             constexpr int MIN_CHUNK_SIZE = 1024;
             constexpr int MAX_CHUNK_SIZE = 10 * 1024 * 1024;
-            if (DOWNLOAD_CHUNK_SIZE_DO_NOT_USE_DIRECTLY < MIN_CHUNK_SIZE ||
-                DOWNLOAD_CHUNK_SIZE_DO_NOT_USE_DIRECTLY > MAX_CHUNK_SIZE)
+            if (nChunkSize < MIN_CHUNK_SIZE || nChunkSize > MAX_CHUNK_SIZE)
             {
-                DOWNLOAD_CHUNK_SIZE_DO_NOT_USE_DIRECTLY =
-                    DOWNLOAD_CHUNK_SIZE_DEFAULT;
+                nChunkSize = DOWNLOAD_CHUNK_SIZE_DEFAULT;
                 CPLError(CE_Warning, CPLE_AppDefined,
                          "Invalid value for CPL_VSIL_CURL_CHUNK_SIZE. "
                          "Allowed range is [%d, %d]. "
                          "Using CPL_VSIL_CURL_CHUNK_SIZE=%d instead",
                          MIN_CHUNK_SIZE, MAX_CHUNK_SIZE,
-                         DOWNLOAD_CHUNK_SIZE_DO_NOT_USE_DIRECTLY);
+                         DOWNLOAD_CHUNK_SIZE_DEFAULT);
             }
+            DOWNLOAD_CHUNK_SIZE_DO_NOT_USE_DIRECTLY =
+                static_cast<int>(nChunkSize);
 
             constexpr int N_MAX_REGIONS_DEFAULT = 1000;
             constexpr int CACHE_SIZE_DEFAULT =
                 N_MAX_REGIONS_DEFAULT * DOWNLOAD_CHUNK_SIZE_DEFAULT;
-            GIntBig nCacheSize = CPLAtoGIntBig(
-                CPLGetConfigOption("CPL_VSIL_CURL_CACHE_SIZE",
-                                   CPLSPrintf("%d", CACHE_SIZE_DEFAULT)));
+
+            const char *pszCacheSize =
+                CPLGetConfigOption("CPL_VSIL_CURL_CACHE_SIZE", nullptr);
+            GIntBig nCacheSize = CACHE_SIZE_DEFAULT;
+
+            if (pszCacheSize)
+            {
+                if (CPLParseMemorySize(pszCacheSize, &nCacheSize, nullptr) !=
+                    CE_None)
+                {
+                    CPLError(
+                        CE_Warning, CPLE_AppDefined,
+                        "Could not parse value for CPL_VSIL_CURL_CACHE_SIZE. "
+                        "Using default value of " CPL_FRMT_GIB " instead.",
+                        nCacheSize);
+                }
+            }
+            else
+            {
+                nCacheSize = CACHE_SIZE_DEFAULT;
+            }
+
             const auto nMaxRAM = CPLGetUsablePhysicalRAM();
             const auto nMinVal = DOWNLOAD_CHUNK_SIZE_DO_NOT_USE_DIRECTLY;
             auto nMaxVal = static_cast<GIntBig>(INT_MAX) *

From f67a151cdbda398f8a78ea0769a5c78588f37314 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 25 Oct 2024 19:52:22 +0200
Subject: [PATCH 37/87] Revert "ossfuzz: fix sqlite build" [ci skip]

This reverts commit f57495c5f1e613df7f43813625e8f81562785f8a.

It seems tcl is no longer needed
---
 fuzzers/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From 95cce30c49c4e00abdd01294cfdf501a7e7a5a77 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 25 Oct 2024 20:29:20 +0200
Subject: [PATCH 38/87] ossfuzz: pin SQLite version to 3.47.0 [ci skip]

Current sqlite head from git requires TCL which is a pain for i386 cross
compilation
---
 fuzzers/build.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fuzzers/build.sh b/fuzzers/build.sh
index eb9a88e3b5fd..cb3cdc0ad49d 100755
--- a/fuzzers/build.sh
+++ b/fuzzers/build.sh
@@ -158,7 +158,10 @@ git clone --depth 1 https://gitbox.apache.org/repos/asf/xerces-c.git
 
 # Build sqlite from source to avoid upstream bugs
 rm -rf sqlite
-git clone --depth 1 https://github.com/sqlite/sqlite sqlite
+curl -L https://sqlite.org/2024/sqlite-autoconf-3470000.tar.gz > sqlite-autoconf-3470000.tar.gz && \
+    tar xzf sqlite-autoconf-3470000.tar.gz && \
+    mv sqlite-autoconf-3470000 sqlite && \
+    rm sqlite-autoconf-3470000.tar.gz
 
 # libxerces-c-dev${ARCH_SUFFIX}
 # libsqlite3-dev${ARCH_SUFFIX}
@@ -186,7 +189,7 @@ NON_FUZZING_CXXFLAGS="$NON_FUZZING_CFLAGS -stdlib=libc++"
 
 # build sqlite
 cd sqlite
-CFLAGS="$NON_FUZZING_CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA" ./configure --prefix=$SRC/install --enable-rtree --disable-tcl
+CFLAGS="$NON_FUZZING_CFLAGS -DSQLITE_ENABLE_COLUMN_METADATA" ./configure --prefix=$SRC/install --enable-rtree
 make clean -s
 make -j$(nproc) -s
 make install

From fc558b4d1bfaba86d599a83fb07812c853c316c0 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 25 Oct 2024 21:58:12 +0200
Subject: [PATCH 39/87] frmts/CMakeLists.txt: remove ghost reference to ArcSDE
 [ci skip]

---
 frmts/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frmts/CMakeLists.txt b/frmts/CMakeLists.txt
index 26a45cfc5372..eb7b3f216dd1 100644
--- a/frmts/CMakeLists.txt
+++ b/frmts/CMakeLists.txt
@@ -193,8 +193,6 @@ include(jp2kak/driver_declaration.cmake)
 gdal_dependent_format(jpipkak "JPIP Streaming" "GDAL_USE_KDU")
 # Luratech SDK
 gdal_dependent_format(jp2lura "JPEG-2000 (based on Luratech)" "GDAL_USE_LURATECH")
-# ESRI ArcSDE C API SDK
-gdal_dependent_format(sde "ESRI ArcSDE Raster" "HAVE_SDE")
 # LizardTech's decoding software development kit (DSDK)
 include(mrsid/driver_declaration.cmake)
 include(georaster/driver_declaration.cmake)

From d1e810d06eb7c15fb9edcff915aed4ecf4c99638 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 25 Oct 2024 23:13:05 +0200
Subject: [PATCH 40/87] OpenFileGDB: change long name to 'ESRI FileGeodatabase
 (using OpenFileGDB)'

Fixes #11079
---
 .github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt  | 2 +-
 .github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt   | 2 +-
 .github/workflows/windows_conda_expected_gdalinfo_formats.txt | 2 +-
 .github/workflows/windows_conda_expected_ogrinfo_formats.txt  | 2 +-
 ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp      | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
index 2be3770e4ce0..06b013069a74 100644
--- a/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
+++ b/.github/workflows/ubuntu_24.04/expected_gdalinfo_formats.txt
@@ -145,7 +145,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   JPEGXL -raster- (rwv): JPEG-XL (*.jxl)
   GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
   SQLite -raster,vector- (rw+v): SQLite / Spatialite / RasterLite2 (*.sqlite, *.db)
-  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
   CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
   PLSCENES -raster,vector- (ro): Planet Labs Scenes API
   NGW -raster,vector- (rw+s): NextGIS Web
diff --git a/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
index b365a54281a2..1edebb0770cf 100644
--- a/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
+++ b/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
@@ -42,7 +42,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   PostgreSQL -vector- (rw+): PostgreSQL/PostGIS
   MySQL -vector- (rw+): MySQL
   OCI -vector- (rw+): Oracle Spatial
-  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
   FileGDB -vector- (rw+): ESRI FileGDB (*.gdb)
   DXF -vector- (rw+v): AutoCAD DXF (*.dxf)
   CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
diff --git a/.github/workflows/windows_conda_expected_gdalinfo_formats.txt b/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
index 44fdb6efd66a..cccc2db769f6 100644
--- a/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
+++ b/.github/workflows/windows_conda_expected_gdalinfo_formats.txt
@@ -144,7 +144,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   STACIT -raster- (rovs): Spatio-Temporal Asset Catalog Items
   NSIDCbin -raster- (rov): NSIDC Sea Ice Concentrations binary (.bin) (*.bin)
   GPKG -raster,vector- (rw+vs): GeoPackage (*.gpkg, *.gpkg.zip)
-  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
   CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
   PLSCENES -raster,vector- (ro): Planet Labs Scenes API
   NGW -raster,vector- (rw+s): NextGIS Web
diff --git a/.github/workflows/windows_conda_expected_ogrinfo_formats.txt b/.github/workflows/windows_conda_expected_ogrinfo_formats.txt
index e9de701fc9d7..c15e8f1531b8 100644
--- a/.github/workflows/windows_conda_expected_ogrinfo_formats.txt
+++ b/.github/workflows/windows_conda_expected_ogrinfo_formats.txt
@@ -39,7 +39,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   PGeo -vector- (ro): ESRI Personal GeoDatabase (*.mdb)
   MSSQLSpatial -vector- (rw+): Microsoft SQL Server Spatial Database (BCP)
   PostgreSQL -vector- (rw+): PostgreSQL/PostGIS
-  OpenFileGDB -raster,vector- (rw+v): ESRI FileGDB (*.gdb)
+  OpenFileGDB -raster,vector- (rw+v): ESRI FileGeodatabase (using OpenFileGDB) (*.gdb)
   DXF -vector- (rw+v): AutoCAD DXF (*.dxf)
   CAD -raster,vector- (rovs): AutoCAD Driver (*.dwg)
   FlatGeobuf -vector- (rw+v): FlatGeobuf (*.fgb)
diff --git a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp
index ba113d65890d..bc294654d90a 100644
--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp
+++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdbdrivercore.cpp
@@ -165,7 +165,8 @@ static int OGROpenFileGDBDriverIdentify(GDALOpenInfo *poOpenInfo)
 void OGROpenFileGDBDriverSetCommonMetadata(GDALDriver *poDriver)
 {
     poDriver->SetDescription(DRIVER_NAME);
-    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "ESRI FileGDB");
+    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME,
+                              "ESRI FileGeodatabase (using OpenFileGDB)");
     poDriver->SetMetadataItem(GDAL_DMD_EXTENSION, "gdb");
     poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC,
                               "drivers/vector/openfilegdb.html");

From 08218c365d6de436d387e20e56610c1337313257 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Oct 2024 01:27:58 +0200
Subject: [PATCH 41/87] CI: 'miniforge-variant: Mambaforge' is no longer
 supported; use Miniforge instead

Fixes following action warning:
'Mambaforge is now deprecated! Future Miniforge releases will NOT build
Mambaforge installers. We advise you switch to Miniforge at your
earliest convenience. More details at
https://conda-forge.org/news/2024/07/29/sunsetting-mambaforge/. If you
require Mambaforge, you may pin your installer to one found in
https://github.com/conda-forge/miniforge/releases/tag/24.7.1-0'
---
 .github/workflows/cmake_builds.yml | 2 --
 .github/workflows/conda.yml        | 1 -
 2 files changed, 3 deletions(-)

diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
index d4e8f04587fd..77658bf242fd 100644
--- a/.github/workflows/cmake_builds.yml
+++ b/.github/workflows/cmake_builds.yml
@@ -417,7 +417,6 @@ jobs:
     - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
       with:
         activate-environment: gdalenv
-        miniforge-variant: Mambaforge
         miniforge-version: latest
         use-mamba: true
         auto-update-conda: true
@@ -525,7 +524,6 @@ jobs:
     - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
       with:
         activate-environment: gdalenv
-        miniforge-variant: Mambaforge
         miniforge-version: latest
         use-mamba: true
         auto-update-conda: true
diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 47bbd31b54cf..59df41621efd 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -52,7 +52,6 @@ jobs:
 
     - uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
       with:
-        #miniforge-variant: Mambaforge
         miniforge-version: latest
         use-mamba: true
         channels: conda-forge

From dfa085f265f4c1d7aa3d847222bb34f3312142bf Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Oct 2024 01:16:53 +0200
Subject: [PATCH 42/87] docker: fix non-release arm64 Ubuntu builds

---
 docker/util.sh | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/docker/util.sh b/docker/util.sh
index ad037f937d5a..7c604794c7f5 100755
--- a/docker/util.sh
+++ b/docker/util.sh
@@ -357,18 +357,10 @@ EOF
           BASE_IMAGE=$(grep "ARG BASE_IMAGE=" ${SCRIPT_DIR}/Dockerfile | sed "s/ARG BASE_IMAGE=//")
           echo "Fetching digest for ${BASE_IMAGE} ${ARCH_PLATFORMS}..."
           ARCH_PLATFORM_ARCH=$(echo ${ARCH_PLATFORMS} | sed "s/linux\///")
-
-          # Below no longer works with recent Ubuntu images with Docker client < 23.0.0
-          # Cf https://github.com/moby/moby/issues/44898
-          #TARGET_BASE_IMAGE_DIGEST=$(docker manifest inspect ${BASE_IMAGE} | jq --raw-output '.manifests[] | (if .platform.architecture == "'${ARCH_PLATFORM_ARCH}'" then .digest else empty end)')
-          # So workaround the issue by pulling explicitly the image
-          docker pull arm64v8/${BASE_IMAGE}
-          TARGET_BASE_IMAGE_DIGEST=$(docker inspect arm64v8/${BASE_IMAGE}  | jq --raw-output '.[0].Id')
-
-          echo "${TARGET_BASE_IMAGE_DIGEST}"
+          TARGET_BASE_IMAGE_DIGEST=$(docker manifest inspect ${BASE_IMAGE} | jq --raw-output '.manifests[] | (if .platform.architecture == "'${ARCH_PLATFORM_ARCH}'" then .digest else empty end)')
+          docker pull "${BASE_IMAGE}@${TARGET_BASE_IMAGE_DIGEST}"
           BUILD_ARGS+=("--build-arg" "TARGET_ARCH=${ARCH_PLATFORM_ARCH}")
-          #BUILD_ARGS+=("--build-arg" "TARGET_BASE_IMAGE=${BASE_IMAGE}@${TARGET_BASE_IMAGE_DIGEST}")
-          BUILD_ARGS+=("--build-arg" "TARGET_BASE_IMAGE=arm64v8/${BASE_IMAGE}")
+          BUILD_ARGS+=("--build-arg" "TARGET_BASE_IMAGE=${BASE_IMAGE}@${TARGET_BASE_IMAGE_DIGEST}")
           # echo "${BUILD_ARGS[@]}"
         fi
       elif test "${DOCKER_BUILDX}" != "buildx" -a \( "${IMAGE_NAME}" = "osgeo/gdal:alpine-small-latest" -o "${IMAGE_NAME}" = "osgeo/gdal:alpine-normal-latest" \); then

From cdb5ea6f23eb2f935f47fae22074f908625d5582 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Oct 2024 13:33:43 +0200
Subject: [PATCH 43/87] NEWS.md: update for 3.10 [ci skip]

---
 NEWS.md | 49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index dd957241a787..8e5e079c06a5 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,7 +1,5 @@
 # GDAL/OGR 3.10.0 Release Notes
 
-FIXME: Preliminary notes up to commit d8112b785c1a2bedfc11849779bd148d55b10915
-
 GDAL/OGR 3.10.0 is a feature release.
 Those notes include changes since GDAL 3.9.0, but not already included in a
 GDAL 3.9.x bugfix release.
@@ -132,6 +130,10 @@ See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.10/MIGRAT
   the first level (#10167)
 * GDALWarpResolveWorkingDataType(): ignore srcNoDataValue if it doesn't fit into
   the data type of the source band
+* Warper: fix shifted/aliased result with Lanczos resampling when XSCALE < 1 or
+  YSCALE < 1 (#11042)
+* Warper: optimize speed of Lanczos resampling in Byte case without any
+  masking/alpha
 * Warper: make sure to check that angular unit is degree for heuristics related
   to geographic CRS (#10975)
 
@@ -139,6 +141,7 @@ See [MIGRATION_GUIDE.TXT](https://github.com/OSGeo/gdal/blob/release/3.10/MIGRAT
 
 * gdalinfo: add -nonodata and -nomask options
 * gdalinfo/ogrinfo: make --formats -json work (#10878)
+* gdalbuildvrt: add a -co switch (#11062)
 * gdal_translate: use GDALIsValueExactAs<> to check range of [u]int64 nodata
 * gdal_viewshed: multi-threaded optimization (#9991)
 * gdal_viewshed: support observers to left, right, above and below of input
@@ -168,6 +171,10 @@ Multi-driver changes:
 Derived driver:
  * make it optional
 
+DIMAP driver:
+ * for PNEO products, use the new color interpretations for the NIR, RedEdge
+   and DeepBlue/Coastal bands
+
 DTED driver:
  * added metadata items Security Control and Security Handling (#10173)
 
@@ -240,11 +247,20 @@ JP2KAK driver:
  * add Cycc=yes/no creation option to set YCbCr/YUV color space and set it to
    YES by default (#10623)
 
+JP2Lura driver:
+ * fix Identify() method
+ * planned for removal in GDAL 3.11
+
 JPEG driver:
  * make sure not to expose DNG_UniqueCameraModel/DNG_CameraSerialNumber if the
    corresponding EXIF tags are set at the same value
  * add support for reading Pix4DMapper CRS from XMP
 
+JPEGXL driver:
+ * writer: propagate DISTANCE/QUALITY setting to extra channel (#11095)
+ * writer: allow a minimum DISTANCE of 0.01, max of 25 and revise QUALITY to
+   DISTANCE formula (#11095)
+
 KMLSuperOverlay driver:
  * recognize <GroundOverlay> with <gx:LatLonQuad> forming a rectangle (#10629)
 
@@ -356,9 +372,12 @@ XYZ driver:
  * add COLUMN_ORDER open option
 
 Zarr driver:
+ * Zarr V2 creation: fix bug when creating dataset with partial blocks and need
+   to re-read them in the writing process when compression is involved (#11016)
  * Allow int64 attributes (#10065)
- * SerializeNumericNoData(): use CPLJSonObject::Add(uint64_t) to avoid potential
-   undefined behavior casts
+ * SerializeNumericNoData(): use CPLJSonObject::Add(uint64_t) to avoid
+   potential undefined behavior casts
+ * Create(): remove created files / directories if an error occurs (#11023)
 
 ## OGR 3.10.0
 
@@ -381,6 +400,8 @@ Zarr driver:
 * SQLite/GPKG: Add ST_Length(geom, use_ellipsoid)
 * GetNextArrowArray() generic implementation: avoid calling
   VSI_MALLOC_ALIGNED_AUTO_VERBOSE() with a zero size
+* Arrow reading: generic code path (as used by GeoJSON): fix mis-handling of
+  timezones
 * OGRFeature: optimizations while accessing field count
 * OGRFeature: SetXXX() methods: more informative warning messages reporting
   field name and value for out-of-range values
@@ -433,6 +454,7 @@ Zarr driver:
   transformation
 * ogr2ogr: optim: call GetArrowStream() only once on source layer when using
   Arrow interface
+* ogr2ogr: fix -explodecollections on empty geometries (#11067)
 * validate_gpkg.py: make it robust to CURRENT_TIMESTAMP instead of 'now'
 
 ### Vector drivers
@@ -473,6 +495,10 @@ ESRIJSON driver:
  * make it able to parse response of some CadastralSpecialServices APIs (#9996)
  * use 'alias' field member to set OGR alternative field name
 
+FileGDB/OpenFileGDB drivers:
+ * update (and unify) list of reserved keywords that can't be used for column
+   and table names (#11094)
+
 JSONFG driver:
  * avoid Polyhedron/Prism geometry instantiation during initial scan
 
@@ -488,6 +514,13 @@ GML driver:
  * XSD parser: fix to resolve schema imports using open option USE_SCHEMA_IMPORT
    (#10500)
  * make it buildable as plugin if NAS driver is explicitly disabled
+ * add a GML_DOWNLOAD_SCHEMA config option matching the DOWNLOAD_SCHEMA open
+   option (and deprecate undocumented GML_DOWNLOAD_WFS_SCHEMA)
+
+GPKG driver:
+ * prevent from creating field with same name, or with the name of the geometry
+   field
+ * CreateField(): check we are not reaching the max number of fields
 
 HANA driver:
  * Add support for REAL_VECTOR type (#10499)
@@ -520,6 +553,10 @@ OAPIF driver:
  * make it buildable as plugin (independently of WFS driver)
  * add a DATETIME open option (#10909)
 
+OCI driver:
+ * OCI: use TIMESTAMP(3) and tweak NLS_TIME[STAMP][_TZ]_FORMAT to accept
+   milliseconds (#11057)
+
 ODBC driver:
  * add GDAL_DMD_LONGNAME
 
@@ -541,6 +578,10 @@ Parquet driver:
  * dataset mode: detect bbox geometry column when opening current Overture Maps
  * dataset mode: make sure all files are closed before closing the GDALDataset
 
+PDF driver:
+ * reader: fixes to handle recursive resources, /OC property attached to a
+   XObjet and an empty UTF-16 layer name (#11034)
+
 PostgreSQL driver:
  * OGR_PG_SKIP_CONFLICTS: optionally insert with ON CONFLICT DO NOTHING (#10156)
  * avoid error when the original search_path is empty

From 11cbea856b88a68074d3f98fc367248eed495460 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Oct 2024 13:45:34 +0200
Subject: [PATCH 44/87] HEIF: add casts to size_t to be on the safer size

Perhaps not needed, but can't hurt
---
 frmts/heif/heifdataset.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/frmts/heif/heifdataset.cpp b/frmts/heif/heifdataset.cpp
index 819089adb15f..7786b0af1bd7 100644
--- a/frmts/heif/heifdataset.cpp
+++ b/frmts/heif/heifdataset.cpp
@@ -671,8 +671,11 @@ CPLErr GDALHEIFRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
         {
             for (int x = 0; x < nBlockXSize; x++)
             {
-                size_t srcIndex = y * nStride + x * nBands + nBand - 1;
-                size_t outIndex = static_cast<size_t>(y) * nBlockXSize + x;
+                const size_t srcIndex = static_cast<size_t>(y) * nStride +
+                                        static_cast<size_t>(x) * nBands +
+                                        nBand - 1;
+                const size_t outIndex =
+                    static_cast<size_t>(y) * nBlockXSize + x;
                 (static_cast<GByte *>(pImage))[outIndex] = pSrcData[srcIndex];
             }
         }
@@ -683,9 +686,11 @@ CPLErr GDALHEIFRasterBand::IReadBlock(int nBlockXOff, int nBlockYOff,
         {
             for (int x = 0; x < nBlockXSize; x++)
             {
-                size_t srcIndex = static_cast<size_t>(y) * (nStride / 2) +
-                                  x * nBands + nBand - 1;
-                size_t outIndex = static_cast<size_t>(y) * nBlockXSize + x;
+                const size_t srcIndex = static_cast<size_t>(y) * (nStride / 2) +
+                                        static_cast<size_t>(x) * nBands +
+                                        nBand - 1;
+                const size_t outIndex =
+                    static_cast<size_t>(y) * nBlockXSize + x;
                 (static_cast<GUInt16 *>(pImage))[outIndex] =
                     (reinterpret_cast<const GUInt16 *>(pSrcData))[srcIndex];
             }
@@ -751,19 +756,19 @@ CPLErr GDALHEIFRasterBand::IReadBlock(int, int nBlockYOff, void *pImage)
     int nStride = 0;
     const uint8_t *pSrcData = heif_image_get_plane_readonly(
         poGDS->m_hImage, heif_channel_interleaved, &nStride);
-    pSrcData += nBlockYOff * nStride;
+    pSrcData += static_cast<size_t>(nBlockYOff) * nStride;
     if (eDataType == GDT_Byte)
     {
         for (int i = 0; i < nBlockXSize; i++)
             (static_cast<GByte *>(pImage))[i] =
-                pSrcData[nBand - 1 + i * nBands];
+                pSrcData[nBand - 1 + static_cast<size_t>(i) * nBands];
     }
     else
     {
         for (int i = 0; i < nBlockXSize; i++)
             (static_cast<GUInt16 *>(pImage))[i] =
                 (reinterpret_cast<const GUInt16 *>(
-                    pSrcData))[nBand - 1 + i * nBands];
+                    pSrcData))[nBand - 1 + static_cast<size_t>(i) * nBands];
     }
 
     return CE_None;

From 41500e1c920b291e356c88aa69b42c46aeaa117a Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Oct 2024 14:07:07 +0200
Subject: [PATCH 45/87] Add OSRGetAuthorityListFromDatabase() to get the list
 of CRS authorities used in the PROJ database.

Refs https://github.com/rasterio/rasterio/pull/3206/files#r1813149328
---
 autotest/osr/osr_basic.py   | 10 ++++++++++
 ogr/ogr_srs_api.h           |  2 ++
 ogr/ogrspatialreference.cpp | 32 ++++++++++++++++++++++++++++++++
 swig/include/osr.i          |  9 +++++++++
 4 files changed, 53 insertions(+)

diff --git a/autotest/osr/osr_basic.py b/autotest/osr/osr_basic.py
index c3b59c8a454d..c14da1d0b007 100755
--- a/autotest/osr/osr_basic.py
+++ b/autotest/osr/osr_basic.py
@@ -2478,3 +2478,13 @@ def test_osr_basic_export_wkt_utm_south():
 
     j = json.loads(srs.ExportToPROJJSON())
     assert j["conversion"]["id"]["code"] == 16101
+
+
+###############################################################################
+
+
+def test_osr_basic_GetAuthorityListFromDatabase():
+
+    ret = osr.GetAuthorityListFromDatabase()
+    assert "EPSG" in ret
+    assert "PROJ" in ret
diff --git a/ogr/ogr_srs_api.h b/ogr/ogr_srs_api.h
index bc55ff3149c7..e9eb02ea90ca 100644
--- a/ogr/ogr_srs_api.h
+++ b/ogr/ogr_srs_api.h
@@ -1005,6 +1005,8 @@ OSRGetCRSInfoListFromDatabase(const char *pszAuthName,
 
 void CPL_DLL OSRDestroyCRSInfoList(OSRCRSInfo **list);
 
+char CPL_DLL **OSRGetAuthorityListFromDatabase(void);
+
 /* -------------------------------------------------------------------- */
 /*      OGRCoordinateTransform C API.                                   */
 /* -------------------------------------------------------------------- */
diff --git a/ogr/ogrspatialreference.cpp b/ogr/ogrspatialreference.cpp
index a404b34b658e..ed44578b07a4 100644
--- a/ogr/ogrspatialreference.cpp
+++ b/ogr/ogrspatialreference.cpp
@@ -12854,6 +12854,38 @@ void OSRDestroyCRSInfoList(OSRCRSInfo **list)
     }
 }
 
+/************************************************************************/
+/*                   OSRGetAuthorityListFromDatabase()                  */
+/************************************************************************/
+
+/** \brief Return the list of CRS authorities used in the PROJ database.
+ *
+ * Such as "EPSG", "ESRI", "PROJ", "IGNF", "IAU_2015", etc.
+ *
+ * This is a direct mapping of https://proj.org/en/latest/development/reference/functions.html#c.proj_get_authorities_from_database
+ *
+ * @return nullptr in case of error, or a NULL terminated list of strings to
+ * free with CSLDestroy()
+ * @since GDAL 3.10
+ */
+char **OSRGetAuthorityListFromDatabase()
+{
+    PROJ_STRING_LIST list =
+        proj_get_authorities_from_database(OSRGetProjTLSContext());
+    if (!list)
+    {
+        return nullptr;
+    }
+    int count = 0;
+    while (list[count])
+        ++count;
+    char **res = static_cast<char **>(CPLCalloc(count + 1, sizeof(char *)));
+    for (int i = 0; i < count; ++i)
+        res[i] = CPLStrdup(list[i]);
+    proj_string_list_destroy(list);
+    return res;
+}
+
 /************************************************************************/
 /*                    UpdateCoordinateSystemFromGeogCRS()               */
 /************************************************************************/
diff --git a/swig/include/osr.i b/swig/include/osr.i
index bd52335f0f01..4b26c8d4a48c 100644
--- a/swig/include/osr.i
+++ b/swig/include/osr.i
@@ -1556,6 +1556,15 @@ const char* OSRCRSInfo_projection_method_get( OSRCRSInfo *crsInfo ) {
 
 #endif
 
+%apply (char **CSL) {(char **)};
+%inline %{
+char** GetAuthorityListFromDatabase()
+{
+    return OSRGetAuthorityListFromDatabase();
+}
+%}
+%clear (char **);
+
 #ifdef SWIGPYTHON
 %inline %{
 void GetCRSInfoListFromDatabase( const char *authName,

From a0b2ec777f2e441109d75db77afee42540298093 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Oct 2024 15:36:53 +0200
Subject: [PATCH 46/87] README.md: update URL to ossfuzz issues [ci skip]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 40abb5b270ac..4d447c358b17 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ GDAL - Geospatial Data Abstraction Library
 [![Build Status](https://github.com/OSGeo/gdal/actions/workflows/conda.yml/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22Conda%22+branch%3Amaster)
 [![Build Status](https://scan.coverity.com/projects/749/badge.svg?flat=1)](https://scan.coverity.com/projects/gdal)
 [![Documentation build Status](https://github.com/OSGeo/gdal/workflows/Docs/badge.svg)](https://github.com/osgeo/gdal/actions?query=workflow%3A%22Docs%22+branch%3Amaster)
-[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/gdal.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:gdal)
+[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/gdal.svg)](https://issues.oss-fuzz.com/issues?q=status:open%20gdal)
 [![Coverage Status](https://coveralls.io/repos/github/OSGeo/gdal/badge.svg?branch=master)](https://coveralls.io/github/OSGeo/gdal?branch=master)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8250/badge)](https://www.bestpractices.dev/projects/8250)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/OSGeo/gdal/badge)](https://securityscorecards.dev/viewer/?uri=github.com/OSGeo/gdal)

From bb47429da5045597e5839e2370c813849e602546 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Oct 2024 17:32:53 +0200
Subject: [PATCH 47/87] tif_jxl: writer: propagate DISTANCE/QUALITY setting to
 extra channel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Similar to fix done in standalone JPEGXL driver in PR #11099
---
 autotest/gcore/tiff_write.py | 35 +++++++++++++++++++++++++++++++++++
 frmts/gtiff/tif_jxl.c        | 15 +++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/autotest/gcore/tiff_write.py b/autotest/gcore/tiff_write.py
index 88f3caac637f..baab96cfff06 100755
--- a/autotest/gcore/tiff_write.py
+++ b/autotest/gcore/tiff_write.py
@@ -9749,6 +9749,41 @@ def test_tiff_write_jpegxl_alpha_distance_zero():
     gdal.Unlink(filename)
 
 
+###############################################################################
+
+
+@pytest.mark.require_creation_option("GTiff", "JXL_ALPHA_DISTANCE")
+def test_tiff_write_jpegxl_five_bands_lossy(tmp_vsimem):
+
+    outfilename = str(tmp_vsimem / "test_tiff_write_jpegxl_five_bands_lossy.tif")
+    gdal.Translate(
+        outfilename,
+        "data/byte.tif",
+        options="-co COMPRESS=JXL -co JXL_LOSSLESS=NO -co JXL_DISTANCE=3 -b 1 -b 1 -b 1 -b 1 -b 1",
+    )
+    ds = gdal.Open(outfilename)
+    assert ds.GetRasterBand(3).Checksum() not in (0, 4672)
+    assert ds.GetRasterBand(4).Checksum() not in (0, 4672)
+    assert ds.GetRasterBand(5).Checksum() not in (0, 4672)
+
+
+###############################################################################
+
+
+@pytest.mark.require_creation_option("GTiff", "JXL_ALPHA_DISTANCE")
+def test_tiff_write_jpegxl_five_bands_lossless(tmp_vsimem):
+
+    outfilename = str(tmp_vsimem / "test_tiff_write_jpegxl_five_bands_lossy.tif")
+    gdal.Translate(
+        outfilename,
+        "data/byte.tif",
+        options="-co COMPRESS=JXL -co JXL_LOSSLESS=YES -b 1 -b 1 -b 1 -b 1 -b 1",
+    )
+    ds = gdal.Open(outfilename)
+    for i in range(5):
+        assert ds.GetRasterBand(i + 1).Checksum() == 4672
+
+
 ###############################################################################
 # Test creating overviews with NaN nodata
 
diff --git a/frmts/gtiff/tif_jxl.c b/frmts/gtiff/tif_jxl.c
index fe820d0c1dde..940808bafe35 100644
--- a/frmts/gtiff/tif_jxl.c
+++ b/frmts/gtiff/tif_jxl.c
@@ -1037,6 +1037,21 @@ static int JXLPostEncode(TIFF *tif)
                     return 0;
                 }
             }
+            else if (!(sp->lossless))
+            {
+                // By default libjxl applies lossless encoding for extra channels
+                if (JXL_ENC_SUCCESS != JxlEncoderSetExtraChannelDistance(
+                                           opts, iExtraChannel, sp->distance))
+                {
+                    TIFFErrorExtR(
+                        tif, module,
+                        "JxlEncoderSetExtraChannelDistance(%d) failed",
+                        iChannel);
+                    JxlEncoderDestroy(enc);
+                    _TIFFfreeExt(tif, main_buffer);
+                    return 0;
+                }
+            }
 #endif
         }
     }

From b87778ddf094a069932bf9f7e57857173d2dadca Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Oct 2024 19:36:05 +0200
Subject: [PATCH 48/87] ogr_core.h: suppress warning when building with
 -Wpedantic for C < 23

Fixes #2322
---
 ogr/ogr_core.h | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ogr/ogr_core.h b/ogr/ogr_core.h
index f64ecc40d6de..6fe905d750f3 100644
--- a/ogr/ogr_core.h
+++ b/ogr/ogr_core.h
@@ -391,6 +391,13 @@ typedef int OGRBoolean;
 /*      ogr_geometry.h related definitions.                             */
 /* -------------------------------------------------------------------- */
 
+#if defined(HAVE_GCC_DIAGNOSTIC_PUSH) && __STDC_VERSION__ < 202311L
+/* wkbPoint25D and friends cause warnings with -Wpedantic prior to C23. */
+/* Cf https://github.com/OSGeo/gdal/issues/2322 */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpedantic"
+#endif
+
 /**
  * List of well known binary geometry types.  These are used within the BLOBs
  * but are also returned from OGRGeometry::getGeometryType() to identify the
@@ -512,6 +519,10 @@ typedef enum
 #endif
 } OGRwkbGeometryType;
 
+#if defined(HAVE_GCC_DIAGNOSTIC_PUSH) && __STDC_VERSION__ < 202311L
+#pragma GCC diagnostic pop
+#endif
+
 /* clang-format off */
 /**
  * Output variants of WKB we support.

From 7250eba707868633fc06e1c3ea50dc42d6b34400 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sat, 26 Oct 2024 21:54:56 +0200
Subject: [PATCH 49/87] ECW: fix build with VC17 and ECW SDK >= 5.1

---
 frmts/ecw/ecwdataset.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frmts/ecw/ecwdataset.cpp b/frmts/ecw/ecwdataset.cpp
index 3fe05508f654..933c07eb4149 100644
--- a/frmts/ecw/ecwdataset.cpp
+++ b/frmts/ecw/ecwdataset.cpp
@@ -82,7 +82,7 @@ ECWRasterBand::ECWRasterBand(ECWDataset *poDSIn, int nBandIn, int iOverviewIn,
         {
             nBlockXSize = static_cast<int>(nTileWidth);
         }
-        nBlockXSize = std::min(nBlockXSize, nRasterXSize);
+        nBlockXSize = MIN(nBlockXSize, nRasterXSize);
 
         UINT32 nTileHeight = 0;
         poDSIn->poFileView->GetParameter(
@@ -91,7 +91,7 @@ ECWRasterBand::ECWRasterBand(ECWDataset *poDSIn, int nBandIn, int iOverviewIn,
         {
             nBlockYSize = static_cast<int>(nTileHeight);
         }
-        nBlockYSize = std::min(nBlockYSize, nRasterYSize);
+        nBlockYSize = MIN(nBlockYSize, nRasterYSize);
     }
 #endif
 

From 14bf3464f0dbb73d4ad3a755525c5dcfcd9d722c Mon Sep 17 00:00:00 2001
From: Brad Hards <bradh@frogmouth.net>
Date: Sun, 27 Oct 2024 09:19:14 +1100
Subject: [PATCH 50/87] tests: simplify createcopy test

---
 autotest/gcore/misc.py | 267 ++++++++++++++++++++---------------------
 1 file changed, 127 insertions(+), 140 deletions(-)

diff --git a/autotest/gcore/misc.py b/autotest/gcore/misc.py
index cca79ca34e23..18d1f4c806c0 100755
--- a/autotest/gcore/misc.py
+++ b/autotest/gcore/misc.py
@@ -281,61 +281,20 @@ def misc_6_internal(datatype, nBands, setDriversDone):
         drv = gdal.GetDriver(i)
         md = drv.GetMetadata()
         if ("DCAP_CREATECOPY" in md or "DCAP_CREATE" in md) and "DCAP_RASTER" in md:
-            # print ('drv = %s, nBands = %d, datatype = %s' % (drv.ShortName, nBands, gdal.GetDataTypeName(datatype)))
-
-            skip = False
-            # FIXME: A few cases that crashes and should be investigated
-            if drv.ShortName == "JPEG2000":
-                if (nBands == 2 or nBands >= 5) or not (
-                    datatype == gdal.GDT_Byte
-                    or datatype == gdal.GDT_Int16
-                    or datatype == gdal.GDT_UInt16
-                ):
-                    skip = True
-            if skip is False:
-                dirname = "tmp/tmp/tmp_%s_%d_%s" % (
-                    drv.ShortName,
-                    nBands,
-                    gdal.GetDataTypeName(datatype),
-                )
-                try:
-                    os.mkdir(dirname)
-                except OSError:
-                    try:
-                        os.stat(dirname)
-                        # Hum the directory already exists... Not expected, but let's try to go on
-                    except OSError:
-                        reason = (
-                            "Cannot create %s before drv = %s, nBands = %d, datatype = %s"
-                            % (
-                                dirname,
-                                drv.ShortName,
-                                nBands,
-                                gdal.GetDataTypeName(datatype),
-                            )
-                        )
-                        pytest.fail(reason)
-
-                filename = get_filename(drv, dirname)
-
-                dst_ds = drv.CreateCopy(filename, ds)
-                has_succeeded = dst_ds is not None
-                if dst_ds:
-                    # check that domain == None doesn't crash
-                    dst_ds.GetMetadata(None)
-                    dst_ds.GetMetadataItem("", None)
-                dst_ds = None
-
-                size = 0
-                stat = gdal.VSIStatL(filename)
-                if stat is not None:
-                    size = stat.size
-
+            dirname = "tmp/tmp/tmp_%s_%d_%s" % (
+                drv.ShortName,
+                nBands,
+                gdal.GetDataTypeName(datatype),
+            )
+            try:
+                os.mkdir(dirname)
+            except OSError:
                 try:
-                    shutil.rmtree(dirname)
+                    os.stat(dirname)
+                    # Hum the directory already exists... Not expected, but let's try to go on
                 except OSError:
                     reason = (
-                        "Cannot remove %s after drv = %s, nBands = %d, datatype = %s"
+                        "Cannot create %s before drv = %s, nBands = %d, datatype = %s"
                         % (
                             dirname,
                             drv.ShortName,
@@ -345,114 +304,142 @@ def misc_6_internal(datatype, nBands, setDriversDone):
                     )
                     pytest.fail(reason)
 
-                if has_succeeded and drv.ShortName not in setDriversDone and nBands > 0:
-                    setDriversDone.add(drv.ShortName)
+            filename = get_filename(drv, dirname)
 
-                    # The first list of drivers fail to detect short writing
-                    # The second one is because they are verbose in stderr
-                    if (
-                        "DCAP_VIRTUALIO" in md
-                        and size != 0
-                        and drv.ShortName
-                        not in [
-                            "JPEG2000",
-                            "KMLSUPEROVERLAY",
-                            "HF2",
-                            "ZMap",
-                            "DDS",
-                            "TileDB",
-                        ]
-                        and drv.ShortName not in ["GIF", "JP2ECW", "JP2Lura"]
-                    ):
+            dst_ds = drv.CreateCopy(filename, ds)
+            has_succeeded = dst_ds is not None
+            if dst_ds:
+                # check that domain == None doesn't crash
+                dst_ds.GetMetadata(None)
+                dst_ds.GetMetadataItem("", None)
+            dst_ds = None
 
-                        for j in range(10):
-                            truncated_size = (size * j) / 10
-                            vsimem_filename = (
-                                "/vsimem/test_truncate/||maxlength=%d||"
-                                % truncated_size
-                            ) + get_filename(drv, "")[1:]
-                            # print('drv = %s, nBands = %d, datatype = %s, truncated_size = %d' % (drv.ShortName, nBands, gdal.GetDataTypeName(datatype), truncated_size))
-                            dst_ds = drv.CreateCopy(vsimem_filename, ds)
-                            error_detected = False
-                            if dst_ds is None:
-                                error_detected = True
-                            else:
-                                gdal.ErrorReset()
-                                dst_ds = None
-                                if gdal.GetLastErrorMsg() != "":
-                                    error_detected = True
-                            if not error_detected:
-                                msg = (
-                                    "write error not detected with with drv = %s, nBands = %d, datatype = %s, truncated_size = %d"
-                                    % (
-                                        drv.ShortName,
-                                        nBands,
-                                        gdal.GetDataTypeName(datatype),
-                                        truncated_size,
-                                    )
-                                )
-                                print(msg)
+            size = 0
+            stat = gdal.VSIStatL(filename)
+            if stat is not None:
+                size = stat.size
 
-                            fl = gdal.ReadDirRecursive("/vsimem/test_truncate")
-                            if fl is not None:
-                                for myf in fl:
-                                    gdal.Unlink("/vsimem/test_truncate/" + myf)
-                                fl = gdal.ReadDirRecursive("/vsimem/test_truncate")
-                                if fl is not None:
-                                    print(fl)
-
-                    if drv.ShortName not in [
-                        "ECW",
-                        "JP2ECW",
-                        "VRT",
-                        "XPM",
+            try:
+                shutil.rmtree(dirname)
+            except OSError:
+                reason = (
+                    "Cannot remove %s after drv = %s, nBands = %d, datatype = %s"
+                    % (
+                        dirname,
+                        drv.ShortName,
+                        nBands,
+                        gdal.GetDataTypeName(datatype),
+                    )
+                )
+                pytest.fail(reason)
+
+            if has_succeeded and drv.ShortName not in setDriversDone and nBands > 0:
+                setDriversDone.add(drv.ShortName)
+
+                # The first list of drivers fail to detect short writing
+                # The second one is because they are verbose in stderr
+                if (
+                    "DCAP_VIRTUALIO" in md
+                    and size != 0
+                    and drv.ShortName
+                    not in [
                         "JPEG2000",
-                        "FIT",
-                        "RST",
-                        "INGR",
-                        "USGSDEM",
                         "KMLSUPEROVERLAY",
-                        "GMT",
-                    ]:
-                        dst_ds = drv.CreateCopy(
-                            filename, ds, callback=misc_6_interrupt_callback_class().cbk
-                        )
-                        if dst_ds is not None:
-                            dst_ds = None
-
-                            try:
-                                shutil.rmtree(dirname)
-                            except OSError:
-                                pass
+                        "HF2",
+                        "ZMap",
+                        "DDS",
+                        "TileDB",
+                    ]
+                    and drv.ShortName not in ["GIF", "JP2ECW", "JP2Lura"]
+                ):
 
-                            pytest.fail(
-                                "interruption did not work with drv = %s, nBands = %d, datatype = %s"
+                    for j in range(10):
+                        truncated_size = (size * j) / 10
+                        vsimem_filename = (
+                            "/vsimem/test_truncate/||maxlength=%d||" % truncated_size
+                        ) + get_filename(drv, "")[1:]
+                        # print('drv = %s, nBands = %d, datatype = %s, truncated_size = %d' % (drv.ShortName, nBands, gdal.GetDataTypeName(datatype), truncated_size))
+                        dst_ds = drv.CreateCopy(vsimem_filename, ds)
+                        error_detected = False
+                        if dst_ds is None:
+                            error_detected = True
+                        else:
+                            gdal.ErrorReset()
+                            dst_ds = None
+                            if gdal.GetLastErrorMsg() != "":
+                                error_detected = True
+                        if not error_detected:
+                            msg = (
+                                "write error not detected with with drv = %s, nBands = %d, datatype = %s, truncated_size = %d"
                                 % (
                                     drv.ShortName,
                                     nBands,
                                     gdal.GetDataTypeName(datatype),
+                                    truncated_size,
                                 )
                             )
+                            print(msg)
 
+                        fl = gdal.ReadDirRecursive("/vsimem/test_truncate")
+                        if fl is not None:
+                            for myf in fl:
+                                gdal.Unlink("/vsimem/test_truncate/" + myf)
+                            fl = gdal.ReadDirRecursive("/vsimem/test_truncate")
+                            if fl is not None:
+                                print(fl)
+
+                if drv.ShortName not in [
+                    "ECW",
+                    "JP2ECW",
+                    "VRT",
+                    "XPM",
+                    "JPEG2000",
+                    "FIT",
+                    "RST",
+                    "INGR",
+                    "USGSDEM",
+                    "KMLSUPEROVERLAY",
+                    "GMT",
+                ]:
+                    dst_ds = drv.CreateCopy(
+                        filename, ds, callback=misc_6_interrupt_callback_class().cbk
+                    )
+                    if dst_ds is not None:
                         dst_ds = None
 
                         try:
                             shutil.rmtree(dirname)
                         except OSError:
                             pass
-                        try:
-                            os.mkdir(dirname)
-                        except OSError:
-                            reason = (
-                                "Cannot create %s before drv = %s, nBands = %d, datatype = %s"
-                                % (
-                                    dirname,
-                                    drv.ShortName,
-                                    nBands,
-                                    gdal.GetDataTypeName(datatype),
-                                )
+
+                        pytest.fail(
+                            "interruption did not work with drv = %s, nBands = %d, datatype = %s"
+                            % (
+                                drv.ShortName,
+                                nBands,
+                                gdal.GetDataTypeName(datatype),
                             )
-                            pytest.fail(reason)
+                        )
+
+                    dst_ds = None
+
+                    try:
+                        shutil.rmtree(dirname)
+                    except OSError:
+                        pass
+                    try:
+                        os.mkdir(dirname)
+                    except OSError:
+                        reason = (
+                            "Cannot create %s before drv = %s, nBands = %d, datatype = %s"
+                            % (
+                                dirname,
+                                drv.ShortName,
+                                nBands,
+                                gdal.GetDataTypeName(datatype),
+                            )
+                        )
+                        pytest.fail(reason)
     ds = None
 
 

From 87db11e45587baac24059cf911941d20bd0d03ba Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 27 Oct 2024 11:23:31 +0100
Subject: [PATCH 51/87] ogr_sql_test.py: avoid memory leak under ASAN CI

---
 autotest/ogr/ogr_sql_test.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
index 4dba5ef4d41f..bf2581e52d8b 100755
--- a/autotest/ogr/ogr_sql_test.py
+++ b/autotest/ogr/ogr_sql_test.py
@@ -102,7 +102,9 @@ def get_lyr():
     with pytest.raises(Exception):
         lyr.GetName()
 
-    assert get_lyr().GetFeatureCount() == 10
+    # This leaks memory
+    if not gdaltest.is_travis_branch("sanitize"):
+        assert get_lyr().GetFeatureCount() == 10
 
     # Check that we can actually remove the files (i.e. references on dataset have been dropped)
     os.unlink(tmp_path / "test_ogr_sql_execute_sql.shp")

From a39256b25cb078adffdb1179cd413b84bddbee89 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 27 Oct 2024 11:23:55 +0100
Subject: [PATCH 52/87] GTiff: fix memory leak when trying to open COG in
 update mode

---
 frmts/gtiff/gtiffdataset_read.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frmts/gtiff/gtiffdataset_read.cpp b/frmts/gtiff/gtiffdataset_read.cpp
index 623516edd361..81c587b0f167 100644
--- a/frmts/gtiff/gtiffdataset_read.cpp
+++ b/frmts/gtiff/gtiffdataset_read.cpp
@@ -3928,6 +3928,7 @@ GDALDataset *GTiffDataset::Open(GDALOpenInfo *poOpenInfo)
                          "with the IGNORE_COG_LAYOUT_BREAK open option set "
                          "to YES.",
                          pszFilename);
+                XTIFFClose(l_hTIFF);
                 delete poDS;
                 return nullptr;
             }

From 7ba8cdd1e3ccccecbd8c835eea2c8293108ff777 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 27 Oct 2024 11:44:39 +0100
Subject: [PATCH 53/87] HOWTO-RELEASE: adjustments related to advertizing
 release [ci skip]

---
 HOWTO-RELEASE | 89 ++++++++++++++++++++++++++-------------------------
 1 file changed, 46 insertions(+), 43 deletions(-)

diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE
index afb1e184452f..684d3b589afd 100644
--- a/HOWTO-RELEASE
+++ b/HOWTO-RELEASE
@@ -29,29 +29,29 @@ Prerequisites:
 
 Process :
 
-1)    "make completion" to regenerate scripts/gdal-bash-completion.sh
-      if new command line switches have been added. scripts/completionFinder.py
-      must also be edited before if new utilities/scripts are added/removed.
+1) "make completion" to regenerate scripts/gdal-bash-completion.sh
+   if new command line switches have been added. scripts/completionFinder.py
+   must also be edited before if new utilities/scripts are added/removed.
 
-2.1) Update the release date, and number information in gcore/gdal_version.h.in
-     (*NOT* gdal_version.h which is a generated file)
-     Note: the format of GDAL_RELEASE_DATE should be YYYYMMDD.
+2) Update the release date, and number information in gcore/gdal_version.h.in
+   (*NOT* gdal_version.h which is a generated file)
+   Note: the format of GDAL_RELEASE_DATE should be YYYYMMDD.
 
-2.2) Update two instances of year in CITATION file to the current year.
+3) Update two instances of year in CITATION file to the current year.
 
-2.3) Update "version" and "date-released" in CITATION.cff (Note: the DOI does
-     *not* need to be updated as it is a generic one)
+4) Update "version" and "date-released" in CITATION.cff (Note: the DOI does
+   *not* need to be updated as it is a generic one)
 
-3) Update the VERSION file (if not already done)
+5) Update the VERSION file (if not already done)
 
-3.1) Update the version information in the following files:
-     - ./swig/python/gdal-utils/osgeo_utils/__init__.py (gdal-utils python package)
-     - ./swig/python/README.rst (libgdal)
+6) Update the version information in the following files:
+    - ./swig/python/gdal-utils/osgeo_utils/__init__.py (gdal-utils python package)
+    - ./swig/python/README.rst (libgdal)
 
-4) Update the GDAL_SOVERSION number at top of gdal.cmake according to the
+7) Update the GDAL_SOVERSION number at top of gdal.cmake according to the
    directions given in the comment preceding it.
 
-5) Prepare release overview in the NEWS.md file. For example, to get all changes
+8) Prepare release overview in the NEWS.md file. For example, to get all changes
    from v3.4.0 to current HEAD
      git log --reverse -v v3.4.0..HEAD . ":(exclude)autotest" ":(exclude)doc" ":(exclude).github"
 
@@ -62,23 +62,28 @@ Process :
 
   - for bugfixes releases, forward port additions of NEWS.md to master
 
-6) If this is a feature release (e.g 3.1), prepare a branch.
+9) Update doc/source/about_no_title.rst, doc/source/download.rst and doc/source/download_past.rst
+   to advertise the new release and link to the release notes. Do that in a dedicated commit.
+
+   (It is necessary to do that at that stage, so that the ReadTheDocs "stable" branch, based on the latest tag, proposes to download it)
+
+10) If this is a feature release (e.g 3.1), prepare a branch.
 
    git checkout master
    git pull origin master
    git checkout -b release/3.1
    git push origin release/3.1
 
-7) Tag the release with a RC suffix:
+11) Tag the release with a RC suffix:
 
    git checkout release/3.1
    git pull origin release/3.1
    git tag -a -m "Create tag v3.1.0RC1" v3.1.0RC1
    git push origin v3.1.0RC1
 
-8) Prepare archives
+12) Prepare archives
 
-8.0) Ensure you have the following prerequisites (beyond normal build deps):
+12.0) Ensure you have the following prerequisites (beyond normal build deps):
 
    If make is not GNU make, e.g., export MAKE=gmake
 
@@ -97,7 +102,7 @@ Process :
 
    md5sum (GNU version) in path (not a POSIX requirement)
 
-8.1) Create the source distributions using the mkgdaldist.sh script.
+12.1) Create the source distributions using the mkgdaldist.sh script.
    The argument should be the version number (i.e. 1.4.2). As our process involves
    doing betas or RCs, use the -rc option so that the filenames include this
    information (after promotion to official release, filename renaming will have
@@ -118,7 +123,7 @@ Process :
    a previous release (diff -Nur gdal-3.0.1 gdal-3.0.2).
    This is more easily doable for a bugfix release.
 
-8.2) Create a snapshot of the documentation (only for feature releases)
+12.2) Create a snapshot of the documentation (only for feature releases)
 
     1. Refresh
        https://download.osgeo.org/gdal/for_doc/javadoc.zip
@@ -128,7 +133,7 @@ Process :
     3. ./build_doc_snapshot 310
        This generates gdal310doc.zip
 
-8.3) Publish the resulting files on download.osgeo.org,
+12.3) Publish the resulting files on download.osgeo.org,
     in /osgeo/download/gdal/X.Y.Z (where X.Y.Z is the version number)
 
     with ~/.ssh/config containing:
@@ -137,23 +142,23 @@ Process :
         ProxyCommand ssh rouault@download.osgeo.org -W $(sed -e "s/^osgeo7-//;s/$/.lxd/" <<< "%h"):%p
 
 
-9) Announce the release candidate availability to gdal-dev@
-   Example: https://lists.osgeo.org/pipermail/gdal-dev/2019-June/050509.html
+13) Announce the release candidate availability to gdal-dev@
+    Example: https://lists.osgeo.org/pipermail/gdal-dev/2019-June/050509.html
 
-10) If new RC is needed, update gcore/gdal_version.h.in with the new date
+14) If new RC is needed, update gcore/gdal_version.h.in with the new date
     and update NEWS,and go to 7)
 
     If no new RC is needed, after a few days, raise a motion to gdal-dev@ for approval
 
-11) Once the vote has positively completed,
+15) Once the vote has positively completed,
 
-11.1) Tag the release as final:
+15.1) Tag the release as final:
 
     git checkout v3.1.0RC1
     git tag -a -m "Create tag v3.1.0" v3.1.0
     git push origin v3.1.0
 
-11.2) Log on download.osgeo.org, go to /osgeo/download/gdal/X.Y.Z
+15.2) Log on download.osgeo.org, go to /osgeo/download/gdal/X.Y.Z
 
       Remove the RC suffixes for the final RC, like:
       mv gdal-3.8.3rc1.tar.xz gdal-3.8.3.tar.xz
@@ -176,22 +181,18 @@ Process :
       Check that everything is fine:
       md5sum -c *.md5
 
-11.3) In /osgeo/download/gdal, add a symlink from X.Y.Z to CURRENT (except for stable releases in a "old" branch).
+15.3) In /osgeo/download/gdal, add a symlink from X.Y.Z to CURRENT (except for stable releases in a "old" branch).
 
   % ln -sf X.Y.Z CURRENT
 
-12) (Removed)
-
-13) Update doc/source/about_no_title.rst and doc/source/download.rst to advertise the new release and link to the release notes
-
-14) Update GitHub to close the release milestone.
+16) Update GitHub to close the release milestone.
     Then create a new milestone for the next release.
 
-15) Upload the new Python bindings to Pypi (requires upload rights to
+17) Upload the new Python bindings to Pypi (requires upload rights to
 the GDAL package by one of the current owners : HowardB/FrankW/EvenR)
 ( procedure taken from http://peterdowns.com/posts/first-time-with-pypi.html )
 
-15.1) Prerequisite:
+17.1) Prerequisite:
     a) Install twine https://pypi.org/project/twine/
 
     b) Create a $HOME/.pypirc file :
@@ -210,7 +211,7 @@ the GDAL package by one of the current owners : HowardB/FrankW/EvenR)
     username: yourlogin
     password: yourpassword
 
-15.2) create gdal sdist and upload to pypi:
+17.2) create gdal sdist and upload to pypi:
 
     a) Create a build directory if not already done. Go to it and run cmake
 
@@ -227,7 +228,7 @@ the GDAL package by one of the current owners : HowardB/FrankW/EvenR)
     f) For real :
         twine upload dist/gdal-*.gz
 
-15.3) create gdal-utils wheel and upload to pypi:
+17.3) create gdal-utils wheel and upload to pypi:
 
     a) cd $BUILD_DIR/swig/python/gdal-utils
 
@@ -242,7 +243,7 @@ the GDAL package by one of the current owners : HowardB/FrankW/EvenR)
     d) For real :
         twine upload dist/gdal_utils-*.whl
 
-16) Generate signed maven artifacts with GPG for Java bindings.
+18) Generate signed maven artifacts with GPG for Java bindings.
     This step is required in order to deploy the
     maven artifacts to the central Maven repository. Before this step can
     proceed you must set up a signing key as described here:
@@ -272,7 +273,7 @@ the GDAL package by one of the current owners : HowardB/FrankW/EvenR)
     that contains all the maven artifacts with signatures. This file is what
     will be uploaded to maven central. See the next step.
 
-17) Deploy maven artifacts to Maven central.
+19) Deploy maven artifacts to Maven central.
 
     NOTE: Before you can deploy to maven central you must set up an account
     in Sonatype JIRA. That can be done here:
@@ -329,14 +330,14 @@ e) Click the "Release" button and that is it! The release should be available in
     - gdalXYZ.zip.md5
     - gdalautotest-X.Y.Z.zip
 
-19) Regenerate Docker images
+20) Regenerate Docker images
 
     e.g
         ./docker/build-all.sh --with-multi-arch --release --tag 3.3.1 --gdal v3.3.1 --proj 8.1.0 --platform linux/arm64,linux/amd64 --push
 
     and update docker/README.md with the latest release
 
-20) Announce release to :
+21) Announce release to :
     - major release: gdal-dev@lists.osgeo.org, gdal-announce@lists.osgeo.org, news_item@osgeo.org.
     - bugfix release: gdal-dev@lists.osgeo.org, gdal-announce@lists.osgeo.org
 
@@ -348,10 +349,12 @@ Note: gdal-announce@ is moderated. Make sure that your email address is approved
 ('mod' tick disabled in https://lists.osgeo.org/mailman/admin/gdal-announce/members),
 or your message manually approved, with an administrator of the list.
 
-21) For a feature release: after it has been done, in the master branch, update
+22) For a feature release: after it has been done, in the master branch, update
     the VERSION to the next one and in gcore/gdal_version.h.in, update
     GDAL_VERSION_MAJOR/_MINOR, GDAL_RELEASE_NAME (with a dev suffix, like "3.7.0dev"),
     and set GDAL_RELEASE_DATE to a date like {YEAR}9999.
     Update swig/python/gdal-utils/osgeo_utils/__init__.py to something like (3, 6, 99, 0)
     if master is 3.7.0dev
 
+23) For bugfixes releases, forward port to master changes done in
+    doc/source/about_no_title.rst, doc/source/download.rst and doc/source/download_past.rst

From 0f9e4875e679b3045c0193bc3d01ca248588c7c2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 27 Oct 2024 12:21:09 +0100
Subject: [PATCH 54/87] Python bindings: fix memleak with
 MultipartUploadStart() and MultipartUploadAddPart() (master only)

---
 swig/include/cpl.i | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swig/include/cpl.i b/swig/include/cpl.i
index 0e8efca98794..6c25d5958629 100644
--- a/swig/include/cpl.i
+++ b/swig/include/cpl.i
@@ -996,7 +996,7 @@ void MultipartUploadGetCapabilities(
 }
 
 %inline {
-char* MultipartUploadStart(const char *pszFilename, char** options = NULL)
+retStringAndCPLFree* MultipartUploadStart(const char *pszFilename, char** options = NULL)
 {
     return VSIMultipartUploadStart(pszFilename, options);
 }
@@ -1005,7 +1005,7 @@ char* MultipartUploadStart(const char *pszFilename, char** options = NULL)
 %apply (size_t nLen, char *pBuf ) { (size_t nDataLength, const char *pData)};
 
 %inline {
-char* MultipartUploadAddPart(const char *pszFilename,
+retStringAndCPLFree* MultipartUploadAddPart(const char *pszFilename,
                              const char *pszUploadId,
                              int nPartNumber,
                              GUIntBig nFileOffset,

From a8117d90bff87031214a4dd32727559a55460f68 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 27 Oct 2024 12:27:29 +0100
Subject: [PATCH 55/87] SWIG bindings: fix memleak in gdal.GetConfigOptions()

---
 swig/include/cpl.i | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swig/include/cpl.i b/swig/include/cpl.i
index 6c25d5958629..18a39cb92940 100644
--- a/swig/include/cpl.i
+++ b/swig/include/cpl.i
@@ -503,7 +503,7 @@ char** wrapper_GetConfigOptions() {
 
     papszOpts = CSLMerge(papszOpts, papszTLOpts);
 
-    CPLFree(papszTLOpts);
+    CSLDestroy(papszTLOpts);
 
     return papszOpts;
 };

From 5e84b2d4ac3cbbf79fd376913235925b9a7fad1e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 27 Oct 2024 12:55:07 +0100
Subject: [PATCH 56/87] SQLite/GPKG: turn on SQLite 'PRAGMA secure_delete=1' by
 default

unless the user specifies a value of this pragma through OGR_SQLITE_PRAGMA.

For example, Debian and Conda-Forge SQLite3 builds already turn on secure_delete.
Make sure that this is done for all SQLite3 builds.
---
 autotest/ogr/ogr_gpkg.py                      | 46 +++++++++++++++++++
 doc/source/drivers/vector/gpkg.rst            | 12 +++++
 doc/source/drivers/vector/sqlite.rst          | 11 +++++
 .../sqlite/ogrsqlitedatasource.cpp            | 15 +++++-
 4 files changed, 83 insertions(+), 1 deletion(-)

diff --git a/autotest/ogr/ogr_gpkg.py b/autotest/ogr/ogr_gpkg.py
index 822a46334459..3abdd951a3d4 100755
--- a/autotest/ogr/ogr_gpkg.py
+++ b/autotest/ogr/ogr_gpkg.py
@@ -10540,3 +10540,49 @@ def test_gpkg_create_more_than_2000_fields(tmp_vsimem):
         with pytest.raises(Exception, match="Limit of 2000 columns reached"):
             lyr.CreateField(ogr.FieldDefn("foo"))
         assert lyr.GetLayerDefn().GetFieldCount() == 2000 - 2
+
+
+###############################################################################
+# Test that secure_delete is turned on
+
+
+@gdaltest.enable_exceptions()
+def test_gpkg_secure_delete(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "secure_delete.gpkg")
+    with ogr.GetDriverByName("GPKG").CreateDataSource(filename) as ds:
+
+        with ds.ExecuteSQL("PRAGMA secure_delete") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f.GetField(0) == 1
+
+        lyr = ds.CreateLayer("test")
+        lyr.CreateField(ogr.FieldDefn("foo"))
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f["foo"] = "very_secret"
+        lyr.CreateFeature(f)
+
+    f = gdal.VSIFOpenL(filename, "rb")
+    data = gdal.VSIFReadL(1, 100000, f)
+    gdal.VSIFCloseL(f)
+    assert b"very_secret" in data
+
+    with ogr.Open(filename, update=1) as ds:
+
+        with ds.ExecuteSQL("PRAGMA secure_delete") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f.GetField(0) == 1
+
+        lyr = ds.GetLayer(0)
+        lyr.DeleteFeature(1)
+
+    f = gdal.VSIFOpenL(filename, "rb")
+    data = gdal.VSIFReadL(1, 100000, f)
+    gdal.VSIFCloseL(f)
+    assert b"very_secret" not in data
+
+    with gdaltest.config_option("OGR_SQLITE_PRAGMA", "secure_delete=0"):
+        with ogr.Open(filename, update=1) as ds:
+            with ds.ExecuteSQL("PRAGMA secure_delete") as sql_lyr:
+                f = sql_lyr.GetNextFeature()
+                assert f.GetField(0) == 0
diff --git a/doc/source/drivers/vector/gpkg.rst b/doc/source/drivers/vector/gpkg.rst
index 77c8c5364dc7..634ee61fd310 100644
--- a/doc/source/drivers/vector/gpkg.rst
+++ b/doc/source/drivers/vector/gpkg.rst
@@ -809,6 +809,18 @@ Examples
         -sql "SELECT poly.id, other.foo FROM poly JOIN other_schema.other USING (id)" \
         -oo PRELUDE_STATEMENTS="ATTACH DATABASE 'other.gpkg' AS other_schema"
 
+Secure deletion
+---------------
+
+Depending on how SQLite3 is built, `secure deletion <https://www.sqlite.org/pragma.html#pragma_secure_delete>`__
+might or might not be enabled.
+Starting with GDAL 3.10, secure deletion is always enabled, unless
+``SECURE_DELETE`` is specified through the :config:`OGR_SQLITE_PRAGMA`
+configuration option.
+Note that secure deletion does not recover potential lost space, so running
+a `VACUUM <https://sqlite.org/lang_vacuum.html>`__ query is recommended to fully
+optimized a database that has been subject to updates or deletions.
+
 See Also
 --------
 
diff --git a/doc/source/drivers/vector/sqlite.rst b/doc/source/drivers/vector/sqlite.rst
index 0c005056843d..7242910c69c5 100644
--- a/doc/source/drivers/vector/sqlite.rst
+++ b/doc/source/drivers/vector/sqlite.rst
@@ -556,6 +556,17 @@ and optimize it.
 
    ogrinfo db.sqlite -sql "VACUUM"
 
+Secure deletion
+---------------
+
+Depending on how SQLite3 is built, `secure deletion <https://www.sqlite.org/pragma.html#pragma_secure_delete>`__
+might or might not be enabled.
+Starting with GDAL 3.10, secure deletion is always enabled, unless
+``SECURE_DELETE`` is specified through the :config:`OGR_SQLITE_PRAGMA`
+configuration option.
+Note that secure deletion does not recover potential lost space, so running
+a `VACUUM <https://sqlite.org/lang_vacuum.html>`__ query is recommended to fully
+optimized a database that has been subject to updates or deletions.
 
 Example
 -------
diff --git a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
index 5a0d6a295dd7..c0a1bd99b3dd 100644
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
@@ -1372,6 +1372,7 @@ bool OGRSQLiteBaseDataSource::OpenOrCreateDB(int flagsIn,
 #endif
 
     bool bPageSizeFound = false;
+    bool bSecureDeleteFound = false;
 
     const char *pszSqlitePragma =
         CPLGetConfigOption("OGR_SQLITE_PRAGMA", nullptr);
@@ -1456,7 +1457,7 @@ bool OGRSQLiteBaseDataSource::OpenOrCreateDB(int flagsIn,
             {
                 if (STARTS_WITH_CI(papszTokens[i], "PAGE_SIZE"))
                     bPageSizeFound = true;
-                if (STARTS_WITH_CI(papszTokens[i], "JOURNAL_MODE"))
+                else if (STARTS_WITH_CI(papszTokens[i], "JOURNAL_MODE"))
                 {
                     const char *pszEqual = strchr(papszTokens[i], '=');
                     if (pszEqual)
@@ -1467,6 +1468,8 @@ bool OGRSQLiteBaseDataSource::OpenOrCreateDB(int flagsIn,
                         continue;
                     }
                 }
+                else if (STARTS_WITH_CI(papszTokens[i], "SECURE_DELETE"))
+                    bSecureDeleteFound = true;
 
                 const char *pszSQL = CPLSPrintf("PRAGMA %s", papszTokens[i]);
 
@@ -1646,6 +1649,16 @@ bool OGRSQLiteBaseDataSource::OpenOrCreateDB(int flagsIn,
             sqlite3_exec(hDB, pszSQL, nullptr, nullptr, nullptr));
     }
 
+    if (!bSecureDeleteFound)
+    {
+        // Turn on secure_delete by default (unless the user specifies a
+        // value of this pragma through OGR_SQLITE_PRAGMA)
+        // For example, Debian and Conda-Forge SQLite3 builds already turn on
+        // secure_delete.
+        CPL_IGNORE_RET_VAL(sqlite3_exec(hDB, "PRAGMA secure_delete = 1",
+                                        nullptr, nullptr, nullptr));
+    }
+
     SetCacheSize();
     SetSynchronous();
     if (bLoadExtensions)

From 166ee6fee9c5e2356605e89abf72c23f3bd0cb74 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 11:41:15 +0100
Subject: [PATCH 57/87] Python bindings: __init__.py: remove calls to
 warnings.simplefilter()

Fixes #11140

This changes the global warnings configuration, which is not appropriate
to do inside a library.
---
 swig/python/osgeo/__init__.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/swig/python/osgeo/__init__.py b/swig/python/osgeo/__init__.py
index f746a86456ec..f5e090cf0370 100644
--- a/swig/python/osgeo/__init__.py
+++ b/swig/python/osgeo/__init__.py
@@ -93,8 +93,7 @@ def ver_str(ver):
     if fail_on_unsupported_version:
         raise Exception(msg)
     else:
-        from warnings import warn, simplefilter
-        simplefilter('always', DeprecationWarning)
+        from warnings import warn
         warn(msg, DeprecationWarning)
 elif this_python_version_will_be_deprecated_in_gdal_version:
     msg = 'You are using Python {} with GDAL {}. ' \
@@ -106,6 +105,5 @@ def ver_str(ver):
                ver_str(next_version_of_gdal_will_use_python_version),
                ver_str(this_python_version_will_be_deprecated_in_gdal_version))
 
-    from warnings import warn, simplefilter
-    simplefilter('always', DeprecationWarning)
+    from warnings import warn
     warn(msg, DeprecationWarning)

From 9a8c5c031404bbc81445291bad128bc13766cafa Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 12:56:53 +0100
Subject: [PATCH 58/87] Add (minimum) support for libarrow 18.0.0

Essentially to fix compiler warnings about missing cases in switch() and
fix a deprecation warning.

Support for DECIMAL32 and DECIMAL64 should work on the read side, but
not actually tested. The ogrlayerarrow.cpp generic code isn't ready for
them yet.
No support on the write side to limit backwards compatibility issues.
---
 .../arrow_common/ograrrowlayer.hpp            | 138 ++++++++++++++++++
 .../arrow_common/ograrrowwriterlayer.hpp      |  14 +-
 ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp   |   5 +-
 3 files changed, 155 insertions(+), 2 deletions(-)

diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp b/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp
index af0c8e2c9807..a52cf4e4227f 100644
--- a/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp
+++ b/ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp
@@ -228,6 +228,10 @@ inline bool OGRArrowLayer::IsHandledListOrMapType(
            itemTypeId == arrow::Type::HALF_FLOAT ||
            itemTypeId == arrow::Type::FLOAT ||
            itemTypeId == arrow::Type::DOUBLE ||
+#if ARROW_VERSION_MAJOR >= 18
+           itemTypeId == arrow::Type::DECIMAL32 ||
+           itemTypeId == arrow::Type::DECIMAL64 ||
+#endif
            itemTypeId == arrow::Type::DECIMAL128 ||
            itemTypeId == arrow::Type::DECIMAL256 ||
            itemTypeId == arrow::Type::STRING ||
@@ -422,6 +426,10 @@ inline bool OGRArrowLayer::MapArrowTypeToOGR(
                                    // nanosecond accuracy
             break;
 
+#if ARROW_VERSION_MAJOR >= 18
+        case arrow::Type::DECIMAL32:
+        case arrow::Type::DECIMAL64:
+#endif
         case arrow::Type::DECIMAL128:
         case arrow::Type::DECIMAL256:
         {
@@ -468,6 +476,10 @@ inline bool OGRArrowLayer::MapArrowTypeToOGR(
                     eSubType = OFSTFloat32;
                     break;
                 case arrow::Type::DOUBLE:
+#if ARROW_VERSION_MAJOR >= 18
+                case arrow::Type::DECIMAL32:
+                case arrow::Type::DECIMAL64:
+#endif
                 case arrow::Type::DECIMAL128:
                 case arrow::Type::DECIMAL256:
                     eType = OFTRealList;
@@ -1290,6 +1302,23 @@ static void AddToArray(CPLJSONArray &oArray, const arrow::Array *array,
                 static_cast<const arrow::DoubleArray *>(array)->Value(nIdx));
             break;
         }
+
+#if ARROW_VERSION_MAJOR >= 18
+        case arrow::Type::DECIMAL32:
+        {
+            oArray.Add(CPLAtof(static_cast<const arrow::Decimal32Array *>(array)
+                                   ->FormatValue(nIdx)
+                                   .c_str()));
+            break;
+        }
+        case arrow::Type::DECIMAL64:
+        {
+            oArray.Add(CPLAtof(static_cast<const arrow::Decimal64Array *>(array)
+                                   ->FormatValue(nIdx)
+                                   .c_str()));
+            break;
+        }
+#endif
         case arrow::Type::DECIMAL128:
         {
             oArray.Add(
@@ -1470,6 +1499,25 @@ static void AddToDict(CPLJSONObject &oDict, const std::string &osKey,
                 static_cast<const arrow::DoubleArray *>(array)->Value(nIdx));
             break;
         }
+
+#if ARROW_VERSION_MAJOR >= 18
+        case arrow::Type::DECIMAL32:
+        {
+            oDict.Add(osKey,
+                      CPLAtof(static_cast<const arrow::Decimal32Array *>(array)
+                                  ->FormatValue(nIdx)
+                                  .c_str()));
+            break;
+        }
+        case arrow::Type::DECIMAL64:
+        {
+            oDict.Add(osKey,
+                      CPLAtof(static_cast<const arrow::Decimal64Array *>(array)
+                                  ->FormatValue(nIdx)
+                                  .c_str()));
+            break;
+        }
+#endif
         case arrow::Type::DECIMAL128:
         {
             oDict.Add(osKey,
@@ -1757,6 +1805,48 @@ static void ReadList(OGRFeature *poFeature, int i, int64_t nIdxInArray,
             break;
         }
 
+#if ARROW_VERSION_MAJOR >= 18
+        case arrow::Type::DECIMAL32:
+        {
+            const auto values = std::static_pointer_cast<arrow::Decimal32Array>(
+                array->values());
+            const auto nIdxStart = array->value_offset(nIdxInArray);
+            const int nCount = array->value_length(nIdxInArray);
+            std::vector<double> aValues;
+            aValues.reserve(nCount);
+            for (int k = 0; k < nCount; k++)
+            {
+                if (values->IsNull(nIdxStart + k))
+                    aValues.push_back(std::numeric_limits<double>::quiet_NaN());
+                else
+                    aValues.push_back(
+                        CPLAtof(values->FormatValue(nIdxStart + k).c_str()));
+            }
+            poFeature->SetField(i, nCount, aValues.data());
+            break;
+        }
+
+        case arrow::Type::DECIMAL64:
+        {
+            const auto values = std::static_pointer_cast<arrow::Decimal64Array>(
+                array->values());
+            const auto nIdxStart = array->value_offset(nIdxInArray);
+            const int nCount = array->value_length(nIdxInArray);
+            std::vector<double> aValues;
+            aValues.reserve(nCount);
+            for (int k = 0; k < nCount; k++)
+            {
+                if (values->IsNull(nIdxStart + k))
+                    aValues.push_back(std::numeric_limits<double>::quiet_NaN());
+                else
+                    aValues.push_back(
+                        CPLAtof(values->FormatValue(nIdxStart + k).c_str()));
+            }
+            poFeature->SetField(i, nCount, aValues.data());
+            break;
+        }
+#endif
+
         case arrow::Type::DECIMAL128:
         {
             const auto values =
@@ -2406,6 +2496,26 @@ inline OGRFeature *OGRArrowLayer::ReadFeature(
                 break;
             }
 
+#if ARROW_VERSION_MAJOR >= 18
+            case arrow::Type::DECIMAL32:
+            {
+                const auto castArray =
+                    static_cast<const arrow::Decimal32Array *>(array);
+                poFeature->SetField(
+                    i, CPLAtof(castArray->FormatValue(nIdxInBatch).c_str()));
+                break;
+            }
+
+            case arrow::Type::DECIMAL64:
+            {
+                const auto castArray =
+                    static_cast<const arrow::Decimal64Array *>(array);
+                poFeature->SetField(
+                    i, CPLAtof(castArray->FormatValue(nIdxInBatch).c_str()));
+                break;
+            }
+#endif
+
             case arrow::Type::DECIMAL128:
             {
                 const auto castArray =
@@ -3900,6 +4010,34 @@ inline bool OGRArrowLayer::SkipToNextFeatureDueToAttributeFilter() const
                 break;
             }
 
+#if ARROW_VERSION_MAJOR >= 18
+            case arrow::Type::DECIMAL32:
+            {
+                const auto castArray =
+                    static_cast<const arrow::Decimal32Array *>(array);
+                if (!ConstraintEvaluator(
+                        constraint,
+                        CPLAtof(castArray->FormatValue(m_nIdxInBatch).c_str())))
+                {
+                    return true;
+                }
+                break;
+            }
+
+            case arrow::Type::DECIMAL64:
+            {
+                const auto castArray =
+                    static_cast<const arrow::Decimal64Array *>(array);
+                if (!ConstraintEvaluator(
+                        constraint,
+                        CPLAtof(castArray->FormatValue(m_nIdxInBatch).c_str())))
+                {
+                    return true;
+                }
+                break;
+            }
+#endif
+
             case arrow::Type::DECIMAL128:
             {
                 const auto castArray =
diff --git a/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp b/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp
index 8f23b3c34cf6..1a8a2e7dcbc1 100644
--- a/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp
+++ b/ogr/ogrsf_frmts/arrow_common/ograrrowwriterlayer.hpp
@@ -184,7 +184,19 @@ inline void OGRArrowWriterLayer::CreateSchemaCommon()
             {
                 const int nPrecision = poFieldDefn->GetPrecision();
                 if (nWidth != 0 && nPrecision != 0)
-                    dt = arrow::decimal(nWidth, nPrecision);
+                {
+                    // Since arrow 18.0, we could use arrow::smallest_decimal()
+                    // to return the smallest representation (i.e. possibly
+                    // decimal32 and decimal64). But for now keep decimal128
+                    // as the minimum for backwards compatibility.
+                    // GetValueDecimal() and other functions in
+                    // ogrlayerarrow.cpp would have to be adapted for decimal32
+                    // and decimal64 compatibility.
+                    if (nWidth > 38)
+                        dt = arrow::decimal256(nWidth, nPrecision);
+                    else
+                        dt = arrow::decimal128(nWidth, nPrecision);
+                }
                 else if (eSubDT == OFSTFloat32)
                     dt = arrow::float32();
                 else
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp
index fc8013301e33..e613c0f1d921 100644
--- a/ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp
@@ -1427,6 +1427,10 @@ bool OGRParquetLayer::ReadNextBatch()
 {
     m_nIdxInBatch = 0;
 
+    const int nNumGroups = m_poArrowReader->num_row_groups();
+    if (nNumGroups == 0)
+        return false;
+
     if (m_bSingleBatch)
     {
         CPLAssert(m_iRecordBatch == 0);
@@ -1468,7 +1472,6 @@ bool OGRParquetLayer::ReadNextBatch()
         }
         else
         {
-            const int nNumGroups = m_poArrowReader->num_row_groups();
             OGRField sMin;
             OGRField sMax;
             OGR_RawField_SetNull(&sMin);

From 62a217624eff5a1c73a89356dc214c7677e46dc2 Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Mon, 28 Oct 2024 09:48:22 -0400
Subject: [PATCH 59/87] apps: use unique_ptr overloads of addGeometry, addRing

References https://github.com/OSGeo/gdal/issues/4371
---
 apps/gdal_footprint_lib.cpp |  4 ++--
 apps/gdal_rasterize_lib.cpp | 24 +++++++++++++++---------
 apps/gdaltindex_lib.cpp     |  2 +-
 apps/gdalwarp_lib.cpp       |  6 +++---
 apps/ogr2ogr_lib.cpp        |  6 +++---
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/apps/gdal_footprint_lib.cpp b/apps/gdal_footprint_lib.cpp
index 978c67d6ec81..a647517bf3a7 100644
--- a/apps/gdal_footprint_lib.cpp
+++ b/apps/gdal_footprint_lib.cpp
@@ -1028,7 +1028,7 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,
             CPLAssert(poGeom);
             if (poGeom->getGeometryType() == wkbPolygon)
             {
-                poMP->addGeometryDirectly(poGeom.release());
+                poMP->addGeometry(std::move(poGeom));
             }
         }
         poMemLayer = std::make_unique<OGRMemLayer>("", nullptr, wkbUnknown);
@@ -1095,7 +1095,7 @@ static bool GDALFootprintProcess(GDALDataset *poSrcDS, OGRLayer *poDstLayer,
                         }
                     }
                     if (!poNewPoly->IsEmpty())
-                        poMP->addGeometryDirectly(poNewPoly.release());
+                        poMP->addGeometry(std::move(poNewPoly));
                 }
                 poGeom = std::move(poMP);
             }
diff --git a/apps/gdal_rasterize_lib.cpp b/apps/gdal_rasterize_lib.cpp
index 6b6981438133..2d456ffc460e 100644
--- a/apps/gdal_rasterize_lib.cpp
+++ b/apps/gdal_rasterize_lib.cpp
@@ -366,7 +366,7 @@ static void InvertGeometries(GDALDatasetH hDstDS,
     double adfGeoTransform[6] = {};
     GDALGetGeoTransform(hDstDS, adfGeoTransform);
 
-    OGRLinearRing *poUniverseRing = new OGRLinearRing();
+    auto poUniverseRing = std::make_unique<OGRLinearRing>();
 
     poUniverseRing->addPoint(
         adfGeoTransform[0] + -2 * adfGeoTransform[1] + -2 * adfGeoTransform[2],
@@ -391,9 +391,9 @@ static void InvertGeometries(GDALDatasetH hDstDS,
         adfGeoTransform[0] + -2 * adfGeoTransform[1] + -2 * adfGeoTransform[2],
         adfGeoTransform[3] + -2 * adfGeoTransform[4] + -2 * adfGeoTransform[5]);
 
-    OGRPolygon *poUniversePoly = new OGRPolygon();
-    poUniversePoly->addRingDirectly(poUniverseRing);
-    poInvertMP->addGeometryDirectly(poUniversePoly);
+    auto poUniversePoly = std::make_unique<OGRPolygon>();
+    poUniversePoly->addRing(std::move(poUniverseRing));
+    poInvertMP->addGeometry(std::move(poUniversePoly));
 
     bool bFoundNonPoly = false;
     // If we have GEOS, use it to "subtract" each polygon from the universe
@@ -434,6 +434,9 @@ static void InvertGeometries(GDALDatasetH hDstDS,
         return;
     }
 
+    OGRPolygon &hUniversePoly =
+        *poInvertMP->getGeometryRef(poInvertMP->getNumGeometries() - 1);
+
     /* -------------------------------------------------------------------- */
     /*      If we don't have GEOS, add outer rings of polygons as inner     */
     /*      rings of poUniversePoly and inner rings as sub-polygons. Note   */
@@ -460,15 +463,18 @@ static void InvertGeometries(GDALDatasetH hDstDS,
         }
 
         const auto ProcessPoly =
-            [poUniversePoly, poInvertMP](OGRPolygon *poPoly)
+            [&hUniversePoly, poInvertMP](OGRPolygon *poPoly)
         {
             for (int i = poPoly->getNumInteriorRings() - 1; i >= 0; --i)
             {
-                auto poNewPoly = new OGRPolygon();
-                poNewPoly->addRingDirectly(poPoly->stealInteriorRing(i));
-                poInvertMP->addGeometryDirectly(poNewPoly);
+                auto poNewPoly = std::make_unique<OGRPolygon>();
+                std::unique_ptr<OGRLinearRing> poRing(
+                    poPoly->stealInteriorRing(i));
+                poNewPoly->addRing(std::move(poRing));
+                poInvertMP->addGeometry(std::move(poNewPoly));
             }
-            poUniversePoly->addRingDirectly(poPoly->stealExteriorRing());
+            std::unique_ptr<OGRLinearRing> poShell(poPoly->stealExteriorRing());
+            hUniversePoly.addRing(std::move(poShell));
         };
 
         if (eGType == wkbPolygon)
diff --git a/apps/gdaltindex_lib.cpp b/apps/gdaltindex_lib.cpp
index 9b429ec7fe97..11b3a42c735b 100644
--- a/apps/gdaltindex_lib.cpp
+++ b/apps/gdaltindex_lib.cpp
@@ -1269,7 +1269,7 @@ GDALDatasetH GDALTileIndex(const char *pszDest, int nSrcCount,
         auto poRing = std::make_unique<OGRLinearRing>();
         for (int k = 0; k < 5; k++)
             poRing->addPoint(adfX[k], adfY[k]);
-        poPoly->addRingDirectly(poRing.release());
+        poPoly->addRing(std::move(poRing));
         poFeature->SetGeometryDirectly(poPoly.release());
 
         if (poLayer->CreateFeature(poFeature.get()) != OGRERR_NONE)
diff --git a/apps/gdalwarp_lib.cpp b/apps/gdalwarp_lib.cpp
index 466bda679e9c..f8ee70e7f910 100644
--- a/apps/gdalwarp_lib.cpp
+++ b/apps/gdalwarp_lib.cpp
@@ -3427,7 +3427,7 @@ static CPLErr LoadCutline(const std::string &osCutlineDSNameOrWKT,
         OGRwkbGeometryType eType = wkbFlatten(poGeom->getGeometryType());
 
         if (eType == wkbPolygon)
-            poMultiPolygon->addGeometryDirectly(poGeom.release());
+            poMultiPolygon->addGeometry(std::move(poGeom));
         else if (eType == wkbMultiPolygon)
         {
             for (const auto *poSubGeom : poGeom->toMultiPolygon())
@@ -5401,7 +5401,7 @@ static CPLErr TransformCutlineToSource(GDALDataset *poSrcDS,
     {
         const double dfCutlineBlendDist = CPLAtof(CSLFetchNameValueDef(
             *ppapszWarpOptions, "CUTLINE_BLEND_DIST", "0"));
-        OGRLinearRing *poRing = new OGRLinearRing();
+        auto poRing = std::make_unique<OGRLinearRing>();
         poRing->addPoint(-dfCutlineBlendDist, -dfCutlineBlendDist);
         poRing->addPoint(-dfCutlineBlendDist,
                          dfCutlineBlendDist + poSrcDS->GetRasterYSize());
@@ -5411,7 +5411,7 @@ static CPLErr TransformCutlineToSource(GDALDataset *poSrcDS,
                          -dfCutlineBlendDist);
         poRing->addPoint(-dfCutlineBlendDist, -dfCutlineBlendDist);
         OGRPolygon oSrcDSFootprint;
-        oSrcDSFootprint.addRingDirectly(poRing);
+        oSrcDSFootprint.addRing(std::move(poRing));
         OGREnvelope sSrcDSEnvelope;
         oSrcDSFootprint.getEnvelope(&sSrcDSEnvelope);
         OGREnvelope sCutlineEnvelope;
diff --git a/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp
index e5ef6bf92628..6d8abd3f5a27 100644
--- a/apps/ogr2ogr_lib.cpp
+++ b/apps/ogr2ogr_lib.cpp
@@ -688,13 +688,13 @@ static std::unique_ptr<OGRGeometry> LoadGeometry(const std::string &osDS,
                                  "should be manually inspected.",
                                  poFeat->GetFID(), osDS.c_str());
 
-                        oGC.addGeometryDirectly(poValid.release());
+                        oGC.addGeometry(std::move(poValid));
                     }
                     else
                     {
                         CPLError(CE_Failure, CPLE_AppDefined,
                                  "Geometry of feature " CPL_FRMT_GIB " of %s "
-                                 "is invalid, and could not been made valid.",
+                                 "is invalid, and could not be made valid.",
                                  poFeat->GetFID(), osDS.c_str());
                         oGC.empty();
                         break;
@@ -702,7 +702,7 @@ static std::unique_ptr<OGRGeometry> LoadGeometry(const std::string &osDS,
                 }
                 else
                 {
-                    oGC.addGeometryDirectly(poSrcGeom.release());
+                    oGC.addGeometry(std::move(poSrcGeom));
                 }
             }
         }

From e3171c6fd7a9986492ba36f29cae6bfecd91b0d6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 19:59:52 +0100
Subject: [PATCH 60/87] Python bindings: fix compatibility issue with SWIG
 4.3.0 and PYTHONWARNINGS=error

Fixes https://github.com/conda-forge/gdal-feedstock/issues/995
---
 .github/workflows/cmake_builds.yml | 2 ++
 swig/python/modify_cpp_files.cmake | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/cmake_builds.yml b/.github/workflows/cmake_builds.yml
index 77658bf242fd..61ead5e52a72 100644
--- a/.github/workflows/cmake_builds.yml
+++ b/.github/workflows/cmake_builds.yml
@@ -218,6 +218,8 @@ jobs:
         export LD_LIBRARY_PATH=$GITHUB_WORKSPACE/install-gdal/lib
         $GITHUB_WORKSPACE/install-gdal/bin/gdalinfo --version
         PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 -c "from osgeo import gdal;print(gdal.VersionInfo(None))"
+        # Test fix for https://github.com/conda-forge/gdal-feedstock/issues/995
+        PYTHONWARNINGS="error" PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 -c "from osgeo import gdal"
         PYTHONPATH=$GITHUB_WORKSPACE/install-gdal/lib/python3.8/site-packages python3 $GITHUB_WORKSPACE/scripts/check_doc.py
     - name: CMake with rpath
       run: |
diff --git a/swig/python/modify_cpp_files.cmake b/swig/python/modify_cpp_files.cmake
index af6668b0189e..fe4b8489c13b 100644
--- a/swig/python/modify_cpp_files.cmake
+++ b/swig/python/modify_cpp_files.cmake
@@ -60,4 +60,8 @@ string(REPLACE "if (--interpreter_counter != 0) // another sub-interpreter may s
                "/* Even Rouault / GDAL hack for SWIG >= 4.1 related to objects not being freed. See swig/python/modify_cpp_files.cmake for more details */\nif( 1 )"
        _CONTENTS "${_CONTENTS}")
 
+# Works around https://github.com/swig/swig/issues/3061
+string(REPLACE "# define SWIG_HEAPTYPES" "// Below is disabled because of https://github.com/swig/swig/issues/3061\n// # define SWIG_HEAPTYPES"
+       _CONTENTS "${_CONTENTS}")
+
 file(WRITE ${FILE} "${_CONTENTS}")

From 997537270c204fcd0b5dbdc1cc74501e491971a2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 21:13:27 +0100
Subject: [PATCH 61/87] Add a CPLIsInteractive() function to determine if a
 file refers to a terminal

---
 port/cpl_conv.cpp | 27 +++++++++++++++++++++++++++
 port/cpl_conv.h   |  6 ++++++
 2 files changed, 33 insertions(+)

diff --git a/port/cpl_conv.cpp b/port/cpl_conv.cpp
index 3325fbb7bb99..f1f68b4e8885 100644
--- a/port/cpl_conv.cpp
+++ b/port/cpl_conv.cpp
@@ -62,6 +62,12 @@
 #include <xlocale.h>  // for LC_NUMERIC_MASK on MacOS
 #endif
 
+#ifdef _WIN32
+#include <io.h>  // _isatty
+#else
+#include <unistd.h>  // isatty
+#endif
+
 #ifdef DEBUG_CONFIG_OPTIONS
 #include <set>
 #endif
@@ -3493,3 +3499,24 @@ CPLConfigOptionSetter::~CPLConfigOptionSetter()
 }
 
 //! @endcond
+
+/************************************************************************/
+/*                          CPLIsInteractive()                          */
+/************************************************************************/
+
+/** Returns whether the provided file refers to a terminal.
+ *
+ * This function is a wrapper of the ``isatty()`` POSIX function.
+ *
+ * @param f File to test. Typically stdin, stdout or stderr
+ * @return true if it is an open file referring to a terminal.
+ * @since GDAL 3.11
+ */
+bool CPLIsInteractive(FILE *f)
+{
+#ifndef _WIN32
+    return isatty(static_cast<int>(fileno(f)));
+#else
+    return _isatty(_fileno(f));
+#endif
+}
diff --git a/port/cpl_conv.h b/port/cpl_conv.h
index 724ffc8aef33..f1d11eb06300 100644
--- a/port/cpl_conv.h
+++ b/port/cpl_conv.h
@@ -309,6 +309,12 @@ void CPLCleanupSetlocaleMutex(void);
 */
 int CPL_DLL CPLIsPowerOfTwo(unsigned int i);
 
+/* -------------------------------------------------------------------- */
+/*      Terminal related                                                */
+/* -------------------------------------------------------------------- */
+
+bool CPL_DLL CPLIsInteractive(FILE *f);
+
 CPL_C_END
 
 /* -------------------------------------------------------------------- */

From 1a3335bed612601003ae92e3d43a1cfc6768e249 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 21:13:44 +0100
Subject: [PATCH 62/87] Use CPLIsInteractive()

---
 apps/gdallocationinfo.cpp  |  8 +-------
 apps/gdaltransform.cpp     |  8 +-------
 frmts/grib/gribdataset.cpp | 12 +-----------
 port/cpl_error.cpp         |  6 +-----
 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/apps/gdallocationinfo.cpp b/apps/gdallocationinfo.cpp
index b5c3c42117da..bcd6e5225141 100644
--- a/apps/gdallocationinfo.cpp
+++ b/apps/gdallocationinfo.cpp
@@ -26,12 +26,6 @@
 
 #include <cctype>
 
-#ifdef _WIN32
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
 /************************************************************************/
 /*                             GetSRSAsWKT                              */
 /************************************************************************/
@@ -300,7 +294,7 @@ MAIN_START(argc, argv)
     if (std::isnan(dfGeoX))
     {
         // Is it an interactive terminal ?
-        if (isatty(static_cast<int>(fileno(stdin))))
+        if (CPLIsInteractive(stdin))
         {
             if (!osSourceSRS.empty())
             {
diff --git a/apps/gdaltransform.cpp b/apps/gdaltransform.cpp
index 6455a060c5d5..7b77da3dd10e 100644
--- a/apps/gdaltransform.cpp
+++ b/apps/gdaltransform.cpp
@@ -30,12 +30,6 @@
 #include "ogr_srs_api.h"
 #include "commonutils.h"
 
-#ifdef _WIN32
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-
 /************************************************************************/
 /*                               Usage()                                */
 /************************************************************************/
@@ -359,7 +353,7 @@ MAIN_START(argc, argv)
     if (!bCoordOnCommandLine)
     {
         // Is it an interactive terminal ?
-        if (isatty(static_cast<int>(fileno(stdin))))
+        if (CPLIsInteractive(stdin))
         {
             if (pszSrcFilename != nullptr)
             {
diff --git a/frmts/grib/gribdataset.cpp b/frmts/grib/gribdataset.cpp
index 9e506e379760..d5b3bc750a4c 100644
--- a/frmts/grib/gribdataset.cpp
+++ b/frmts/grib/gribdataset.cpp
@@ -27,12 +27,6 @@
 #include <fcntl.h>
 #endif
 
-#ifndef _WIN32
-#include <unistd.h>  // isatty()
-#else
-#include <io.h>  // _isatty()
-#endif
-
 #include <algorithm>
 #include <set>
 #include <string>
@@ -901,11 +895,7 @@ static bool IsGdalinfoInteractive()
 {
     static const bool bIsGdalinfoInteractive = []()
     {
-#ifndef _WIN32
-        if (isatty(static_cast<int>(fileno(stdout))))
-#else
-        if (_isatty(_fileno(stdout)))
-#endif
+        if (CPLIsInteractive(stdout))
         {
             std::string osPath;
             osPath.resize(1024);
diff --git a/port/cpl_error.cpp b/port/cpl_error.cpp
index 62ef19fccf06..f751837377b0 100644
--- a/port/cpl_error.cpp
+++ b/port/cpl_error.cpp
@@ -15,10 +15,6 @@
 
 #include "cpl_error.h"
 
-#ifndef _WIN32
-#include <unistd.h>  // isatty()
-#endif
-
 #include <cstdarg>
 #include <cstdio>
 #include <cstdlib>
@@ -1052,7 +1048,7 @@ void CPL_STDCALL CPLDefaultErrorHandler(CPLErr eErrClass, CPLErrorNum nError,
 #ifndef _WIN32
         CPLErrorContext *psCtx = CPLGetErrorContext();
         if (psCtx != nullptr && !IS_PREFEFINED_ERROR_CTX(psCtx) &&
-            fpLog == stderr && isatty(static_cast<int>(fileno(stderr))))
+            fpLog == stderr && CPLIsInteractive(stderr))
         {
             if (psCtx->bProgressMode)
             {

From ae153d0b9df1227ca5eaec068cf7b44f6f6d47a4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 18:28:14 +0100
Subject: [PATCH 63/87] GDALTermProgress: display estimated remaining time for
 tasks >= 10 seconds

Refreshed every tick (so 2.5%)

(only on interactive terminals. Tested with bash on Linux and cmd on Windows,
but should work for all reasonable terminals)

```
Before 5 seconds:
0...10...20...

After 5 seconds:
0...10...20...30...40...50                           - estimated remaining time: 00:00:07

Upon completion:
0...10...20...30...40...50...60...70...80...90...100 - done in 00:00:13.
```

Fixes #11100

Co-authored-by: Daniel Baston <dbaston@gmail.com>
---
 port/cpl_progress.cpp | 129 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 121 insertions(+), 8 deletions(-)

diff --git a/port/cpl_progress.cpp b/port/cpl_progress.cpp
index 4edf83b187ad..71bb78a597d1 100644
--- a/port/cpl_progress.cpp
+++ b/port/cpl_progress.cpp
@@ -14,6 +14,7 @@
 
 #include <cmath>
 #include <cstdio>
+#include <ctime>
 
 #include <algorithm>
 
@@ -163,6 +164,31 @@ void CPL_STDCALL GDALDestroyScaledProgress(void *pData)
     CPLFree(pData);
 }
 
+/************************************************************************/
+/*                      GDALTermProgressWidth()                         */
+/************************************************************************/
+
+static constexpr int GDALTermProgressWidth(int nMaxTicks, int nMajorTickSpacing)
+{
+    int nWidth = 0;
+    for (int i = 0; i <= nMaxTicks; i++)
+    {
+        if (i % nMajorTickSpacing == 0)
+        {
+            int nPercent = (i * 100) / nMaxTicks;
+            do
+            {
+                nWidth++;
+            } while (nPercent /= 10);
+        }
+        else
+        {
+            nWidth += 1;
+        }
+    }
+    return nWidth;
+}
+
 /************************************************************************/
 /*                          GDALTermProgress()                          */
 /************************************************************************/
@@ -179,6 +205,11 @@ void CPL_STDCALL GDALDestroyScaledProgress(void *pData)
 0...10...20...30...40...50...60...70...80...90...100 - done.
 \endverbatim
 
+ * Starting with GDAL 3.11, for tasks estimated to take more than 10 seconds,
+ * an estimated remaining time is also displayed at the end. And for tasks
+ * taking more than 5 seconds to complete, the total time is displayed upon
+ * completion.
+ *
  * Every 2.5% of progress another number or period is emitted.  Note that
  * GDALTermProgress() uses internal static data to keep track of the last
  * percentage reported and will get confused if two terminal based progress
@@ -200,30 +231,112 @@ int CPL_STDCALL GDALTermProgress(double dfComplete,
                                  CPL_UNUSED const char *pszMessage,
                                  CPL_UNUSED void *pProgressArg)
 {
-    const int nThisTick =
-        std::min(40, std::max(0, static_cast<int>(dfComplete * 40.0)));
+    constexpr int MAX_TICKS = 40;
+    constexpr int MAJOR_TICK_SPACING = 4;
+    constexpr int LENGTH_OF_0_TO_100_PROGRESS =
+        GDALTermProgressWidth(MAX_TICKS, MAJOR_TICK_SPACING);
+
+    const int nThisTick = std::min(
+        MAX_TICKS, std::max(0, static_cast<int>(dfComplete * MAX_TICKS)));
 
     // Have we started a new progress run?
     static int nLastTick = -1;
-    if (nThisTick < nLastTick && nLastTick >= 39)
+    static time_t nStartTime = 0;
+    // whether estimated remaining time is displayed
+    static bool bETADisplayed = false;
+    // number of characters displayed during last progress call
+    static int nCharacterCountLastTime = 0;
+    // maximum number of characters displayed during previous calls
+    static int nCharacterCountMax = 0;
+    if (nThisTick < nLastTick && nLastTick >= MAX_TICKS - 1)
+    {
+        bETADisplayed = false;
         nLastTick = -1;
+        nCharacterCountLastTime = 0;
+        nCharacterCountMax = 0;
+    }
 
     if (nThisTick <= nLastTick)
         return TRUE;
 
+    const time_t nCurTime = time(nullptr);
+    if (nLastTick < 0)
+        nStartTime = nCurTime;
+
+    constexpr int MIN_DELAY_FOR_ETA = 5;  // in seconds
+    if (nCurTime - nStartTime >= MIN_DELAY_FOR_ETA && dfComplete > 0 &&
+        dfComplete < 0.5)
+    {
+        static bool bIsTTY = CPLIsInteractive(stdout);
+        bETADisplayed = bIsTTY;
+    }
+    if (bETADisplayed)
+    {
+        for (int i = 0; i < nCharacterCountLastTime; ++i)
+            fprintf(stdout, "\b");
+        nLastTick = -1;
+        nCharacterCountLastTime = 0;
+    }
+
     while (nThisTick > nLastTick)
     {
         ++nLastTick;
-        if (nLastTick % 4 == 0)
-            fprintf(stdout, "%d", (nLastTick / 4) * 10);
+        if (nLastTick % MAJOR_TICK_SPACING == 0)
+        {
+            const int nPercent = (nLastTick * 100) / MAX_TICKS;
+            nCharacterCountLastTime += fprintf(stdout, "%d", nPercent);
+        }
         else
-            fprintf(stdout, ".");
+        {
+            nCharacterCountLastTime += fprintf(stdout, ".");
+        }
     }
 
-    if (nThisTick == 40)
-        fprintf(stdout, " - done.\n");
+    if (nThisTick == MAX_TICKS)
+    {
+        nCharacterCountLastTime += fprintf(stdout, " - done");
+        if (nCurTime - nStartTime >= MIN_DELAY_FOR_ETA)
+        {
+            const int nEllapsed = static_cast<int>(nCurTime - nStartTime);
+            const int nHours = nEllapsed / 3600;
+            const int nMins = (nEllapsed % 3600) / 60;
+            const int nSecs = nEllapsed % 60;
+            nCharacterCountLastTime +=
+                fprintf(stdout, " in %02d:%02d:%02d.", nHours, nMins, nSecs);
+            for (int i = nCharacterCountLastTime; i < nCharacterCountMax; ++i)
+                nCharacterCountLastTime += fprintf(stdout, " ");
+        }
+        else
+        {
+            fprintf(stdout, ".");
+        }
+        fprintf(stdout, "\n");
+    }
     else
+    {
+        if (bETADisplayed)
+        {
+            for (int i = nCharacterCountLastTime;
+                 i < LENGTH_OF_0_TO_100_PROGRESS; ++i)
+                nCharacterCountLastTime += fprintf(stdout, " ");
+
+            const double dfETA =
+                (nCurTime - nStartTime) * (1.0 / dfComplete - 1);
+            const int nETA = static_cast<int>(dfETA + 0.5);
+            const int nHours = nETA / 3600;
+            const int nMins = (nETA % 3600) / 60;
+            const int nSecs = nETA % 60;
+            nCharacterCountLastTime +=
+                fprintf(stdout, " - estimated remaining time: %02d:%02d:%02d",
+                        nHours, nMins, nSecs);
+            for (int i = nCharacterCountLastTime; i < nCharacterCountMax; ++i)
+                nCharacterCountLastTime += fprintf(stdout, " ");
+        }
         fflush(stdout);
+    }
+
+    if (nCharacterCountLastTime > nCharacterCountMax)
+        nCharacterCountMax = nCharacterCountLastTime;
 
     return TRUE;
 }

From 67f18e257a844e443184441e45ef11390be830b6 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 22:30:20 +0100
Subject: [PATCH 64/87] gdalwarp: in term progress, only display the short
 filename of the file being processed

---
 apps/gdalwarp_lib.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/gdalwarp_lib.cpp b/apps/gdalwarp_lib.cpp
index 093e5aae7183..4c4cc97f428b 100644
--- a/apps/gdalwarp_lib.cpp
+++ b/apps/gdalwarp_lib.cpp
@@ -2552,8 +2552,8 @@ static GDALDatasetH GDALWarpDirect(const char *pszDest, GDALDatasetH hDstDS,
         {
             CPLString osMsg;
             osMsg.Printf("Processing %s [%d/%d]",
-                         GDALGetDescription(pahSrcDS[iSrc]), iSrc + 1,
-                         nSrcCount);
+                         CPLGetFilename(GDALGetDescription(pahSrcDS[iSrc])),
+                         iSrc + 1, nSrcCount);
             return pfnExternalProgress((iSrc + dfComplete) / nSrcCount,
                                        osMsg.c_str(), pExternalProgressData);
         }

From da6662dae3a27c4018a61f23c4867c8447d8d4db Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Fri, 25 Oct 2024 10:25:28 -0400
Subject: [PATCH 65/87] Doc: Add documentation for gdalenhance

Co-authored by: Adam Zhang
---
 .../programs/gdalenhance_little_spruce.jpg    | Bin 0 -> 9661 bytes
 .../gdalenhance_little_spruce_enhanced.jpg    | Bin 0 -> 13387 bytes
 doc/source/programs/gdalenhance.rst           |  94 ++++++++++++++++++
 doc/source/programs/index.rst                 |   2 +
 4 files changed, 96 insertions(+)
 create mode 100644 doc/images/programs/gdalenhance_little_spruce.jpg
 create mode 100644 doc/images/programs/gdalenhance_little_spruce_enhanced.jpg
 create mode 100644 doc/source/programs/gdalenhance.rst

diff --git a/doc/images/programs/gdalenhance_little_spruce.jpg b/doc/images/programs/gdalenhance_little_spruce.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5815f7d3956eb0c73f0fa7113c0dc6574a0280b6
GIT binary patch
literal 9661
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
B8qfd$

literal 0
HcmV?d00001

diff --git a/doc/images/programs/gdalenhance_little_spruce_enhanced.jpg b/doc/images/programs/gdalenhance_little_spruce_enhanced.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3804af6ac38b7d76559127b3b9ab231b355e03e8
GIT binary patch
literal 13387
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

literal 0
HcmV?d00001

diff --git a/doc/source/programs/gdalenhance.rst b/doc/source/programs/gdalenhance.rst
new file mode 100644
index 000000000000..72662177209a
--- /dev/null
+++ b/doc/source/programs/gdalenhance.rst
@@ -0,0 +1,94 @@
+.. _gdalenhance:
+
+================================================================================
+gdalenhance
+================================================================================
+
+.. only:: html
+
+    Enhance the contrast of raster images using histogram equalization.
+
+.. Index:: gdalenhance
+
+Synopsis
+--------
+
+.. code-block::
+
+    gdalenhance [--help-general]
+                [-of format] [-co "NAME=VALUE"]*
+                [-ot {Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/
+                        CInt16/CInt32/CFloat32/CFloat64}]
+                [-equalize]
+                [-config filename]
+                <src_raster> [<dst_raster>]
+
+Description
+-----------
+
+The :program:`gdalenhance` utility enhances the contrast of raster images using
+histogram equalization. It can either generate a LUT (look-up-table) that can
+later be applied to enhance contrast, or it can write the enhanced image
+directly.
+
+.. figure:: ../../images/programs/gdalenhance_little_spruce.jpg
+
+   Original image.
+
+.. figure:: ../../images/programs/gdalenhance_little_spruce_enhanced.jpg
+
+   Image after histogram equalization using :program:`gdalenhance`.
+
+
+.. program:: gdalenhance
+
+.. include:: options/help_and_help_general.rst
+
+.. option:: -of format
+
+    Select the output format. The default is GeoTIFF (GTiff).
+
+.. include:: options/co.rst
+
+.. include:: options/ot.rst
+
+.. option:: -equalize
+
+    Get source image histogram and compute equalization LUTs from
+    it.
+
+.. option:: -config <filename>
+
+    Apply a specified LUT to enhance the contrast of the image.
+    The number of lines in the LUT file should be equal to the number of bands
+    of the images.
+    Example of LUT file:
+
+    .. code-block::
+
+        1:Band -0.5:ScaleMin 255.5:ScaleMax 0 0 8 16 16 17 17 17 17 18 18 18 18 18 18 19 19 19 19 20 20 20 21 21 21 22 22 22 23 23 24 24 25 25 26 27 27 28 29 30 30 31 32 33 34 35 36 37 38 39 40 42 43 44 46 47 48 50 51 53 55 56 58 60 62 63 65 67 69 71 73 75 77 79 81 83 85 87 89 91 93 95 97 99 101 103 105 107 109 111 113 115 117 119 121 123 125 127 129 131 133 135 137 138 140 142 144 146 148 150 152 153 155 157 159 161 162 164 166 168 169 171 173 174 176 178 179 181 182 184 186 187 189 190 192 193 195 196 198 199 200 202 203 205 206 207 208 210 211 212 213 214 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 234 235 236 237 238 239 239 240 241 241 242 243 244 244 245 245 246 246 247 247 248 248 249 249 250 250 250 251 251 251 251 251 252 252 252 252 252 252 252 252 252 252 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 254 254 254 254 254 254 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
+        2:Band -0.5:ScaleMin 255.5:ScaleMax 0 0 8 16 16 16 17 17 17 17 17 17 17 17 17 18 18 18 18 18 18 19 19 19 19 19 20 20 20 20 21 21 22 22 23 23 24 24 25 26 27 27 28 29 30 31 32 33 34 35 36 37 38 39 41 42 43 45 46 47 49 51 52 54 55 57 59 60 62 64 66 67 69 71 73 75 77 79 81 83 85 87 89 91 93 95 97 99 101 103 105 108 110 112 114 116 118 120 122 124 126 128 130 132 134 136 138 140 142 144 146 148 150 152 154 156 157 159 161 163 165 166 168 170 172 173 175 177 179 180 182 183 185 187 188 190 191 193 194 196 197 199 200 202 203 204 206 207 208 209 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 230 231 232 233 234 235 235 236 237 238 239 239 240 241 241 242 243 243 244 245 245 246 246 247 247 248 248 248 249 249 250 250 250 250 251 251 251 251 252 252 252 252 252 252 252 252 252 252 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 254 254 254 254 254 254 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
+        3:Band -0.5:ScaleMin 255.5:ScaleMax 0 0 9 17 17 18 18 18 18 18 19 19 19 19 19 19 20 20 20 20 20 20 21 21 21 21 21 21 22 22 22 22 22 23 23 23 24 24 24 25 25 26 26 27 28 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 44 45 46 47 48 50 51 53 54 56 57 59 60 62 63 65 67 69 70 72 74 76 78 80 82 84 86 88 90 92 94 97 99 101 103 105 107 109 111 113 115 116 118 120 122 124 126 127 129 131 133 134 136 138 139 141 143 144 146 147 149 151 152 154 155 157 159 160 162 163 165 167 168 170 171 173 175 176 178 179 181 182 184 186 187 189 190 192 193 195 197 198 200 201 203 204 206 207 209 210 212 213 214 216 217 218 219 220 222 223 224 225 226 227 228 229 230 231 232 233 233 234 235 236 237 238 239 239 240 241 242 243 243 244 245 246 246 247 247 248 248 249 249 250 250 251 251 251 251 252 252 252 252 252 252 252 252 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 254 254 255 255 255 255 255 255 2550
+
+Example
+--------
+
+.. code-block::
+
+    gdalenhance -equalize rgb.tif rgb_equalize_enhance.tif
+
+Apply equalization histogram to enhance the contrast of the image.
+
+
+.. code-block::
+
+    gdalenhance -equalize rgb.tif
+
+Write an equalization LUT to the console.
+
+
+.. code-block::
+
+    gdalenhance -config enhance_config rgb.tif rgb_custom_enhance.tif
+
+Apply a custom LUT (look up-table) to enhance the contrast of the image.
diff --git a/doc/source/programs/index.rst b/doc/source/programs/index.rst
index af107ef12aa5..a6ab1e221b56 100644
--- a/doc/source/programs/index.rst
+++ b/doc/source/programs/index.rst
@@ -50,6 +50,7 @@ Raster programs
    gdalbuildvrt
    gdalcompare
    gdaldem
+   gdalenhance
    gdalinfo
    gdallocationinfo
    gdalmanage
@@ -89,6 +90,7 @@ Raster programs
     - :ref:`gdalbuildvrt`: Builds a VRT from a list of datasets.
     - :ref:`gdalcompare`: Compare two images.
     - :ref:`gdaldem`: Tools to analyze and visualize DEMs.
+    - :ref:`gdalenhance`: Enhance an image with LUT-based contrast enhancement
     - :ref:`gdalinfo`: Lists information about a raster dataset.
     - :ref:`gdallocationinfo`: Raster query tool
     - :ref:`gdalmanage`: Identify, delete, rename and copy raster data files.

From f7efedef655930982ba72da9d95d691b0989710e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 23:15:47 +0100
Subject: [PATCH 66/87] ossfuzz: update to poppler-24.10.0 [ci skip]

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

diff --git a/fuzzers/build.sh b/fuzzers/build.sh
index cb3cdc0ad49d..e60e29195217 100755
--- a/fuzzers/build.sh
+++ b/fuzzers/build.sh
@@ -147,10 +147,10 @@ curl -L https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.
 rm -rf poppler
 # Poppler git server is too unreliable. Use a snapshot of a given version
 #git clone --depth 1 https://anongit.freedesktop.org/git/poppler/poppler.git poppler
-curl -L https://poppler.freedesktop.org/poppler-24.09.0.tar.xz > poppler-24.09.0.tar.xz && \
-    tar xJf poppler-24.09.0.tar.xz && \
-    mv poppler-24.09.0 poppler && \
-    rm poppler-24.09.0.tar.xz
+curl -L https://poppler.freedesktop.org/poppler-24.10.0.tar.xz > poppler-24.10.0.tar.xz && \
+    tar xJf poppler-24.10.0.tar.xz && \
+    mv poppler-24.10.0 poppler && \
+    rm poppler-24.10.0.tar.xz
 
 # Build xerces-c from source to avoid upstream bugs
 rm -rf xerces-c

From 0c26a8870359d5d230c77109db05b6e57dd4d19e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 23:53:32 +0100
Subject: [PATCH 67/87] Doc: sponsor page: link to RFC-80 and 83

---
 doc/source/sponsors/index.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/source/sponsors/index.rst b/doc/source/sponsors/index.rst
index 8be481f461a8..0cdc1c2bdb65 100644
--- a/doc/source/sponsors/index.rst
+++ b/doc/source/sponsors/index.rst
@@ -251,6 +251,8 @@ Related resources
 
 - `Sustainable GDAL Sponsorship Prospectus`_.
 - :ref:`Sponsoring frequently asked questions (FAQ) <sponsoring-faq>`.
+- :ref:`rfc-80`
+- :ref:`rfc-83`
 
 .. Source of the PDF is at https://docs.google.com/document/d/1yhMWeI_LgEXPUkngqOitqcKfp7ov6WsS41v5ulz-kd0/edit#
 

From 6f3083d6c0b891f99e3d990aa942ee56953df89c Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 28 Oct 2024 23:53:55 +0100
Subject: [PATCH 68/87] Doc: main page: link to user survey (to be reverted
 after Nov 11th)

---
 doc/source/about_no_title.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/source/about_no_title.rst b/doc/source/about_no_title.rst
index 0f0364b0efea..c60c858cce3e 100644
--- a/doc/source/about_no_title.rst
+++ b/doc/source/about_no_title.rst
@@ -1,5 +1,13 @@
 GDAL is a translator library for raster and vector geospatial data formats that is released under an MIT style Open Source :ref:`license` by the `Open Source Geospatial Foundation`_. As a library, it presents a single raster abstract data model and single vector abstract data model to the calling application for all supported formats. It also comes with a variety of useful command line utilities for data translation and processing. The `NEWS`_ page describes the October 2024 GDAL/OGR 3.9.3 release.
 
+.. note::
+
+    The GDAL project is currently soliciting feedback to help focus
+    :ref:`GDAL Sponsorship Program <rfc-83>` activities.
+    We would highly appreciate you fill in the `survey <https://docs.google.com/forms/d/e/1FAIpQLSdMXygtDb5M0Ov0KK0u2wKkev1rMqAjRdTlwMeCl7Z1TGJTLw/viewform>`__ that  will
+    provide guidance about priorities for the program's resources (open until November 11th, 2024).
+
+
 .. only:: html
 
    |offline-download|

From f5c07f24aee5c99ef3ede6c56f0a724387599558 Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Fri, 25 Oct 2024 11:38:21 -0400
Subject: [PATCH 69/87] gdalenhance: add minimal tests

Co-authored-by: Even Rouault <even.rouault@spatialys.com>
---
 autotest/pymod/test_cli_utilities.py   |  8 +++
 autotest/utilities/test_gdalenhance.py | 90 ++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100644 autotest/utilities/test_gdalenhance.py

diff --git a/autotest/pymod/test_cli_utilities.py b/autotest/pymod/test_cli_utilities.py
index 58669d86c839..57864cab5ed0 100755
--- a/autotest/pymod/test_cli_utilities.py
+++ b/autotest/pymod/test_cli_utilities.py
@@ -208,6 +208,14 @@ def get_gdaldem_path():
 #
 
 
+def get_gdalenhance_path():
+    return get_cli_utility_path("gdalenhance")
+
+
+###############################################################################
+#
+
+
 def get_gdal_rasterize_path():
     return get_cli_utility_path("gdal_rasterize")
 
diff --git a/autotest/utilities/test_gdalenhance.py b/autotest/utilities/test_gdalenhance.py
new file mode 100644
index 000000000000..1ecfad6375ea
--- /dev/null
+++ b/autotest/utilities/test_gdalenhance.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env pytest
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Project:  GDAL/OGR Test Suite
+# Purpose:  gdalenhance testing
+# Author:   Daniel Baston <dbaston at gmail.com>
+#
+###############################################################################
+# Copyright (c) 2024, ISciences LLC
+#
+# SPDX-License-Identifier: MIT
+###############################################################################
+
+import gdaltest
+import pytest
+import test_cli_utilities
+
+from osgeo import gdal
+
+pytestmark = pytest.mark.skipif(
+    test_cli_utilities.get_gdalenhance_path() is None,
+    reason="gdalenhance not available",
+)
+
+
+@pytest.fixture()
+def gdalenhance_path():
+    return test_cli_utilities.get_gdalenhance_path()
+
+
+###############################################################################
+# Output a lookup table, then apply it to the image
+
+
+def test_gdalenhance_output_histogram(gdalenhance_path, tmp_path):
+
+    out, err = gdaltest.runexternal_out_and_err(
+        f"{gdalenhance_path} -equalize ../gcore/data/rgbsmall.tif"
+    )
+
+    assert not err
+
+    lines = out.strip().split("\n")
+    assert len(lines) == 3
+
+    assert lines[0].startswith("1:Band ")
+    assert lines[1].startswith("2:Band ")
+    assert lines[2].startswith("3:Band ")
+
+    lut_fname = tmp_path / "lut.txt"
+
+    with open(lut_fname, "w") as outfile:
+        for line in lines:
+            outfile.write(line.strip())
+            outfile.write("\n")
+
+    enhanced_fname = tmp_path / "out.tif"
+
+    out, err = gdaltest.runexternal_out_and_err(
+        f"{gdalenhance_path} -config {lut_fname} ../gcore/data/rgbsmall.tif {enhanced_fname}"
+    )
+
+    assert not err
+
+    assert enhanced_fname.exists()
+
+
+###############################################################################
+# Write a new image directly
+
+
+def test_gdalenhance_output_image(gdalenhance_path, tmp_path):
+
+    infile = "../gcore/data/rgbsmall.tif"
+    outfile = tmp_path / "out.tif"
+
+    out, err = gdaltest.runexternal_out_and_err(
+        f"{gdalenhance_path} -quiet -equalize -co COMPRESS=DEFLATE {infile} {outfile}"
+    )
+
+    assert not err
+
+    with gdal.Open(infile) as src, gdal.Open(outfile) as dst:
+        assert src.RasterCount == dst.RasterCount
+        assert src.RasterXSize == dst.RasterXSize
+        assert src.RasterYSize == dst.RasterYSize
+
+        # check that -co was honored
+        assert dst.GetMetadata("IMAGE_STRUCTURE")["COMPRESSION"] == "DEFLATE"

From a4ea665481e678e22f58c6f27f9748aa0022214c Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Mon, 28 Oct 2024 09:10:02 -0400
Subject: [PATCH 70/87] gdalenhance: return 1 if not given anything to do

---
 apps/gdalenhance.cpp                   | 19 +++++++++----------
 autotest/utilities/test_gdalenhance.py | 17 +++++++++++++++++
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/apps/gdalenhance.cpp b/apps/gdalenhance.cpp
index 95a4d3bf0d1f..d5a72fac2634 100644
--- a/apps/gdalenhance.cpp
+++ b/apps/gdalenhance.cpp
@@ -339,6 +339,13 @@ MAIN_START(argc, argv)
         }
     }
 
+    if (padfScaleMin == nullptr || padfScaleMax == nullptr)
+    {
+        fprintf(stderr, "-equalize or -config filename command line options "
+                        "must be specified.\n");
+        Usage();
+    }
+
     /* -------------------------------------------------------------------- */
     /*      If there is no destination, just report the scaling values      */
     /*      and luts.                                                       */
@@ -352,9 +359,8 @@ MAIN_START(argc, argv)
         for (iBand = 0; iBand < nBandCount; iBand++)
         {
             fprintf(fpConfig, "%d:Band ", iBand + 1);
-            if (padfScaleMin != nullptr)
-                fprintf(fpConfig, "%g:ScaleMin %g:ScaleMax ",
-                        padfScaleMin[iBand], padfScaleMax[iBand]);
+            fprintf(fpConfig, "%g:ScaleMin %g:ScaleMax ", padfScaleMin[iBand],
+                    padfScaleMax[iBand]);
 
             if (papanLUTs)
             {
@@ -372,13 +378,6 @@ MAIN_START(argc, argv)
         exit(0);
     }
 
-    if (padfScaleMin == nullptr || padfScaleMax == nullptr)
-    {
-        fprintf(stderr, "-equalize or -config filename command line options "
-                        "must be specified.\n");
-        exit(1);
-    }
-
     /* ==================================================================== */
     /*      Create a virtual dataset.                                       */
     /* ==================================================================== */
diff --git a/autotest/utilities/test_gdalenhance.py b/autotest/utilities/test_gdalenhance.py
index 1ecfad6375ea..8e5a35d1f57f 100644
--- a/autotest/utilities/test_gdalenhance.py
+++ b/autotest/utilities/test_gdalenhance.py
@@ -88,3 +88,20 @@ def test_gdalenhance_output_image(gdalenhance_path, tmp_path):
 
         # check that -co was honored
         assert dst.GetMetadata("IMAGE_STRUCTURE")["COMPRESSION"] == "DEFLATE"
+
+
+###############################################################################
+# Usage printed with invalid arguments
+
+
+def test_gdalenhance_invalid_usage(gdalenhance_path, tmp_path):
+
+    infile = "../gcore/data/rgbsmall.tif"
+    outfile = tmp_path / "out.tif"
+
+    out, err = gdaltest.runexternal_out_and_err(
+        f"{gdalenhance_path} {infile} {outfile}"
+    )
+
+    assert "ret code = 1" in err
+    assert "Usage" in out

From 784ba1c49b275e29eb9e054cda5c2453a827f36a Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Mon, 28 Oct 2024 09:13:26 -0400
Subject: [PATCH 71/87] autotest gdalenhance: use -quiet

---
 autotest/utilities/test_gdalenhance.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/autotest/utilities/test_gdalenhance.py b/autotest/utilities/test_gdalenhance.py
index 8e5a35d1f57f..c31ada4e6558 100644
--- a/autotest/utilities/test_gdalenhance.py
+++ b/autotest/utilities/test_gdalenhance.py
@@ -36,7 +36,7 @@ def gdalenhance_path():
 def test_gdalenhance_output_histogram(gdalenhance_path, tmp_path):
 
     out, err = gdaltest.runexternal_out_and_err(
-        f"{gdalenhance_path} -equalize ../gcore/data/rgbsmall.tif"
+        f"{gdalenhance_path} -quiet -equalize ../gcore/data/rgbsmall.tif"
     )
 
     assert not err
@@ -58,7 +58,7 @@ def test_gdalenhance_output_histogram(gdalenhance_path, tmp_path):
     enhanced_fname = tmp_path / "out.tif"
 
     out, err = gdaltest.runexternal_out_and_err(
-        f"{gdalenhance_path} -config {lut_fname} ../gcore/data/rgbsmall.tif {enhanced_fname}"
+        f"{gdalenhance_path} -quiet -config {lut_fname} ../gcore/data/rgbsmall.tif {enhanced_fname}"
     )
 
     assert not err
@@ -100,7 +100,7 @@ def test_gdalenhance_invalid_usage(gdalenhance_path, tmp_path):
     outfile = tmp_path / "out.tif"
 
     out, err = gdaltest.runexternal_out_and_err(
-        f"{gdalenhance_path} {infile} {outfile}"
+        f"{gdalenhance_path} -quiet {infile} {outfile}"
     )
 
     assert "ret code = 1" in err

From 81a7b1a4ef2f0d52c60be57eaf0572638d49a3e7 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 29 Oct 2024 00:49:39 +0100
Subject: [PATCH 72/87] NEWS.md: update [ci skip]

---
 NEWS.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/NEWS.md b/NEWS.md
index 8e5e079c06a5..4cb6db444f56 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -217,6 +217,8 @@ GTiff driver:
  * use main dataset GetSiblingFiles() for overviews
  * SRS writer: do not use EPSG:4326 if angular unit is not degree
  * make driver optional (but must be explicitly disabled)
+ * tif_jxl: writer: propagate DISTANCE/QUALITY setting to extra channel
+ * fix memory leak when trying to open COG in update mode
  * Internal libtiff: resync with upstream
 
 HEIF driver:
@@ -435,6 +437,7 @@ Zarr driver:
   when possible
 * Add OGRWKBTransform() for in-place coordinate transformation of WKB geometries
 * OGR_GreatCircle_ API: do not hardcode Earth radius
+* ogr_core.h: suppress warning when building with -Wpedantic for C < 23 (#2322)
 
 ### OGRSpatialReference
 
@@ -442,6 +445,8 @@ Zarr driver:
   expected axis order
 * OGRSpatialReference::EPSGTreatsAsLatLong()/EPSGTreatsAsNorthingEasting():
   remove the check on the EPSG authority
+* Add OSRGetAuthorityListFromDatabase() to get the list of CRS authorities used
+  in the PROJ database.
 
 ### Utilities
 
@@ -470,6 +475,7 @@ Arrow ecosystem:
  * Arrow/Parquet/generic arrow: add write support for arrow.json extension
  * Add a Arrow VSI file system (for libarrow >= 16.0) allowing to use GDAL
    VSI file systems as libarrow compatible file systems.
+ * Add (minimum) support for libarrow 18.0.0
 
 Arrow driver
  * add read support for StringView and BinaryView (but not in OGR generic Arrow
@@ -521,6 +527,7 @@ GPKG driver:
  * prevent from creating field with same name, or with the name of the geometry
    field
  * CreateField(): check we are not reaching the max number of fields
+ * SQLite/GPKG: turn on SQLite 'PRAGMA secure_delete=1' by default
 
 HANA driver:
  * Add support for REAL_VECTOR type (#10499)
@@ -607,6 +614,7 @@ WFS driver:
 ## SWIG bindings
 
 * Python/Java: replace sprintf() with snprintf() to avoid warnings on OSX
+* fix memleak in gdal.GetConfigOptions()
 
 ### Python bindings
 
@@ -623,6 +631,8 @@ WFS driver:
 * make MDArray.Write(array_of_strings) work with a 0-d string variable
 * Avoid linear scan in gdal_array.NumericTypeCodeToGDALTypeCode (#10694)
 * Dataset.Close(): invalidate children before closing dataset
+* __init__.py: remove calls to warnings.simplefilter() (#11140)
+* fix compatibility issue with SWIG 4.3.0 and PYTHONWARNINGS=error
 
 ### Java bindings
 

From 3df2f4dd34ffaf3498f46a492cf4011e07fdb753 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 18 Oct 2024 01:26:11 +0200
Subject: [PATCH 73/87] test_gdalmove.py: avoid random failure on ASAN CI
 config

---
 autotest/pyscripts/test_gdalmove.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/autotest/pyscripts/test_gdalmove.py b/autotest/pyscripts/test_gdalmove.py
index b8e65a63de1f..84080916d47f 100755
--- a/autotest/pyscripts/test_gdalmove.py
+++ b/autotest/pyscripts/test_gdalmove.py
@@ -14,6 +14,7 @@
 
 import shutil
 
+import gdaltest
 import pytest
 import test_py_scripts
 
@@ -36,6 +37,9 @@ def script_path():
 
 def test_gdalmove_help(script_path):
 
+    if gdaltest.is_travis_branch("sanitize"):
+        pytest.skip("fails on sanitize for unknown reason")
+
     assert "ERROR" not in test_py_scripts.run_py_script(
         script_path, "gdalmove", "--help"
     )
@@ -47,6 +51,9 @@ def test_gdalmove_help(script_path):
 
 def test_gdalmove_version(script_path):
 
+    if gdaltest.is_travis_branch("sanitize"):
+        pytest.skip("fails on sanitize for unknown reason")
+
     assert "ERROR" not in test_py_scripts.run_py_script(
         script_path, "gdalmove", "--version"
     )

From 7f18fd640271c36f09a6809d8929464e33559964 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 15 Oct 2024 15:42:44 +0200
Subject: [PATCH 74/87] Add OGRDuplicateCharacter()

---
 ogr/ogr_p.h      |  9 +++++++++
 ogr/ogrutils.cpp | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/ogr/ogr_p.h b/ogr/ogr_p.h
index aab1b8a3be9c..4ee69813e414 100644
--- a/ogr/ogr_p.h
+++ b/ogr/ogr_p.h
@@ -321,4 +321,13 @@ inline void OGRRoundCoordinatesIEEE754(int nBitsPrecision, GByte *pabyBase,
     }
 }
 
+/* -------------------------------------------------------------------- */
+/*      helper functions for string escaping.                           */
+/* -------------------------------------------------------------------- */
+
+/** Replace all occurences of ch by it repeated twice.
+ * Typically used for SQL string literal or identifier escaping.
+ */
+std::string CPL_DLL OGRDuplicateCharacter(const std::string &osStr, char ch);
+
 #endif /* ndef OGR_P_H_INCLUDED */
diff --git a/ogr/ogrutils.cpp b/ogr/ogrutils.cpp
index 78eb4e859c92..738ab3240bf7 100644
--- a/ogr/ogrutils.cpp
+++ b/ogr/ogrutils.cpp
@@ -2326,3 +2326,13 @@ int OGR_GET_MS(float fSec)
     const float fValue = (fSec - static_cast<int>(fSec)) * 1000 + 0.5f;
     return static_cast<int>(fValue);
 }
+
+/************************************************************************/
+/*                    OGRDuplicateCharacter()                           */
+/************************************************************************/
+
+std::string OGRDuplicateCharacter(const std::string &osStr, char ch)
+{
+    char aszReplacement[] = {ch, ch, 0};
+    return CPLString(osStr).replaceAll(ch, aszReplacement);
+}

From 400e0202849ab89fc5ff7cf02ff4048db6eacfef Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Mon, 14 Oct 2024 13:04:03 +0200
Subject: [PATCH 75/87] Add read-only OGR ADBC (Arrow Database Connectivity)
 driver

Cf https://arrow.apache.org/adbc/current/index.html for what ADBC is.

Depends on the adbc-driver-manager library.

The driver is read-only, and there is no support for spatial data currently.

Beyond official ADBC drivers (adbc-driver-sqlite,
adbc-driver-postgresql, adbc-driver-snowflake, adbc-driver-bigquery,
etc.), it can also be used to read Parquet or DuckDB datasets using libduckdb, if
libduckdb is installed and can be loaded through dynamic shared library opening.
---
 .github/workflows/ubuntu_24.04/Dockerfile.ci  |  20 +
 .../ubuntu_24.04/expected_ogrinfo_formats.txt |   1 +
 apps/test_ogrsf.cpp                           |   8 +-
 autotest/ogr/data/duckdb/poly.duckdb          | Bin 0 -> 536576 bytes
 autotest/ogr/ogr_adbc.py                      | 339 ++++++++++++
 ci/travis/conda/libgdal-adbc.patch            |  78 +++
 ci/travis/conda/setup.sh                      |   2 +
 cmake/helpers/CheckDependentLibraries.cmake   |   2 +
 doc/source/drivers/vector/adbc.rst            | 111 ++++
 doc/source/drivers/vector/index.rst           |   1 +
 doc/source/spelling_wordlist.txt              |   1 +
 docker/ubuntu-full/Dockerfile                 |  43 ++
 frmts/drivers.ini                             |   1 +
 frmts/gdalallregister.cpp                     |   3 +
 ogr/ogrsf_frmts/CMakeLists.txt                |   1 +
 ogr/ogrsf_frmts/adbc/CMakeLists.txt           |  20 +
 ogr/ogrsf_frmts/adbc/ogr_adbc.h               | 210 +++++++
 ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp       | 512 ++++++++++++++++++
 ogr/ogrsf_frmts/adbc/ogradbcdriver.cpp        |  46 ++
 ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp    | 115 ++++
 ogr/ogrsf_frmts/adbc/ogradbcdrivercore.h      |  34 ++
 ogr/ogrsf_frmts/adbc/ogradbclayer.cpp         | 256 +++++++++
 ogr/ogrsf_frmts/generic/ogrlayerarrow.h       |   2 +
 ogr/ogrsf_frmts/generic/ogrregisterall.cpp    |   3 +
 ogr/ogrsf_frmts/ogrsf_frmts.h                 |   2 +
 25 files changed, 1807 insertions(+), 4 deletions(-)
 create mode 100644 autotest/ogr/data/duckdb/poly.duckdb
 create mode 100755 autotest/ogr/ogr_adbc.py
 create mode 100644 ci/travis/conda/libgdal-adbc.patch
 create mode 100644 doc/source/drivers/vector/adbc.rst
 create mode 100644 ogr/ogrsf_frmts/adbc/CMakeLists.txt
 create mode 100644 ogr/ogrsf_frmts/adbc/ogr_adbc.h
 create mode 100644 ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp
 create mode 100644 ogr/ogrsf_frmts/adbc/ogradbcdriver.cpp
 create mode 100644 ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp
 create mode 100644 ogr/ogrsf_frmts/adbc/ogradbcdrivercore.h
 create mode 100644 ogr/ogrsf_frmts/adbc/ogradbclayer.cpp

diff --git a/.github/workflows/ubuntu_24.04/Dockerfile.ci b/.github/workflows/ubuntu_24.04/Dockerfile.ci
index 1a61c3290304..771f18c983d4 100644
--- a/.github/workflows/ubuntu_24.04/Dockerfile.ci
+++ b/.github/workflows/ubuntu_24.04/Dockerfile.ci
@@ -160,3 +160,23 @@ RUN apt-get install -y --allow-unauthenticated libudunits2-0 libudunits2-data
 RUN python3 -m pip install --break-system-packages cfchecker
 
 RUN python3 -m pip install --break-system-packages fsspec
+
+# Manually install ADBC packages from Ubuntu 22.04 as there are no 24.04 packages at time of writing.
+RUN curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-manager102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-manager-dev_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-sqlite102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-sqlite-dev_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-snowflake102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-snowflake-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-manager102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-manager-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-sqlite102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-sqlite-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-snowflake102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-snowflake-dev_14-1_amd64.deb
+
+# Install libduckdb
+RUN curl -LO -fsS https://github.com/duckdb/duckdb/releases/download/v1.1.2/libduckdb-linux-amd64.zip \
+    && unzip libduckdb-linux-amd64.zip libduckdb.so \
+    && mv libduckdb.so /usr/lib/x86_64-linux-gnu \
+    && rm -f libduckdb-linux-amd64.zip
diff --git a/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt b/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
index b365a54281a2..5ad73e12cb5b 100644
--- a/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
+++ b/.github/workflows/ubuntu_24.04/expected_ogrinfo_formats.txt
@@ -82,6 +82,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   JSONFG -vector- (rw+v): OGC Features and Geometries JSON (*.json)
   MiraMonVector -vector- (rw+v): MiraMon Vectors (.pol, .arc, .pnt) (*.pol, *.arc, *.pnt)
   XODR -vector- (ro): OpenDRIVE - Open Dynamic Road Information for Vehicle Environment (*.xodr)
+  ADBC -vector- (ro): Arrow Database Connectivity
   TIGER -vector- (rov): U.S. Census TIGER/Line
   AVCBin -vector- (rov): Arc/Info Binary Coverage
   AVCE00 -vector- (rov): Arc/Info E00 (ASCII) Coverage (*.e00)
diff --git a/apps/test_ogrsf.cpp b/apps/test_ogrsf.cpp
index 4ead11298eb2..0b4e72b6e9d4 100644
--- a/apps/test_ogrsf.cpp
+++ b/apps/test_ogrsf.cpp
@@ -1655,6 +1655,7 @@ static int TestOGRLayerFeatureCount(GDALDataset *poDS, OGRLayer *poLayer,
     }
     delete poFeat;
 
+    const auto nFCEndOfIter = LOG_ACTION(poLayer->GetFeatureCount());
     if (nFC != nClaimedFC)
     {
         bRet = FALSE;
@@ -1662,12 +1663,12 @@ static int TestOGRLayerFeatureCount(GDALDataset *poDS, OGRLayer *poLayer,
                " doesn't match actual, " CPL_FRMT_GIB ".\n",
                nClaimedFC, nFC);
     }
-    else if (nFC != LOG_ACTION(poLayer->GetFeatureCount()))
+    else if (nFC != nFCEndOfIter)
     {
         bRet = FALSE;
         printf("ERROR: Feature count at end of layer, " CPL_FRMT_GIB
                ", differs from at start, " CPL_FRMT_GIB ".\n",
-               poLayer->GetFeatureCount(), nFC);
+               nFCEndOfIter, nFC);
     }
     else if (bVerbose)
         printf("INFO: Feature count verified.\n");
@@ -4187,8 +4188,7 @@ static int TestLayerGetArrowStream(OGRLayer *poLayer)
         {
             if (array.length != 0)
             {
-                bRet = false;
-                printf("ERROR: get_next() return an array with length != 0 "
+                printf("WARNING: get_next() return an array with length != 0 "
                        "after end of iteration\n");
             }
             if (array.release)
diff --git a/autotest/ogr/data/duckdb/poly.duckdb b/autotest/ogr/data/duckdb/poly.duckdb
new file mode 100644
index 0000000000000000000000000000000000000000..71322dc9c3282986a22dfdf9c943ecf968a12974
GIT binary patch
literal 536576
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
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+
z009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
z0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZ
zfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&U
JAn^JL{6DUq*Q@{l

literal 0
HcmV?d00001

diff --git a/autotest/ogr/ogr_adbc.py b/autotest/ogr/ogr_adbc.py
new file mode 100755
index 000000000000..5148ada0702e
--- /dev/null
+++ b/autotest/ogr/ogr_adbc.py
@@ -0,0 +1,339 @@
+#!/usr/bin/env pytest
+###############################################################################
+# $Id$
+#
+# Project:  GDAL/OGR Test Suite
+# Purpose:  Test read functionality for OGR ADBC driver.
+# Author:   Even Rouault <even dot rouault at spatialys.com>
+#
+###############################################################################
+# Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+#
+# SPDX-License-Identifier: MIT
+###############################################################################
+
+import gdaltest
+import pytest
+
+from osgeo import gdal, ogr
+
+pytestmark = pytest.mark.require_driver("ADBC")
+
+###############################################################################
+
+
+def _has_sqlite_driver():
+    import ctypes
+
+    try:
+        return ctypes.cdll.LoadLibrary("libadbc_driver_sqlite.so") is not None
+    except Exception:
+        return False
+
+
+###############################################################################
+
+
+def test_ogr_adbc_driver_open_option():
+
+    if not _has_sqlite_driver():
+        pytest.skip("adbc_driver_sqlite missing")
+
+    with gdal.OpenEx(
+        "ADBC:", gdal.OF_VECTOR, open_options=["ADBC_DRIVER=adbc_driver_sqlite"]
+    ) as ds:
+        assert ds.GetLayerCount() == 0
+        with ds.ExecuteSQL("SELECT sqlite_version()") as sql_lyr:
+            f = sql_lyr.GetNextFeature()
+            assert f
+            assert f.GetField(0).startswith("3.")
+
+
+###############################################################################
+
+
+def test_ogr_adbc_invalid_driver():
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(
+            "ADBC:", gdal.OF_VECTOR, open_options=["ADBC_DRIVER=invalid_driver"]
+        )
+
+
+###############################################################################
+
+
+def test_ogr_adbc_invalid_dataset():
+
+    if not _has_sqlite_driver():
+        pytest.skip("adbc_driver_sqlite missing")
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(
+            "ADBC:/i/do/not/exist.db",
+            gdal.OF_VECTOR,
+            open_options=["ADBC_DRIVER=adbc_driver_sqlite"],
+        )
+
+
+###############################################################################
+
+
+def test_ogr_adbc_sqlite3():
+
+    if not _has_sqlite_driver():
+        pytest.skip("adbc_driver_sqlite missing")
+
+    with gdal.OpenEx(
+        "data/sqlite/poly_spatialite.sqlite", gdal.OF_VECTOR, allowed_drivers=["ADBC"]
+    ) as ds:
+        assert ds.GetLayerCount() == 13
+        assert ds.GetLayer(-1) is None
+        assert ds.GetLayer(ds.GetLayerCount()) is None
+        lyr = ds.GetLayer(0)
+        assert lyr.TestCapability(ogr.OLCFastGetArrowStream)
+
+
+###############################################################################
+
+
+def test_ogr_adbc_sql_open_option():
+
+    if not _has_sqlite_driver():
+        pytest.skip("adbc_driver_sqlite missing")
+
+    with gdal.OpenEx(
+        "ADBC:data/sqlite/poly_spatialite.sqlite",
+        gdal.OF_VECTOR,
+        open_options=["SQL=SELECT * FROM poly"],
+    ) as ds:
+        assert ds.GetLayerCount() == 1
+        lyr = ds.GetLayer(0)
+        assert lyr.GetFeatureCount() == 10
+
+
+###############################################################################
+
+
+def test_ogr_adbc_invalid_sql():
+
+    if not _has_sqlite_driver():
+        pytest.skip("adbc_driver_sqlite missing")
+
+    with pytest.raises(Exception):
+        gdal.OpenEx(
+            "ADBC:data/sqlite/poly_spatialite.sqlite",
+            gdal.OF_VECTOR,
+            open_options=["SQL=SELECT * FROM"],
+        )
+
+
+###############################################################################
+
+
+def test_ogr_adbc_generic_open_option():
+
+    if not _has_sqlite_driver():
+        pytest.skip("adbc_driver_sqlite missing")
+
+    with gdal.OpenEx(
+        "ADBC:",
+        gdal.OF_VECTOR,
+        open_options=[
+            "ADBC_DRIVER=adbc_driver_sqlite",
+            "ADBC_OPTION_uri=data/sqlite/poly_spatialite.sqlite",
+        ],
+    ) as ds:
+        assert ds.GetLayerCount() == 13
+
+
+###############################################################################
+
+
+def test_ogr_adbc_execute_sql():
+
+    if not _has_sqlite_driver():
+        pytest.skip("adbc_driver_sqlite missing")
+
+    with gdal.OpenEx(
+        "data/sqlite/poly_spatialite.sqlite",
+        gdal.OF_VECTOR,
+        open_options=["SQL="],
+        allowed_drivers=["ADBC"],
+    ) as ds:
+        assert ds.GetLayerCount() == 0
+        with ds.ExecuteSQL("SELECT * FROM poly") as lyr:
+            assert lyr.GetFeatureCount() == 10
+
+
+###############################################################################
+
+
+def _has_libduckdb():
+    import ctypes
+
+    try:
+        return ctypes.cdll.LoadLibrary("libduckdb.so") is not None
+    except Exception:
+        return False
+
+
+###############################################################################
+
+
+def test_ogr_adbc_duckdb_parquet():
+
+    if not _has_libduckdb():
+        pytest.skip("libduckdb.so missing")
+
+    with gdal.OpenEx(
+        "data/parquet/partitioned_flat/part.0.parquet",
+        gdal.OF_VECTOR,
+        allowed_drivers=["ADBC"],
+    ) as ds:
+        assert ds.GetLayerCount() == 1
+        lyr = ds.GetLayer(0)
+        assert lyr.TestCapability(ogr.OLCFastFeatureCount)
+        assert lyr.GetFeatureCount() == 3
+
+
+###############################################################################
+
+
+def test_ogr_adbc_duckdb_parquet_with_sql_open_option():
+
+    if not _has_libduckdb():
+        pytest.skip("libduckdb.so missing")
+
+    with gdal.OpenEx(
+        "data/parquet/partitioned_flat/part.0.parquet",
+        gdal.OF_VECTOR,
+        allowed_drivers=["ADBC"],
+        open_options=["SQL=SELECT * FROM part.0 ORDER BY one DESC LIMIT 2"],
+    ) as ds:
+        assert ds.GetLayerCount() == 1
+        lyr = ds.GetLayer(0)
+        assert lyr.TestCapability(ogr.OLCFastFeatureCount) == 0
+        assert lyr.GetFeatureCount() == 2
+
+
+###############################################################################
+# Run test_ogrsf on a SQLite3 database
+
+
+def test_ogr_adbc_test_ogrsf_sqlite3():
+
+    if not _has_sqlite_driver():
+        pytest.skip("adbc_driver_sqlite missing")
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path()
+        + " -ro ADBC:data/sqlite/first_geometry_null.db"
+    )
+
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+
+
+###############################################################################
+# Run test_ogrsf on a single Parquet file
+
+
+def test_ogr_adbc_test_ogrsf_parquet():
+
+    if not _has_libduckdb():
+        pytest.skip("libduckdb.so missing")
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path()
+        + " -ro ADBC:data/parquet/partitioned_flat/part.0.parquet"
+    )
+
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+
+
+###############################################################################
+# Run test_ogrsf on a partitioned Parquet dataset
+
+
+def test_ogr_adbc_test_ogrsf_parquet_filename_with_glob():
+
+    if not _has_libduckdb():
+        pytest.skip("libduckdb.so missing")
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path()
+        + " -ro ADBC:data/parquet/partitioned_flat/*.parquet"
+    )
+
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+
+
+###############################################################################
+# Run test_ogrsf on a DuckDB dataset
+
+
+def test_ogr_adbc_test_ogrsf_duckdb():
+
+    if not _has_libduckdb():
+        pytest.skip("libduckdb.so missing")
+
+    import test_cli_utilities
+
+    if test_cli_utilities.get_test_ogrsf_path() is None:
+        pytest.skip()
+
+    ret = gdaltest.runexternal(
+        test_cli_utilities.get_test_ogrsf_path() + " -ro ADBC:data/duckdb/poly.duckdb"
+    )
+
+    assert "INFO" in ret
+    assert "ERROR" not in ret
+
+
+###############################################################################
+
+
+def test_ogr_adbc_layer_list():
+
+    if not _has_sqlite_driver():
+        pytest.skip("adbc_driver_sqlite missing")
+
+    with gdal.OpenEx(
+        "data/sqlite/poly_spatialite.sqlite", gdal.OF_VECTOR, allowed_drivers=["ADBC"]
+    ) as ds:
+        assert ds.GetLayerCount() == 13
+        assert ds.GetLayerByName("table_list")
+        assert ds.GetLayerCount() == 14
+        # Re-issue GetLayerByName() to check it has been added to the list
+        # of known layers and is no instantiated twice.
+        lyr = ds.GetLayerByName("table_list")
+        assert lyr
+        assert ds.GetLayerCount() == 14
+        assert lyr.GetFeatureCount() == 14
+        found = False
+        for f in lyr:
+            if (
+                f["catalog_name"] == "main"
+                and f["table_name"] == "spatial_ref_sys"
+                and f["table_type"] == "table"
+            ):
+                found = True
+        assert found
diff --git a/ci/travis/conda/libgdal-adbc.patch b/ci/travis/conda/libgdal-adbc.patch
new file mode 100644
index 000000000000..23f5daac0ca4
--- /dev/null
+++ b/ci/travis/conda/libgdal-adbc.patch
@@ -0,0 +1,78 @@
+diff --git a/recipe/build.sh b/recipe/build.sh
+index b5329fd..8bfa9ef 100644
+--- a/recipe/build.sh
++++ b/recipe/build.sh
+@@ -48,6 +48,7 @@ cmake -G "Unix Makefiles" \
+       -DGDAL_ENABLE_DRIVER_NETCDF=OFF \
+       -DGDAL_ENABLE_DRIVER_HDF4=OFF \
+       -DGDAL_ENABLE_DRIVER_HDF5=OFF \
++      -DOGR_ENABLE_DRIVER_ADBC=OFF \
+       -DOGR_REGISTER_DRIVER_ARROW_FOR_LATER_PLUGIN=ON \
+       -DOGR_REGISTER_DRIVER_PARQUET_FOR_LATER_PLUGIN=ON \
+       -DGDAL_REGISTER_DRIVER_JP2OPENJPEG_FOR_LATER_PLUGIN=ON \
+@@ -62,6 +63,7 @@ cmake -G "Unix Makefiles" \
+       -DGDAL_REGISTER_DRIVER_NETCDF_FOR_LATER_PLUGIN=ON \
+       -DGDAL_REGISTER_DRIVER_HDF4_FOR_LATER_PLUGIN=ON \
+       -DGDAL_REGISTER_DRIVER_HDF5_FOR_LATER_PLUGIN=ON \
++      -DOGR_REGISTER_DRIVER_ADBC_FOR_LATER_PLUGIN=ON \
+       -DOGR_DRIVER_ARROW_PLUGIN_INSTALLATION_MESSAGE="You may install it with 'conda install -c conda-forge libgdal-arrow-parquet'" \
+       -DOGR_DRIVER_PARQUET_PLUGIN_INSTALLATION_MESSAGE="You may install it with 'conda install -c conda-forge libgdal-arrow-parquet'" \
+       -DGDAL_DRIVER_JP2OPENJPEG_PLUGIN_INSTALLATION_MESSAGE="You may install it with 'conda install -c conda-forge libgdal-jp2openjpeg'" \
+@@ -77,6 +79,7 @@ cmake -G "Unix Makefiles" \
+       -DGDAL_DRIVER_HDF4_PLUGIN_INSTALLATION_MESSAGE="You may install it with 'conda install -c conda-forge libgdal-hdf4'" \
+       -DGDAL_DRIVER_HDF5_PLUGIN_INSTALLATION_MESSAGE="You may install it with 'conda install -c conda-forge libgdal-hdf5'" \
+       -DGDAL_ENABLE_HDF5_GLOBAL_LOCK:BOOL=ON \
++      -DOGR_DRIVER_ADBC_PLUGIN_INSTALLATION_MESSAGE="You may install it with 'conda install -c conda-forge libgdal-adbc'" \
+       -DBUILD_PYTHON_BINDINGS:BOOL=OFF \
+       -DBUILD_JAVA_BINDINGS:BOOL=OFF \
+       -DBUILD_CSHARP_BINDINGS:BOOL=OFF \
+diff --git a/recipe/meta.yaml b/recipe/meta.yaml
+index 067eacd..12aab43 100644
+--- a/recipe/meta.yaml
++++ b/recipe/meta.yaml
+@@ -580,6 +580,45 @@ outputs:
+       license: MIT
+       license_file: LICENSE.TXT
+ 
++  - name: libgdal-adbc
++    script: build_plugin.sh  # [unix]
++    script: build_plugin.bat  # [win]
++    build:
++      # FIXME: libadbc-driver-manager is not available currently on Windows
++      skip: true  # [win]
++      ignore_run_exports_from:
++        - expat
++      script_env:
++        - GDAL_PLUGIN_NAME=ADBC
++        - GDAL_PLUGIN_TYPE=ogr
++        - GDAL_PLUGIN_DEPS=-DGDAL_USE_ADBCDRIVERMANAGER=ON
++    requirements:
++      build:
++        - cmake
++        - {{ compiler('c') }}
++        - {{ stdlib("c") }}
++        - {{ compiler('cxx') }}
++        - pkg-config  # [not win]
++        - make  # [unix]
++        - ninja  # [win]
++      host:
++        - {{ pin_subpackage('libgdal-core', exact=True) }}
++        - libkml-devel
++        - expat
++        - libadbc-driver-manager
++      run:
++        - libgdal-core >={{ ".".join(version.split(".")[:2]) }}
++    test:
++      commands:
++        - test -f ${PREFIX}/lib/gdalplugins/${GDAL_PLUGIN_TYPE}_${GDAL_PLUGIN_NAME}${SHLIB_EXT}      # [unix]
++        - if not exist %LIBRARY_LIB%\gdalplugins\%GDAL_PLUGIN_TYPE%_%GDAL_PLUGIN_NAME%.dll exit 1    # [win]
++        - ogrinfo --format ${GDAL_PLUGIN_NAME}  # [unix]
++        - ogrinfo --format %GDAL_PLUGIN_NAME%   # [win]
++    about:
++      summary: Vector driver ADBC for the Geospatial Data Abstraction Library (GDAL)
++      license: MIT
++      license_file: LICENSE.TXT
++
+   - name: libgdal
+     build:
+       run_exports:
diff --git a/ci/travis/conda/setup.sh b/ci/travis/conda/setup.sh
index 15dcff7011f5..eb08b2531a5c 100755
--- a/ci/travis/conda/setup.sh
+++ b/ci/travis/conda/setup.sh
@@ -19,6 +19,8 @@ git clone  https://github.com/conda-forge/gdal-feedstock.git
 
 cd gdal-feedstock
 
+patch -p1 < ../ci/travis/conda/libgdal-adbc.patch
+
 cat > recipe/recipe_clobber.yaml <<EOL
 source:
   path: ../../../gdal
diff --git a/cmake/helpers/CheckDependentLibraries.cmake b/cmake/helpers/CheckDependentLibraries.cmake
index 536c91cf0ae3..21c9d5d7fad9 100644
--- a/cmake/helpers/CheckDependentLibraries.cmake
+++ b/cmake/helpers/CheckDependentLibraries.cmake
@@ -495,6 +495,8 @@ include(CheckDependentLibrariesArrowParquet)
 
 gdal_check_package(OpenDrive "Enable libOpenDRIVE" CONFIG CAN_DISABLE)
 
+gdal_check_package(AdbcDriverManager "Enable ADBC" CONFIG CAN_DISABLE)
+
 # bindings
 
 # finding python in top of project because of common for autotest and bindings
diff --git a/doc/source/drivers/vector/adbc.rst b/doc/source/drivers/vector/adbc.rst
new file mode 100644
index 000000000000..4287995608db
--- /dev/null
+++ b/doc/source/drivers/vector/adbc.rst
@@ -0,0 +1,111 @@
+.. _vector.adbc:
+
+ADBC -- Arrow Database Connectivity
+===================================
+
+.. versionadded:: 3.11
+
+.. shortname:: ADBC
+
+.. build_dependencies:: adbc-driver-manager
+
+ADBC is a set of APIs and libraries for Arrow-native access to database. This
+driver uses the ``adbc-driver-manager`` library to connect to available ADBC
+drivers, and expose content as classic OGR features, or as a ArrowArrayStream.
+
+Consult the `installation instruction <https://arrow.apache.org/adbc/current/driver/installation.html>`__
+for the various ADBC drivers. At time of writing, there are drivers for
+SQLite3, PostgreSQL, Snowflake, BigQuery, DuckDB, Flight SQL, etc.
+
+The driver is read-only, and there is no support for spatial data currently.
+
+Connection string
+-----------------
+
+Several connection strings are supported:
+
+- ``ADBC:{some_uri}``, together with the ``ADBC_DRIVER`` open option.
+- a SQLite3 database filename, if the ``adbc_driver_sqlite`` is available.
+- a DuckDB database filename, if the :file:`libduckdb.so`, :file:`libduckdb.dylib`
+  or :file:`duckdb.dll` is available (and it is in a system location, or can be
+  located through LD_LIBRARY_PATH on Linux, DYLD_LIBRARY_PATH on MacOSX or PATH on Windows).
+- a Parquet database filename, if the :file:`libduckdb.so`, :file:`libduckdb.dylib`
+  or :file:`duckdb.dll` is available (and it is in a system location, or can be
+  located through LD_LIBRARY_PATH on Linux, DYLD_LIBRARY_PATH on MacOSX or PATH on Windows).
+- a PostgreSQL URI starting with ``postgresql://``, if the ``adbc_driver_postgresql`` is available.
+
+Note: if present, the :ref:`vector.sqlite`, :ref:`vector.gpkg` or
+:ref:`vector.parquet` drivers are registered before the ADBC driver, so they will
+be used in priority when available. The ``ADBC:`` prefix or the ``-if ADBC``
+switch of :program:`ogrinfo` or :program:`ogr2ogr` can be used to use the ADBC
+driver instead.
+
+Dataset open options
+--------------------
+
+|about-open-options|
+The following open options are supported:
+
+-  .. oo:: ADBC_DRIVER
+      :choices: <string>
+
+      ADBC driver name. Examples: ``adbc_driver_sqlite``, ``adbc_driver_postgresql``,
+      ``adbc_driver_bigquery``, ``adbc_driver_snowflake`` or a path to the
+      DuckDB shared library.
+
+- .. oo:: SQL
+      :choices: <string>
+
+      A SQL-like statement recognized by the driver, used to create a result
+      layer from the dataset.
+
+- .. oo:: ADBC_OPTION_xxx
+      :choices: <string>
+
+      Custom ADBC option to pass to AdbcDatabaseSetOption(). Options are
+      driver specific.
+      For example ``ADBC_OPTION_uri=some_value`` to pass the ``uri`` option.
+
+"table_list" special layer
+--------------------------
+
+For PostgreSQL, SQLite3, DuckDB and Parquet datasets, the driver automatically
+instantiates OGR layers from available tables.
+For other databases, the user must explicit provide a SQL open option or issue
+a :cpp:func:`GDALDataset::ExecuteSQL` request.
+To facilitate that process, a special OGR ``table_list`` layer can be queried
+through :cpp:func:`GDALDataset::GetLayerByName` (or as the layer name with
+:program:`ogrinfo`).
+It returns for each table a OGR feature with the following fields (some
+potentially unset or with an empty string): ``catalog_name``, ``schema_name``,
+``table_name``, ``table_type``.
+
+Examples
+--------
+
+- Assuming :file:`libduckdb.so`, :file:`libduckdb.dylib` or :file:`duckdb.dll`
+  is available (and it is in a system location, or can be located through
+  LD_LIBRARY_PATH on Linux, DYLD_LIBRARY_PATH on MacOSX or PATH on Windows).
+
+  Convert a Parquet file to GeoPackage:
+
+  ::
+
+      ogr2ogr out.gpkg in.parquet
+
+
+- Assuming :file:`libduckdb.so`, :file:`libduckdb.dylib` or :file:`duckdb.dll`
+  is available (and it is in a system location, or can be located through
+  LD_LIBRARY_PATH on Linux, DYLD_LIBRARY_PATH on MacOSX or PATH on Windows).
+
+  Convert a DuckDB database to GeoPackage:
+
+  ::
+
+      ogr2ogr out.gpkg in.duckdb
+
+
+See Also
+--------
+
+`ADBC: Arrow Database Connectivity <https://arrow.apache.org/adbc/current/index.html>`__
diff --git a/doc/source/drivers/vector/index.rst b/doc/source/drivers/vector/index.rst
index 0ac42608c26a..859bba292217 100644
--- a/doc/source/drivers/vector/index.rst
+++ b/doc/source/drivers/vector/index.rst
@@ -22,6 +22,7 @@ Vector drivers
    :maxdepth: 1
    :hidden:
 
+   adbc
    amigocloud
    arrow
    avcbin
diff --git a/doc/source/spelling_wordlist.txt b/doc/source/spelling_wordlist.txt
index 484b6fd812ea..b69ae9b49e8f 100644
--- a/doc/source/spelling_wordlist.txt
+++ b/doc/source/spelling_wordlist.txt
@@ -19,6 +19,7 @@ acl
 ACL
 actinia
 ActiveX
+adbc
 addalpha
 addCurve
 addfields
diff --git a/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile
index a79a377d36ba..e0747eb3d227 100644
--- a/docker/ubuntu-full/Dockerfile
+++ b/docker/ubuntu-full/Dockerfile
@@ -395,6 +395,24 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y -V libarrow-dataset-dev${APT_ARCH_SUFFIX}=${ARROW_VERSION} \
     && rm apache-arrow-apt-source-latest-$(lsb_release --codename --short).deb
 
+# Manually install ADBC packages from Ubuntu 22.04 as there are no 24.04 packages at time of writing.
+RUN . /buildscripts/bh-set-envvars.sh \
+    && if test "${GCC_ARCH}" = "x86_64"; then \
+    curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-manager102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-manager-dev_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-sqlite102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-sqlite-dev_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-snowflake102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-snowflake-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-manager102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-manager-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-sqlite102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-sqlite-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-snowflake102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-snowflake-dev_14-1_amd64.deb \
+    && rm -f libadbc*.deb; \
+    fi
+
 ARG WITH_DEBUG_SYMBOLS=no
 
 # Refresh grids
@@ -483,6 +501,31 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     && apt-get install -y -V libparquet${ARROW_SOVERSION} \
     && apt-get install -y -V libarrow-dataset${ARROW_SOVERSION}
 
+# Manually install ADBC packages from Ubuntu 22.04 as there are no 24.04 packages at time of writing.
+RUN if test "$(uname -p)" = "x86_64"; then \
+    curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-manager102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-manager-dev_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-sqlite102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-sqlite-dev_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-snowflake102_14-1_amd64.deb \
+    && curl -LO -fsS https://apache.jfrog.io/artifactory/arrow/ubuntu/pool/jammy/main/a/apache-arrow-adbc/libadbc-driver-snowflake-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-manager102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-manager-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-sqlite102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-sqlite-dev_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-snowflake102_14-1_amd64.deb \
+    && dpkg -i libadbc-driver-snowflake-dev_14-1_amd64.deb \
+    && rm -f libadbc*.deb; \
+    fi
+
+# Install libduckdb
+RUN if test "$(uname -p)" = "x86_64"; then \
+    curl -LO -fsS https://github.com/duckdb/duckdb/releases/download/v1.1.2/libduckdb-linux-amd64.zip \
+    && unzip libduckdb-linux-amd64.zip libduckdb.so \
+    && mv libduckdb.so /usr/lib/x86_64-linux-gnu \
+    && rm -f libduckdb-linux-amd64.zip; \
+    fi
+
 # Attempt to order layers starting with less frequently varying ones
 
 COPY --from=builder  /build_thirdparty/usr/ /usr/
diff --git a/frmts/drivers.ini b/frmts/drivers.ini
index 2b8c78828b7f..ec0ade0b2fff 100644
--- a/frmts/drivers.ini
+++ b/frmts/drivers.ini
@@ -266,6 +266,7 @@ PMTiles
 JSONFG
 MiraMonVector
 XODR
+ADBC
 
 # Put TIGER and AVCBIN at end since they need poOpenInfo->GetSiblingFiles()
 Tiger
diff --git a/frmts/gdalallregister.cpp b/frmts/gdalallregister.cpp
index 21d90de23ccb..c95f94ffb19b 100644
--- a/frmts/gdalallregister.cpp
+++ b/frmts/gdalallregister.cpp
@@ -304,6 +304,9 @@ void CPL_STDCALL GDALAllRegister()
 #if defined(DEFERRED_XODR_DRIVER)
     DeclareDeferredOGRXODRPlugin();
 #endif
+#if defined(DEFERRED_ADBC_DRIVER)
+    DeclareDeferredOGRADBCPlugin();
+#endif
 
     // AutoLoadDrivers is a no-op if compiled with GDAL_NO_AUTOLOAD defined.
     poDriverManager->AutoLoadDrivers();
diff --git a/ogr/ogrsf_frmts/CMakeLists.txt b/ogr/ogrsf_frmts/CMakeLists.txt
index e4cd0c4f044b..ac7feb80f52c 100644
--- a/ogr/ogrsf_frmts/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/CMakeLists.txt
@@ -113,6 +113,7 @@ ogr_dependent_driver(oapif "OGC API Features service" "GDAL_USE_CURL")
 ogr_dependent_driver(ngw "NextGIS Web" "GDAL_USE_CURL")
 ogr_dependent_driver(elastic "ElasticSearch" "GDAL_USE_CURL")
 ogr_dependent_driver(xodr OpenDRIVE "GDAL_USE_OPENDRIVE;GDAL_USE_GEOS")
+ogr_dependent_driver(adbc ADBC "GDAL_USE_ADBCDRIVERMANAGER")
 
 ogr_dependent_driver(idrisi IDRISI "GDAL_ENABLE_DRIVER_IDRISI")
 
diff --git a/ogr/ogrsf_frmts/adbc/CMakeLists.txt b/ogr/ogrsf_frmts/adbc/CMakeLists.txt
new file mode 100644
index 000000000000..5f12eb1d4afe
--- /dev/null
+++ b/ogr/ogrsf_frmts/adbc/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_gdal_driver(
+  TARGET ogr_ADBC
+  SOURCES
+      ogr_adbc.h
+      ogradbcdriver.cpp
+      ogradbcdataset.cpp
+      ogradbclayer.cpp
+  CORE_SOURCES ogradbcdrivercore.cpp
+  PLUGIN_CAPABLE
+  NO_SHARED_SYMBOL_WITH_CORE
+  STRONG_CXX_WFLAGS)
+
+if(NOT TARGET ogr_ADBC)
+    return()
+endif()
+
+gdal_standard_includes(ogr_ADBC)
+target_include_directories(ogr_ADBC PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>
+                                            $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
+gdal_target_link_libraries(ogr_ADBC PRIVATE AdbcDriverManager::adbc_driver_manager_shared)
diff --git a/ogr/ogrsf_frmts/adbc/ogr_adbc.h b/ogr/ogrsf_frmts/adbc/ogr_adbc.h
new file mode 100644
index 000000000000..03ea21a1f378
--- /dev/null
+++ b/ogr/ogrsf_frmts/adbc/ogr_adbc.h
@@ -0,0 +1,210 @@
+/******************************************************************************
+ *
+ * Project:  GDAL
+ * Purpose:  Arrow Database Connectivity driver
+ * Author:   Even Rouault, <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef OGR_ADBC_INCLUDED
+#define OGR_ADBC_INCLUDED
+
+#include "gdal_priv.h"
+#include "ogrsf_frmts.h"
+#include "ogrlayerarrow.h"
+
+#include <arrow-adbc/adbc.h>
+
+/************************************************************************/
+/*                 OGRArrowArrayToOGRFeatureAdapterLayer                */
+/************************************************************************/
+
+class OGRArrowArrayToOGRFeatureAdapterLayer final : public OGRLayer
+{
+    friend class OGRADBCLayer;
+    OGRFeatureDefn *m_poLayerDefn = nullptr;
+    std::vector<std::unique_ptr<OGRFeature>> m_apoFeatures{};
+
+    CPL_DISALLOW_COPY_ASSIGN(OGRArrowArrayToOGRFeatureAdapterLayer)
+
+  public:
+    explicit OGRArrowArrayToOGRFeatureAdapterLayer(const char *pszName)
+    {
+        m_poLayerDefn = new OGRFeatureDefn(pszName);
+        m_poLayerDefn->SetGeomType(wkbNone);
+        m_poLayerDefn->Reference();
+    }
+
+    ~OGRArrowArrayToOGRFeatureAdapterLayer()
+    {
+        m_poLayerDefn->Release();
+    }
+
+    OGRFeatureDefn *GetLayerDefn() override
+    {
+        return m_poLayerDefn;
+    }
+
+    void ResetReading() override
+    {
+    }
+
+    OGRFeature *GetNextFeature() override
+    {
+        return nullptr;
+    }
+
+    int TestCapability(const char *pszCap) override
+    {
+        return EQUAL(pszCap, OLCCreateField) ||
+               EQUAL(pszCap, OLCSequentialWrite);
+    }
+
+    OGRErr CreateField(const OGRFieldDefn *poFieldDefn, int) override
+    {
+        m_poLayerDefn->AddFieldDefn(poFieldDefn);
+        return OGRERR_NONE;
+    }
+
+    OGRErr ICreateFeature(OGRFeature *poFeature) override
+    {
+        m_apoFeatures.emplace_back(
+            std::unique_ptr<OGRFeature>(poFeature->Clone()));
+        return OGRERR_NONE;
+    }
+};
+
+/************************************************************************/
+/*                            OGRADBCLayer                              */
+/************************************************************************/
+
+class OGRADBCDataset;
+
+class OGRADBCLayer final : public OGRLayer,
+                           public OGRGetNextFeatureThroughRaw<OGRADBCLayer>
+{
+    friend class OGRADBCDataset;
+
+    OGRADBCDataset *m_poDS = nullptr;
+    std::unique_ptr<AdbcStatement> m_statement{};
+    std::unique_ptr<OGRArrowArrayToOGRFeatureAdapterLayer> m_poAdapterLayer{};
+    std::unique_ptr<OGRArrowArrayStream> m_stream{};
+
+    struct ArrowSchema m_schema
+    {
+    };
+
+    bool m_bEOF = false;
+    size_t m_nIdx = 0;
+    GIntBig m_nFeatureID = 0;
+    bool m_bIsParquetLayer = false;
+
+    OGRFeature *GetNextRawFeature();
+    bool GetArrowStreamInternal(struct ArrowArrayStream *out_stream);
+    GIntBig GetFeatureCountParquet();
+
+    CPL_DISALLOW_COPY_ASSIGN(OGRADBCLayer)
+
+  public:
+    OGRADBCLayer(OGRADBCDataset *poDS, const char *pszName,
+                 std::unique_ptr<AdbcStatement> poStatement,
+                 std::unique_ptr<OGRArrowArrayStream> poStream,
+                 ArrowSchema *schema);
+    ~OGRADBCLayer() override;
+
+    OGRFeatureDefn *GetLayerDefn() override
+    {
+        return m_poAdapterLayer->GetLayerDefn();
+    }
+
+    void ResetReading() override;
+    DEFINE_GET_NEXT_FEATURE_THROUGH_RAW(OGRADBCLayer)
+    int TestCapability(const char *) override;
+    GDALDataset *GetDataset() override;
+    bool GetArrowStream(struct ArrowArrayStream *out_stream,
+                        CSLConstList papszOptions = nullptr) override;
+    GIntBig GetFeatureCount(int bForce) override;
+};
+
+/************************************************************************/
+/*                            OGRADBCDataset                            */
+/************************************************************************/
+
+class OGRADBCDataset final : public GDALDataset
+{
+    friend class OGRADBCLayer;
+
+    AdbcDatabase m_database{};
+    std::unique_ptr<AdbcConnection> m_connection{};
+    std::vector<std::unique_ptr<OGRLayer>> m_apoLayers{};
+    std::string m_osParquetFilename{};
+
+  public:
+    OGRADBCDataset() = default;
+    ~OGRADBCDataset() override;
+
+    bool Open(const GDALOpenInfo *poOpenInfo);
+
+    int GetLayerCount() override
+    {
+        return static_cast<int>(m_apoLayers.size());
+    }
+
+    OGRLayer *GetLayer(int idx) override
+    {
+        return (idx >= 0 && idx < GetLayerCount()) ? m_apoLayers[idx].get()
+                                                   : nullptr;
+    }
+
+    OGRLayer *GetLayerByName(const char *pszName) override;
+
+    std::unique_ptr<OGRADBCLayer> CreateLayer(const char *pszStatement,
+                                              const char *pszLayerName);
+
+    OGRLayer *ExecuteSQL(const char *pszStatement, OGRGeometry *poSpatialFilter,
+                         const char *pszDialect) override;
+};
+
+/************************************************************************/
+/*                            OGRADBCError                              */
+/************************************************************************/
+
+struct OGRADBCError
+{
+    AdbcError error{};
+
+    inline OGRADBCError()
+    {
+        memset(&error, 0, sizeof(error));
+    }
+
+    inline ~OGRADBCError()
+    {
+        clear();
+    }
+
+    inline void clear()
+    {
+        if (error.release)
+            error.release(&error);
+        memset(&error, 0, sizeof(error));
+    }
+
+    inline const char *message() const
+    {
+        return error.message ? error.message : "";
+    }
+
+    inline operator AdbcError *()
+    {
+        return &error;
+    }
+
+    CPL_DISALLOW_COPY_ASSIGN(OGRADBCError)
+};
+
+#endif  // OGR_ADBC_INCLUDED
diff --git a/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp b/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp
new file mode 100644
index 000000000000..8410f395ea45
--- /dev/null
+++ b/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp
@@ -0,0 +1,512 @@
+/******************************************************************************
+ *
+ * Project:  GDAL
+ * Purpose:  Arrow Database Connectivity driver
+ * Author:   Even Rouault, <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_adbc.h"
+#include "ogradbcdrivercore.h"
+#include "ogr_mem.h"
+#include "ogr_p.h"
+#include "cpl_json.h"
+
+/************************************************************************/
+/*                           ~OGRADBCDataset()                          */
+/************************************************************************/
+
+OGRADBCDataset::~OGRADBCDataset()
+{
+    // Layers must be closed before the connection
+    m_apoLayers.clear();
+    OGRADBCError error;
+    if (m_connection)
+        AdbcConnectionRelease(m_connection.get(), error);
+    error.clear();
+    AdbcDatabaseRelease(&m_database, error);
+}
+
+/************************************************************************/
+/*                           CreateLayer()                              */
+/************************************************************************/
+
+std::unique_ptr<OGRADBCLayer>
+OGRADBCDataset::CreateLayer(const char *pszStatement, const char *pszLayerName)
+{
+
+    OGRADBCError error;
+
+    CPLString osStatement(pszStatement);
+    if (!m_osParquetFilename.empty())
+    {
+        const char *pszSrcLayerName = m_apoLayers.size() == 1
+                                          ? m_apoLayers[0]->GetDescription()
+                                          : pszLayerName;
+        // Substitute the OGR layer name with the DuckDB expected filename,
+        // single-quoted
+        const std::string osFrom =
+            std::string(" FROM ").append(pszSrcLayerName);
+        const auto nPos = osStatement.ifind(osFrom);
+        if (nPos != std::string::npos)
+        {
+            osStatement =
+                osStatement.substr(0, nPos)
+                    .append(" FROM '")
+                    .append(OGRDuplicateCharacter(m_osParquetFilename, '\''))
+                    .append("'")
+                    .append(osStatement.substr(nPos + osFrom.size()));
+        }
+        else
+        {
+            const std::string osFrom2 =
+                std::string(" FROM \"")
+                    .append(OGRDuplicateCharacter(pszSrcLayerName, '"'))
+                    .append("\"");
+            const auto nPos2 = osStatement.ifind(osFrom2);
+            if (nPos2 != std::string::npos)
+            {
+                osStatement =
+                    osStatement.substr(0, nPos2)
+                        .append(" FROM '")
+                        .append(
+                            OGRDuplicateCharacter(m_osParquetFilename, '\''))
+                        .append("'")
+                        .append(osStatement.substr(nPos2 + osFrom2.size()));
+            }
+        }
+    }
+
+    auto statement = std::make_unique<AdbcStatement>();
+    if (AdbcStatementNew(m_connection.get(), statement.get(), error) !=
+        ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "AdbcStatementNew() failed: %s",
+                 error.message());
+        return nullptr;
+    }
+
+    if (AdbcStatementSetSqlQuery(statement.get(), osStatement.c_str(), error) !=
+        ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "AdbcStatementSetSqlQuery() failed: %s", error.message());
+        error.clear();
+        AdbcStatementRelease(statement.get(), error);
+        return nullptr;
+    }
+
+    auto stream = std::make_unique<OGRArrowArrayStream>();
+    int64_t rows_affected = -1;
+    if (AdbcStatementExecuteQuery(statement.get(), stream->get(),
+                                  &rows_affected, error) != ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "AdbcStatementExecuteQuery() failed: %s", error.message());
+        error.clear();
+        AdbcStatementRelease(statement.get(), error);
+        return nullptr;
+    }
+
+    ArrowSchema schema = {};
+    if (stream->get_schema(&schema) != 0)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "get_schema() failed");
+        AdbcStatementRelease(statement.get(), error);
+        return nullptr;
+    }
+
+    return std::make_unique<OGRADBCLayer>(
+        this, pszLayerName, std::move(statement), std::move(stream), &schema);
+}
+
+/************************************************************************/
+/*                             ExecuteSQL()                             */
+/************************************************************************/
+
+OGRLayer *OGRADBCDataset::ExecuteSQL(const char *pszStatement,
+                                     OGRGeometry *poSpatialFilter,
+                                     const char *pszDialect)
+{
+    if (pszDialect && pszDialect[0] != 0 && !EQUAL(pszDialect, "NATIVE"))
+    {
+        return GDALDataset::ExecuteSQL(pszStatement, poSpatialFilter,
+                                       pszDialect);
+    }
+
+    auto poLayer = CreateLayer(pszStatement, "RESULTSET");
+    if (poLayer && poSpatialFilter)
+    {
+        if (poLayer->GetGeomType() == wkbNone)
+            return nullptr;
+        poLayer->SetSpatialFilter(poSpatialFilter);
+    }
+    return poLayer.release();
+}
+
+/************************************************************************/
+/*                                Open()                                */
+/************************************************************************/
+
+bool OGRADBCDataset::Open(const GDALOpenInfo *poOpenInfo)
+{
+    OGRADBCError error;
+
+    if (AdbcDatabaseNew(&m_database, error) != ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "AdbcDatabaseNew() failed: %s",
+                 error.message());
+        return false;
+    }
+
+    const char *pszFilename = poOpenInfo->pszFilename;
+    std::unique_ptr<GDALOpenInfo> poTmpOpenInfo;
+    if (STARTS_WITH(pszFilename, "ADBC:"))
+    {
+        pszFilename += strlen("ADBC:");
+        poTmpOpenInfo =
+            std::make_unique<GDALOpenInfo>(pszFilename, GA_ReadOnly);
+        poTmpOpenInfo->papszOpenOptions = poOpenInfo->papszOpenOptions;
+        poOpenInfo = poTmpOpenInfo.get();
+    }
+    const char *pszADBCDriverName =
+        CSLFetchNameValue(poOpenInfo->papszOpenOptions, "ADBC_DRIVER");
+    const bool bIsDuckDB = OGRADBCDriverIsDuckDB(poOpenInfo);
+    const bool bIsSQLite3 =
+        (pszADBCDriverName && EQUAL(pszADBCDriverName, "adbc_driver_sqlite")) ||
+        OGRADBCDriverIsSQLite3(poOpenInfo);
+    const bool bIsParquet = OGRADBCDriverIsParquet(poOpenInfo) ||
+                            EQUAL(CPLGetExtension(pszFilename), "parquet");
+    const bool bIsPostgreSQL = STARTS_WITH(pszFilename, "postgresql://");
+    if (!pszADBCDriverName)
+    {
+        if (bIsDuckDB || bIsParquet)
+        {
+            pszADBCDriverName =
+#ifdef _WIN32
+                "duckdb.dll"
+#elif defined(__MACH__) && defined(__APPLE__)
+                "libduckdb.dylib"
+#else
+                "libduckdb.so"
+#endif
+                ;
+        }
+        else if (bIsPostgreSQL)
+            pszADBCDriverName = "adbc_driver_postgresql";
+        else if (bIsSQLite3)
+        {
+            pszADBCDriverName = "adbc_driver_sqlite";
+        }
+        else
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "Open option ADBC_DRIVER must be specified");
+            return false;
+        }
+    }
+
+    if (AdbcDatabaseSetOption(&m_database, "driver", pszADBCDriverName,
+                              error) != ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "AdbcDatabaseSetOption() failed: %s", error.message());
+        return false;
+    }
+
+    if (bIsDuckDB || bIsParquet || strstr(pszADBCDriverName, "duckdb"))
+    {
+        if (AdbcDatabaseSetOption(&m_database, "entrypoint", "duckdb_adbc_init",
+                                  error) != ADBC_STATUS_OK)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "AdbcDatabaseSetOption() failed: %s", error.message());
+            return false;
+        }
+        if (AdbcDatabaseSetOption(&m_database, "path",
+                                  bIsParquet ? ":memory:" : pszFilename,
+                                  error) != ADBC_STATUS_OK)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "AdbcDatabaseSetOption() failed: %s", error.message());
+            return false;
+        }
+    }
+    else if (pszFilename[0])
+    {
+        if (AdbcDatabaseSetOption(&m_database, "uri", pszFilename, error) !=
+            ADBC_STATUS_OK)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                     "AdbcDatabaseSetOption() failed: %s", error.message());
+            return false;
+        }
+    }
+
+    for (const auto &[pszKey, pszValue] : cpl::IterateNameValue(
+             static_cast<CSLConstList>(poOpenInfo->papszOpenOptions)))
+    {
+        if (STARTS_WITH_CI(pszKey, "ADBC_OPTION_"))
+        {
+            if (AdbcDatabaseSetOption(&m_database,
+                                      pszKey + strlen("ADBC_OPTION_"), pszValue,
+                                      error) != ADBC_STATUS_OK)
+            {
+                CPLError(CE_Failure, CPLE_AppDefined,
+                         "AdbcDatabaseSetOption() failed: %s", error.message());
+                return false;
+            }
+        }
+    }
+
+    if (AdbcDatabaseInit(&m_database, error) != ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "AdbcDatabaseInit() failed: %s",
+                 error.message());
+        return false;
+    }
+
+    m_connection = std::make_unique<AdbcConnection>();
+    if (AdbcConnectionNew(m_connection.get(), error) != ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "AdbcConnectionNew() failed: %s",
+                 error.message());
+        return false;
+    }
+
+    if (AdbcConnectionInit(m_connection.get(), &m_database, error) !=
+        ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "AdbcConnectionInit() failed: %s",
+                 error.message());
+        return false;
+    }
+
+    std::string osLayerName = "RESULTSET";
+    std::string osSQL;
+    const char *pszSQL = CSLFetchNameValue(poOpenInfo->papszOpenOptions, "SQL");
+    bool bIsParquetLayer = false;
+    if (bIsParquet)
+    {
+        m_osParquetFilename = pszFilename;
+        osLayerName = CPLGetBasename(pszFilename);
+        if (osLayerName == "*")
+            osLayerName = CPLGetBasename(CPLGetDirname(pszFilename));
+        if (!pszSQL)
+        {
+            osSQL =
+                CPLSPrintf("SELECT * FROM '%s'",
+                           OGRDuplicateCharacter(pszFilename, '\'').c_str());
+            pszSQL = osSQL.c_str();
+            bIsParquetLayer = true;
+        }
+    }
+
+    if (pszSQL)
+    {
+        if (pszSQL[0])
+        {
+            auto poLayer = CreateLayer(pszSQL, osLayerName.c_str());
+            if (!poLayer)
+                return false;
+            poLayer->m_bIsParquetLayer = bIsParquetLayer;
+            m_apoLayers.emplace_back(std::move(poLayer));
+        }
+    }
+    else if (bIsDuckDB || bIsSQLite3)
+    {
+        auto poLayerList = CreateLayer(
+            "SELECT name FROM sqlite_master WHERE type IN ('table', 'view')",
+            "LAYERLIST");
+        if (!poLayerList || poLayerList->GetLayerDefn()->GetFieldCount() != 1)
+        {
+            return false;
+        }
+
+        for (const auto &poFeature : poLayerList.get())
+        {
+            const char *pszLayerName = poFeature->GetFieldAsString(0);
+            if (bIsSQLite3 && EQUAL(pszLayerName, "SpatialIndex"))
+                continue;
+            const std::string osStatement =
+                CPLSPrintf("SELECT * FROM \"%s\"",
+                           OGRDuplicateCharacter(pszLayerName, '"').c_str());
+            CPLTurnFailureIntoWarning(true);
+            auto poLayer = CreateLayer(osStatement.c_str(), pszLayerName);
+            CPLTurnFailureIntoWarning(false);
+            if (poLayer)
+            {
+                m_apoLayers.emplace_back(std::move(poLayer));
+            }
+        }
+    }
+    else if (bIsPostgreSQL)
+    {
+        auto poLayerList = CreateLayer(
+            "SELECT n.nspname, c.relname FROM pg_class c "
+            "JOIN pg_namespace n ON c.relnamespace = n.oid "
+            "AND c.relkind in ('r','v','m','f') "
+            "AND n.nspname NOT IN ('pg_catalog', 'information_schema') "
+            "ORDER BY c.oid",
+            "LAYERLIST");
+        if (!poLayerList || poLayerList->GetLayerDefn()->GetFieldCount() != 2)
+        {
+            return false;
+        }
+
+        for (const auto &poFeature : poLayerList.get())
+        {
+            const char *pszNamespace = poFeature->GetFieldAsString(0);
+            const char *pszTableName = poFeature->GetFieldAsString(1);
+            const std::string osStatement =
+                CPLSPrintf("SELECT * FROM \"%s\".\"%s\"",
+                           OGRDuplicateCharacter(pszNamespace, '"').c_str(),
+                           OGRDuplicateCharacter(pszTableName, '"').c_str());
+
+            CPLTurnFailureIntoWarning(true);
+            auto poLayer =
+                CreateLayer(osStatement.c_str(),
+                            CPLSPrintf("%s.%s", pszNamespace, pszTableName));
+            CPLTurnFailureIntoWarning(false);
+            if (poLayer)
+            {
+                m_apoLayers.emplace_back(std::move(poLayer));
+            }
+        }
+    }
+
+    return true;
+}
+
+/************************************************************************/
+/*                         GetLayerByName()                             */
+/************************************************************************/
+
+OGRLayer *OGRADBCDataset::GetLayerByName(const char *pszName)
+{
+    OGRLayer *poLayer = GDALDataset::GetLayerByName(pszName);
+    if (poLayer || !EQUAL(pszName, "table_list"))
+        return poLayer;
+
+    OGRADBCError error;
+    auto objectsStream = std::make_unique<OGRArrowArrayStream>();
+    AdbcConnectionGetObjects(m_connection.get(), ADBC_OBJECT_DEPTH_TABLES,
+                             /* catalog = */ nullptr,
+                             /* db_schema = */ nullptr,
+                             /* table_name = */ nullptr,
+                             /* table_type = */ nullptr,
+                             /* column_name = */ nullptr, objectsStream->get(),
+                             error);
+
+    ArrowSchema schema = {};
+    if (objectsStream->get_schema(&schema) != 0)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "get_schema() failed");
+        return nullptr;
+    }
+
+    auto statement = std::make_unique<AdbcStatement>();
+    OGRADBCLayer tmpLayer(this, "", std::move(statement),
+                          std::move(objectsStream), &schema);
+    const auto tmpLayerDefn = tmpLayer.GetLayerDefn();
+    if (tmpLayerDefn->GetFieldIndex("catalog_name") < 0 ||
+        tmpLayerDefn->GetFieldIndex("catalog_db_schemas") < 0)
+    {
+        return nullptr;
+    }
+
+    auto poTableListLayer =
+        std::make_unique<OGRMemLayer>("table_list", nullptr, wkbNone);
+    {
+        OGRFieldDefn oField("catalog_name", OFTString);
+        poTableListLayer->CreateField(&oField);
+    }
+    {
+        OGRFieldDefn oField("schema_name", OFTString);
+        poTableListLayer->CreateField(&oField);
+    }
+    {
+        OGRFieldDefn oField("table_name", OFTString);
+        poTableListLayer->CreateField(&oField);
+    }
+    {
+        OGRFieldDefn oField("table_type", OFTString);
+        poTableListLayer->CreateField(&oField);
+    }
+
+    for (const auto &poFeature : tmpLayer)
+    {
+        const char *pszCatalogName =
+            poFeature->GetFieldAsString("catalog_name");
+        const char *pszCatalogDBSchemas =
+            poFeature->GetFieldAsString("catalog_db_schemas");
+        if (pszCatalogDBSchemas)
+        {
+            CPLJSONDocument oDoc;
+            if (oDoc.LoadMemory(pszCatalogDBSchemas))
+            {
+                auto oRoot = oDoc.GetRoot();
+                if (oRoot.GetType() == CPLJSONObject::Type::Array)
+                {
+                    for (auto oSchema : oRoot.ToArray())
+                    {
+                        if (oSchema.GetType() == CPLJSONObject::Type::Object)
+                        {
+                            const std::string osSchemaName =
+                                oSchema.GetString("schema_name");
+                            const auto oTables =
+                                oSchema.GetArray("db_schema_tables");
+                            if (oTables.IsValid())
+                            {
+                                for (auto oTable : oTables)
+                                {
+                                    if (oTable.GetType() ==
+                                        CPLJSONObject::Type::Object)
+                                    {
+                                        const std::string osTableName =
+                                            oTable.GetString("table_name");
+                                        const std::string osTableType =
+                                            oTable.GetString("table_type");
+                                        if (!osTableName.empty() &&
+                                            osTableType != "index" &&
+                                            osTableType != "trigger")
+                                        {
+                                            OGRFeature oFeat(
+                                                poTableListLayer
+                                                    ->GetLayerDefn());
+                                            if (pszCatalogName)
+                                                oFeat.SetField("catalog_name",
+                                                               pszCatalogName);
+                                            if (oSchema.GetObj("schema_name")
+                                                    .IsValid())
+                                                oFeat.SetField(
+                                                    "schema_name",
+                                                    osSchemaName.c_str());
+                                            oFeat.SetField("table_name",
+                                                           osTableName.c_str());
+                                            if (oTable.GetObj("table_type")
+                                                    .IsValid())
+                                                oFeat.SetField(
+                                                    "table_type",
+                                                    osTableType.c_str());
+                                            CPL_IGNORE_RET_VAL(
+                                                poTableListLayer->CreateFeature(
+                                                    &oFeat));
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    m_apoLayers.emplace_back(std::move(poTableListLayer));
+    return m_apoLayers.back().get();
+}
diff --git a/ogr/ogrsf_frmts/adbc/ogradbcdriver.cpp b/ogr/ogrsf_frmts/adbc/ogradbcdriver.cpp
new file mode 100644
index 000000000000..6dfde9b253aa
--- /dev/null
+++ b/ogr/ogrsf_frmts/adbc/ogradbcdriver.cpp
@@ -0,0 +1,46 @@
+/******************************************************************************
+ *
+ * Project:  GDAL
+ * Purpose:  Arrow Database Connectivity driver
+ * Author:   Even Rouault, <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_adbc.h"
+#include "ogradbcdrivercore.h"
+
+/************************************************************************/
+/*                         OGRADBCDriverOpen()                          */
+/************************************************************************/
+
+static GDALDataset *OGRADBCDriverOpen(GDALOpenInfo *poOpenInfo)
+{
+    if (!OGRADBCDriverIdentify(poOpenInfo))
+        return nullptr;
+    auto poDS = std::make_unique<OGRADBCDataset>();
+    if (!poDS->Open(poOpenInfo))
+        return nullptr;
+    return poDS.release();
+}
+
+/************************************************************************/
+/*                          RegisterOGRADBC()                           */
+/************************************************************************/
+
+void RegisterOGRADBC()
+{
+    if (!GDAL_CHECK_VERSION(DRIVER_NAME))
+        return;
+
+    if (GDALGetDriverByName(DRIVER_NAME) != nullptr)
+        return;
+
+    GDALDriver *poDriver = new GDALDriver();
+    OGRADBCDriverSetCommonMetadata(poDriver);
+    poDriver->pfnOpen = OGRADBCDriverOpen;
+    GetGDALDriverManager()->RegisterDriver(poDriver);
+}
diff --git a/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp b/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp
new file mode 100644
index 000000000000..3be24128f199
--- /dev/null
+++ b/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp
@@ -0,0 +1,115 @@
+/******************************************************************************
+ *
+ * Project:  GDAL
+ * Purpose:  Arrow Database Connectivity driver
+ * Author:   Even Rouault, <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogrsf_frmts.h"
+#include "ogradbcdrivercore.h"
+
+/************************************************************************/
+/*                             IsDuckDB()                               */
+/************************************************************************/
+
+bool OGRADBCDriverIsDuckDB(const GDALOpenInfo *poOpenInfo)
+{
+    return poOpenInfo->nHeaderBytes >= 20 &&
+           memcmp(poOpenInfo->pabyHeader + 8, "DUCK\x40\0\0\0\0\0\0\0",
+                  4 + 8) == 0;
+}
+
+/************************************************************************/
+/*                             IsSQLite3()                              */
+/************************************************************************/
+
+bool OGRADBCDriverIsSQLite3(const GDALOpenInfo *poOpenInfo)
+{
+    constexpr const char *SQLITE3_SIGNATURE = "SQLite format 3";
+    return poOpenInfo->nHeaderBytes >= 512 &&
+           memcmp(poOpenInfo->pabyHeader, SQLITE3_SIGNATURE,
+                  strlen(SQLITE3_SIGNATURE)) == 0;
+}
+
+/************************************************************************/
+/*                             IsParquet()                              */
+/************************************************************************/
+
+bool OGRADBCDriverIsParquet(const GDALOpenInfo *poOpenInfo)
+{
+    constexpr const char *PARQUET_SIGNATURE = "PAR1";
+    return poOpenInfo->nHeaderBytes >=
+               static_cast<int>(strlen(PARQUET_SIGNATURE)) &&
+           memcmp(poOpenInfo->pabyHeader, PARQUET_SIGNATURE,
+                  strlen(PARQUET_SIGNATURE)) == 0;
+}
+
+/************************************************************************/
+/*                    OGRADBCDriverIdentify()                           */
+/************************************************************************/
+
+int OGRADBCDriverIdentify(GDALOpenInfo *poOpenInfo)
+{
+    return (STARTS_WITH(poOpenInfo->pszFilename, "ADBC:") ||
+            OGRADBCDriverIsDuckDB(poOpenInfo) ||
+            OGRADBCDriverIsSQLite3(poOpenInfo) ||
+            OGRADBCDriverIsParquet(poOpenInfo)) &&
+           !STARTS_WITH(poOpenInfo->pszFilename, "/vsi") &&
+           !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "mbtiles");
+}
+
+/************************************************************************/
+/*                  OGRADBCDriverSetCommonMetadata()                    */
+/************************************************************************/
+
+void OGRADBCDriverSetCommonMetadata(GDALDriver *poDriver)
+{
+    poDriver->SetDescription(DRIVER_NAME);
+    poDriver->SetMetadataItem(GDAL_DCAP_VECTOR, "YES");
+    poDriver->SetMetadataItem(GDAL_DMD_LONGNAME, "Arrow Database Connectivity");
+    poDriver->SetMetadataItem(GDAL_DMD_HELPTOPIC, "drivers/vector/adbc.html");
+
+    poDriver->SetMetadataItem(GDAL_DMD_CONNECTION_PREFIX, "ADBC:");
+
+    poDriver->SetMetadataItem(
+        GDAL_DMD_OPENOPTIONLIST,
+        "<OpenOptionList>"
+        "  <Option name='ADBC_DRIVER' type='string' description='ADBC driver "
+        "name'/>"
+        "  <Option name='SQL' type='string' "
+        "description='SQL statement from which to build layer'/>"
+        "  <Option name='ADBC_OPTION_*' type='string' "
+        "description='Option to pass to AdbcDatabaseSetOption()'/>"
+        "</OpenOptionList>");
+    poDriver->SetMetadataItem(GDAL_DMD_SUPPORTED_SQL_DIALECTS,
+                              "NATIVE OGRSQL SQLITE");
+
+    poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
+    poDriver->pfnIdentify = OGRADBCDriverIdentify;
+}
+
+/************************************************************************/
+/*                   DeclareDeferredOGRADBCPlugin()                     */
+/************************************************************************/
+
+#ifdef PLUGIN_FILENAME
+void DeclareDeferredOGRADBCPlugin()
+{
+    if (GDALGetDriverByName(DRIVER_NAME) != nullptr)
+    {
+        return;
+    }
+    auto poDriver = new GDALPluginDriverProxy(PLUGIN_FILENAME);
+#ifdef PLUGIN_INSTALLATION_MESSAGE
+    poDriver->SetMetadataItem(GDAL_DMD_PLUGIN_INSTALLATION_MESSAGE,
+                              PLUGIN_INSTALLATION_MESSAGE);
+#endif
+    OGRADBCDriverSetCommonMetadata(poDriver);
+    GetGDALDriverManager()->DeclareDeferredPluginDriver(poDriver);
+}
+#endif
diff --git a/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.h b/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.h
new file mode 100644
index 000000000000..e24fcbfc6499
--- /dev/null
+++ b/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.h
@@ -0,0 +1,34 @@
+/******************************************************************************
+ *
+ * Project:  GDAL
+ * Purpose:  Arrow Database Connectivity driver
+ * Author:   Even Rouault, <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#pragma once
+
+#include "gdal_priv.h"
+
+constexpr const char *DRIVER_NAME = "ADBC";
+
+#define OGRADBCDriverIsDuckDB PLUGIN_SYMBOL_NAME(OGRADBCDriverIsDuckDB)
+#define OGRADBCDriverIsSQLite3 PLUGIN_SYMBOL_NAME(OGRADBCDriverIsSQLite3)
+#define OGRADBCDriverIsParquet PLUGIN_SYMBOL_NAME(OGRADBCDriverIsParquet)
+#define OGRADBCDriverIdentify PLUGIN_SYMBOL_NAME(OGRADBCDriverIdentify)
+#define OGRADBCDriverSetCommonMetadata                                         \
+    PLUGIN_SYMBOL_NAME(OGRADBCDriverSetCommonMetadata)
+
+bool OGRADBCDriverIsDuckDB(const GDALOpenInfo *poOpenInfo);
+
+bool OGRADBCDriverIsSQLite3(const GDALOpenInfo *poOpenInfo);
+
+bool OGRADBCDriverIsParquet(const GDALOpenInfo *poOpenInfo);
+
+int OGRADBCDriverIdentify(GDALOpenInfo *poOpenInfo);
+
+void OGRADBCDriverSetCommonMetadata(GDALDriver *poDriver);
diff --git a/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp b/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp
new file mode 100644
index 000000000000..3667c2ed5184
--- /dev/null
+++ b/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp
@@ -0,0 +1,256 @@
+/******************************************************************************
+ *
+ * Project:  GDAL
+ * Purpose:  Arrow Database Connectivity driver
+ * Author:   Even Rouault, <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "ogr_adbc.h"
+#include "ogr_p.h"
+
+/************************************************************************/
+/*                            OGRADBCLayer()                            */
+/************************************************************************/
+
+OGRADBCLayer::OGRADBCLayer(OGRADBCDataset *poDS, const char *pszName,
+                           std::unique_ptr<AdbcStatement> poStatement,
+                           std::unique_ptr<OGRArrowArrayStream> poStream,
+                           ArrowSchema *schema)
+    : m_poDS(poDS), m_statement(std::move(poStatement)),
+      m_stream(std::move(poStream))
+{
+    SetDescription(pszName);
+
+    memcpy(&m_schema, schema, sizeof(m_schema));
+    schema->release = nullptr;
+
+    m_poAdapterLayer =
+        std::make_unique<OGRArrowArrayToOGRFeatureAdapterLayer>(pszName);
+    for (int i = 0; i < m_schema.n_children; ++i)
+    {
+        m_poAdapterLayer->CreateFieldFromArrowSchema(m_schema.children[i]);
+    }
+}
+
+/************************************************************************/
+/*                           ~OGRADBCLayer()                            */
+/************************************************************************/
+
+OGRADBCLayer::~OGRADBCLayer()
+{
+    OGRADBCError error;
+    if (m_statement)
+        AdbcStatementRelease(m_statement.get(), error);
+    if (m_schema.release)
+        m_schema.release(&m_schema);
+}
+
+/************************************************************************/
+/*                          GetNextRawFeature()                         */
+/************************************************************************/
+
+OGRFeature *OGRADBCLayer::GetNextRawFeature()
+{
+    if (m_bEOF)
+        return nullptr;
+
+    if (m_nIdx == m_poAdapterLayer->m_apoFeatures.size())
+    {
+        m_nIdx = 0;
+        m_poAdapterLayer->m_apoFeatures.clear();
+
+        if (!m_stream)
+        {
+            auto stream = std::make_unique<OGRArrowArrayStream>();
+            if (!GetArrowStreamInternal(stream->get()))
+            {
+                m_bEOF = true;
+                return nullptr;
+            }
+            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;
+        }
+        const bool bOK =
+            array.length
+                ? m_poAdapterLayer->WriteArrowBatch(&m_schema, &array, nullptr)
+                : false;
+        if (array.release)
+            array.release(&array);
+        if (!bOK)
+        {
+            m_bEOF = true;
+            return nullptr;
+        }
+    }
+
+    auto poFeature = m_poAdapterLayer->m_apoFeatures[m_nIdx++].release();
+    poFeature->SetFID(m_nFeatureID++);
+    return poFeature;
+}
+
+/************************************************************************/
+/*                            ResetReading()                            */
+/************************************************************************/
+
+void OGRADBCLayer::ResetReading()
+{
+    if (m_nIdx > 0 || m_bEOF)
+    {
+        m_poAdapterLayer->m_apoFeatures.clear();
+        m_stream.reset();
+        m_bEOF = false;
+        m_nIdx = 0;
+        m_nFeatureID = 0;
+    }
+}
+
+/************************************************************************/
+/*                          TestCapability()                            */
+/************************************************************************/
+
+int OGRADBCLayer::TestCapability(const char *pszCap)
+{
+    if (EQUAL(pszCap, OLCFastGetArrowStream))
+    {
+        return !m_poFilterGeom && !m_poAttrQuery;
+    }
+    else if (EQUAL(pszCap, OLCFastFeatureCount))
+    {
+        return !m_poFilterGeom && !m_poAttrQuery && m_bIsParquetLayer;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+/************************************************************************/
+/*                            GetDataset()                              */
+/************************************************************************/
+
+GDALDataset *OGRADBCLayer::GetDataset()
+{
+    return m_poDS;
+}
+
+/************************************************************************/
+/*                          GetArrowStream()                            */
+/************************************************************************/
+
+bool OGRADBCLayer::GetArrowStream(struct ArrowArrayStream *out_stream,
+                                  CSLConstList papszOptions)
+{
+    if (m_poFilterGeom || m_poAttrQuery)
+        return OGRLayer::GetArrowStream(out_stream, papszOptions);
+
+    if (m_stream)
+    {
+        memcpy(out_stream, m_stream->get(), sizeof(*out_stream));
+        memset(m_stream->get(), 0, sizeof(*out_stream));
+        m_stream.reset();
+    }
+
+    return GetArrowStreamInternal(out_stream);
+}
+
+/************************************************************************/
+/*                       GetArrowStreamInternal()                       */
+/************************************************************************/
+
+bool OGRADBCLayer::GetArrowStreamInternal(struct ArrowArrayStream *out_stream)
+{
+    OGRADBCError error;
+    int64_t rows_affected = -1;
+    if (AdbcStatementExecuteQuery(m_statement.get(), out_stream, &rows_affected,
+                                  error) != ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "AdbcStatementExecuteQuery() failed: %s", error.message());
+        return false;
+    }
+
+    return true;
+}
+
+/************************************************************************/
+/*                           GetFeatureCount()                          */
+/************************************************************************/
+
+GIntBig OGRADBCLayer::GetFeatureCount(int bForce)
+{
+    if (m_poFilterGeom || m_poAttrQuery)
+    {
+        return OGRLayer::GetFeatureCount(bForce);
+    }
+
+    if (m_bIsParquetLayer)
+    {
+        return GetFeatureCountParquet();
+    }
+
+    if (m_nIdx > 0 || m_bEOF)
+        m_stream.reset();
+
+    if (!m_stream)
+    {
+        auto stream = std::make_unique<OGRArrowArrayStream>();
+        if (!GetArrowStreamInternal(stream->get()))
+        {
+            return -1;
+        }
+        m_stream = std::move(stream);
+    }
+
+    GIntBig nTotal = 0;
+    while (true)
+    {
+        struct ArrowArray array;
+        memset(&array, 0, sizeof(array));
+        if (m_stream->get_next(&array) != 0)
+        {
+            m_stream.reset();
+            return -1;
+        }
+        const bool bStop = array.length == 0;
+        nTotal += array.length;
+        if (array.release)
+            array.release(&array);
+        if (bStop)
+            break;
+    }
+    m_stream.reset();
+    return nTotal;
+}
+
+/************************************************************************/
+/*                        GetFeatureCountParquet()                      */
+/************************************************************************/
+
+GIntBig OGRADBCLayer::GetFeatureCountParquet()
+{
+    const std::string osSQL(CPLSPrintf(
+        "SELECT CAST(SUM(num_rows) AS BIGINT) FROM parquet_file_metadata('%s')",
+        OGRDuplicateCharacter(m_poDS->m_osParquetFilename, '\'').c_str()));
+    auto poCountLayer = m_poDS->CreateLayer(osSQL.c_str(), "numrows");
+    if (poCountLayer && poCountLayer->GetLayerDefn()->GetFieldCount() == 1)
+    {
+        auto poFeature =
+            std::unique_ptr<OGRFeature>(poCountLayer->GetNextFeature());
+        if (poFeature)
+            return poFeature->GetFieldAsInteger64(0);
+    }
+
+    return -1;
+}
diff --git a/ogr/ogrsf_frmts/generic/ogrlayerarrow.h b/ogr/ogrsf_frmts/generic/ogrlayerarrow.h
index 9b6c9805dfaf..e8f5fbd489d1 100644
--- a/ogr/ogrsf_frmts/generic/ogrlayerarrow.h
+++ b/ogr/ogrsf_frmts/generic/ogrlayerarrow.h
@@ -90,6 +90,8 @@ class OGRArrowArrayStream
         {
             clear();
             memcpy(&m_stream, &(other.m_stream), sizeof(m_stream));
+            // Reset other content, in particular its "release" member
+            // as per https://arrow.apache.org/docs/format/CDataInterface.html#moving-an-array
             memset(&(other.m_stream), 0, sizeof(m_stream));
         }
         return *this;
diff --git a/ogr/ogrsf_frmts/generic/ogrregisterall.cpp b/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
index 5d69001f38e6..b7d6744daea6 100644
--- a/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrregisterall.cpp
@@ -255,6 +255,9 @@ void OGRRegisterAllInternal()
 #ifdef XODR_ENABLED
     RegisterOGRXODR();
 #endif
+#ifdef ADBC_ENABLED
+    RegisterOGRADBC();
+#endif
 
     // NOTE: you need to generally insert your own driver before that line.
 
diff --git a/ogr/ogrsf_frmts/ogrsf_frmts.h b/ogr/ogrsf_frmts/ogrsf_frmts.h
index ef82caefa9d3..994db366a89c 100644
--- a/ogr/ogrsf_frmts/ogrsf_frmts.h
+++ b/ogr/ogrsf_frmts/ogrsf_frmts.h
@@ -739,6 +739,8 @@ void CPL_DLL RegisterOGRJSONFG();
 void CPL_DLL RegisterOGRMiraMon();
 void CPL_DLL RegisterOGRXODR();
 void DeclareDeferredOGRXODRPlugin();
+void CPL_DLL RegisterOGRADBC();
+void DeclareDeferredOGRADBCPlugin();
 // @endcond
 
 CPL_C_END

From ecf9fe755bafdeed74b29207db4d2a4745f216be Mon Sep 17 00:00:00 2001
From: Dewey Dunnington <dewey@voltrondata.com>
Date: Thu, 17 Oct 2024 12:55:31 +0200
Subject: [PATCH 76/87] Add GDALSetAdbcDriverInitFunc() and use it in OGR ADBC
 driver

Also no longer make AdbcDriverManager a requirement
---
 ...windows_conda_expected_ogrinfo_formats.txt |    1 +
 .pre-commit-config.yaml                       |    1 +
 autotest/ogr/ogr_adbc.py                      |   14 +-
 doc/source/api/vector_c_api.rst               |    3 +
 doc/source/drivers/vector/adbc.rst            |   26 +-
 gcore/CMakeLists.txt                          |    2 +
 gcore/gdal_adbc.cpp                           |   49 +
 gcore/gdal_adbc.h                             |   46 +
 ogr/ogrsf_frmts/CMakeLists.txt                |    2 +-
 ogr/ogrsf_frmts/adbc/CMakeLists.txt           |   10 +-
 ogr/ogrsf_frmts/adbc/ogr_adbc.h               |   10 +-
 ogr/ogrsf_frmts/adbc/ogr_adbc_internal.h      | 2356 +++++++++++++++++
 ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp       |  149 +-
 ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp    |   19 +-
 ogr/ogrsf_frmts/adbc/ogradbclayer.cpp         |   11 +-
 15 files changed, 2631 insertions(+), 68 deletions(-)
 create mode 100644 gcore/gdal_adbc.cpp
 create mode 100644 gcore/gdal_adbc.h
 create mode 100644 ogr/ogrsf_frmts/adbc/ogr_adbc_internal.h

diff --git a/.github/workflows/windows_conda_expected_ogrinfo_formats.txt b/.github/workflows/windows_conda_expected_ogrinfo_formats.txt
index e9de701fc9d7..7d3561b01a0b 100644
--- a/.github/workflows/windows_conda_expected_ogrinfo_formats.txt
+++ b/.github/workflows/windows_conda_expected_ogrinfo_formats.txt
@@ -77,6 +77,7 @@ Supported Formats: (ro:read-only, rw:read-write, +:update, v:virtual-I/O s:subda
   PMTiles -vector- (rw+v): ProtoMap Tiles (*.pmtiles)
   JSONFG -vector- (rw+v): OGC Features and Geometries JSON (*.json)
   MiraMonVector -vector- (rw+v): MiraMon Vectors (.pol, .arc, .pnt) (*.pol, *.arc, *.pnt)
+  ADBC -vector- (ro): Arrow Database Connectivity
   TIGER -vector- (rov): U.S. Census TIGER/Line
   AVCBin -vector- (rov): Arc/Info Binary Coverage
   AVCE00 -vector- (rov): Arc/Info E00 (ASCII) Coverage (*.e00)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b7f88f67772b..2fb810e2ea38 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -57,6 +57,7 @@ repos:
                 frmts/grib/degrib/degrib|
                 frmts/grib/degrib/g2clib|
                 port/utf8.h|
+                ogr/ogrsf_frmts/adbc/ogr_adbc_internal.h|
                 ogr/ogrsf_frmts/cad/libopencad/|
                 ogr/ogrsf_frmts/geojson/libjson/|
                 ogr/ogrsf_frmts/flatgeobuf/flatbuffers/|
diff --git a/autotest/ogr/ogr_adbc.py b/autotest/ogr/ogr_adbc.py
index 5148ada0702e..edaf0e937140 100755
--- a/autotest/ogr/ogr_adbc.py
+++ b/autotest/ogr/ogr_adbc.py
@@ -17,7 +17,19 @@
 
 from osgeo import gdal, ogr
 
-pytestmark = pytest.mark.require_driver("ADBC")
+
+def _has_adbc_driver_manager():
+    drv = gdal.GetDriverByName("ADBC")
+    return drv and drv.GetMetadataItem("HAS_ADBC_DRIVER_MANAGER")
+
+
+pytestmark = [
+    pytest.mark.require_driver("ADBC"),
+    pytest.mark.skipif(
+        not _has_adbc_driver_manager(),
+        reason="ADBC driver built without AdbcDriverManager",
+    ),
+]
 
 ###############################################################################
 
diff --git a/doc/source/api/vector_c_api.rst b/doc/source/api/vector_c_api.rst
index ea70e352227c..65dc4074b266 100644
--- a/doc/source/api/vector_c_api.rst
+++ b/doc/source/api/vector_c_api.rst
@@ -14,3 +14,6 @@ ogr_core.h and ogr_api.h: Vector C API
 
 .. doxygenfile:: ogr_api.h
    :project: api
+
+.. doxygenfile:: gdal_adbc.h
+   :project: api
diff --git a/doc/source/drivers/vector/adbc.rst b/doc/source/drivers/vector/adbc.rst
index 4287995608db..e8a3659d2715 100644
--- a/doc/source/drivers/vector/adbc.rst
+++ b/doc/source/drivers/vector/adbc.rst
@@ -7,11 +7,19 @@ ADBC -- Arrow Database Connectivity
 
 .. shortname:: ADBC
 
-.. build_dependencies:: adbc-driver-manager
+ADBC is a set of APIs and libraries for Arrow-native access to database.
 
-ADBC is a set of APIs and libraries for Arrow-native access to database. This
-driver uses the ``adbc-driver-manager`` library to connect to available ADBC
-drivers, and expose content as classic OGR features, or as a ArrowArrayStream.
+This driver has 2 modes:
+
+- either it has been built against the ``adbc-driver-manager`` library. In that
+  case, it can directly be used to connect to available ADBC drivers, and expose
+  content as classic OGR features, or as a ArrowArrayStream.
+  In that mode the driver metadata exposes the ``HAS_ADBC_DRIVER_MANAGER``
+  metadata item.
+- or it has not, in which case applications embedding GDAL must use
+  :cpp:func:`GDALSetAdbcLoadDriverOverride` as detailed in a below paragraph.
+  Note that use of that function can also be done even if the driver has been built
+  against the ``adbc-driver-manager`` library.
 
 Consult the `installation instruction <https://arrow.apache.org/adbc/current/driver/installation.html>`__
 for the various ADBC drivers. At time of writing, there are drivers for
@@ -80,6 +88,16 @@ It returns for each table a OGR feature with the following fields (some
 potentially unset or with an empty string): ``catalog_name``, ``schema_name``,
 ``table_name``, ``table_type``.
 
+Custom driver entry point
+-------------------------
+
+A custom driver entry point can be specified by applications by calling
+:cpp:func:`GDALSetAdbcLoadDriverOverride` (defined in header :file:`gdal_adbc.h`)
+before using the driver. The specified init function will be used by the
+GDAL ADBC driver as a way of locating and loading the ADBC driver if GDAL was
+not built with ADBC Driver Manager support or if an embedding application has
+an updated or augmented collection of drivers available.
+
 Examples
 --------
 
diff --git a/gcore/CMakeLists.txt b/gcore/CMakeLists.txt
index a4699856b6fb..98c7fde1993a 100644
--- a/gcore/CMakeLists.txt
+++ b/gcore/CMakeLists.txt
@@ -1,6 +1,7 @@
 # CMake4GDAL project is distributed under MIT license. See accompanying file LICENSE.txt.
 add_library(
   gcore OBJECT
+  gdal_adbc.cpp
   gdalopeninfo.cpp
   gdaldriver.cpp
   gdaldrivermanager.cpp
@@ -195,6 +196,7 @@ target_public_header(
   gdal_mdreader.h
   gdalsubdatasetinfo.h
   gdal_typetraits.h
+  gdal_adbc.h
 )
 
 set(GDAL_DATA_FILES
diff --git a/gcore/gdal_adbc.cpp b/gcore/gdal_adbc.cpp
new file mode 100644
index 000000000000..16c46103bdf3
--- /dev/null
+++ b/gcore/gdal_adbc.cpp
@@ -0,0 +1,49 @@
+/******************************************************************************
+ * Name:     gdal_adbc.h
+ * Project:  GDAL Core
+ * Purpose:  GDAL Core ADBC related declarations.
+ * Author:   Even Rouault <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2024, Dewey Dunnington <dewey@voltrondata.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#include "cpl_port.h"
+#include "gdal_adbc.h"
+
+//! ADBC driver initialization function
+static GDALAdbcLoadDriverFunc GDALAdbcLoadDriver = nullptr;
+
+/************************************************************************/
+/*                      GDALSetAdbcLoadDriverOverride()                 */
+/************************************************************************/
+
+/** When set, it is used by the OGR ADBC driver to populate AdbcDriver
+ * callbacks. This provides an embedding application the opportunity to
+ * locate an up-to-date version of a driver or to bundle a driver not
+ * available at the system level.
+ *
+ * Setting it to NULL resets to the the default behavior of the ADBC driver,
+ * which is use AdbcLoadDriver() from arrow-adbc/adbc_driver_manager.h or
+ * to error if the OGR ADBC driver was not built against a system driver
+ * manager.
+ */
+void GDALSetAdbcLoadDriverOverride(GDALAdbcLoadDriverFunc init_func)
+{
+    GDALAdbcLoadDriver = init_func;
+}
+
+/************************************************************************/
+/*                    GDALGetAdbcLoadDriverOverride()                   */
+/************************************************************************/
+
+/** Gets the ADBC driver load function. This will be NULL if an explicit
+ * override was not specified.
+ */
+GDALAdbcLoadDriverFunc GDALGetAdbcLoadDriverOverride()
+{
+    return GDALAdbcLoadDriver;
+}
diff --git a/gcore/gdal_adbc.h b/gcore/gdal_adbc.h
new file mode 100644
index 000000000000..3132e370afad
--- /dev/null
+++ b/gcore/gdal_adbc.h
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * Name:     gdal_adbc.h
+ * Project:  GDAL Core
+ * Purpose:  GDAL Core ADBC related declarations.
+ * Author:   Even Rouault <even dot rouault at spatialys.com>
+ *
+ ******************************************************************************
+ * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2024, Dewey Dunnington <dewey@voltrondata.com>
+ *
+ * SPDX-License-Identifier: MIT
+ ****************************************************************************/
+
+#ifndef GDAL_ADBC_H_INCLUDED
+#define GDAL_ADBC_H_INCLUDED
+
+/**
+ * \file gdal_adbc.h
+ *
+ * C GDAL entry points for Arrow Database Connectivity (ADBC)
+ *
+ * These functions provide an opportunity to override the mechanism
+ * that locates and loads ADBC drivers, or provide one if GDAL was
+ * not built with ADBC driver manager support.
+ *
+ * \since GDAL 3.11
+ */
+
+#include "cpl_port.h"
+
+#include <stdint.h>
+
+CPL_C_START
+
+/** Type of a callback function to load a ADBC driver. */
+typedef uint8_t (*GDALAdbcLoadDriverFunc)(const char *driver_name,
+                                          const char *entrypoint, int version,
+                                          void *driver, void *error);
+
+void CPL_DLL GDALSetAdbcLoadDriverOverride(GDALAdbcLoadDriverFunc init_func);
+
+GDALAdbcLoadDriverFunc CPL_DLL GDALGetAdbcLoadDriverOverride(void);
+
+CPL_C_END
+
+#endif
diff --git a/ogr/ogrsf_frmts/CMakeLists.txt b/ogr/ogrsf_frmts/CMakeLists.txt
index ac7feb80f52c..d9337012cae0 100644
--- a/ogr/ogrsf_frmts/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/CMakeLists.txt
@@ -84,6 +84,7 @@ ogr_optional_driver(jml JML)
 ogr_optional_driver(vdv "VDV-451/VDV-452/INTREST Data Format")
 ogr_optional_driver(flatgeobuf FlatGeobuf)
 ogr_optional_driver(mapml MapML)
+ogr_optional_driver(adbc ADBC)
 
 if( NOT WORDS_BIGENDIAN )
     ogr_optional_driver(miramon "MiraMonVector")
@@ -113,7 +114,6 @@ ogr_dependent_driver(oapif "OGC API Features service" "GDAL_USE_CURL")
 ogr_dependent_driver(ngw "NextGIS Web" "GDAL_USE_CURL")
 ogr_dependent_driver(elastic "ElasticSearch" "GDAL_USE_CURL")
 ogr_dependent_driver(xodr OpenDRIVE "GDAL_USE_OPENDRIVE;GDAL_USE_GEOS")
-ogr_dependent_driver(adbc ADBC "GDAL_USE_ADBCDRIVERMANAGER")
 
 ogr_dependent_driver(idrisi IDRISI "GDAL_ENABLE_DRIVER_IDRISI")
 
diff --git a/ogr/ogrsf_frmts/adbc/CMakeLists.txt b/ogr/ogrsf_frmts/adbc/CMakeLists.txt
index 5f12eb1d4afe..fd60b66fcd44 100644
--- a/ogr/ogrsf_frmts/adbc/CMakeLists.txt
+++ b/ogr/ogrsf_frmts/adbc/CMakeLists.txt
@@ -10,6 +10,10 @@ add_gdal_driver(
   NO_SHARED_SYMBOL_WITH_CORE
   STRONG_CXX_WFLAGS)
 
+if(TARGET ogr_ADBC_core AND GDAL_USE_ADBCDRIVERMANAGER AND TARGET AdbcDriverManager::adbc_driver_manager_shared)
+    target_compile_definitions(ogr_ADBC_core PRIVATE OGR_ADBC_HAS_DRIVER_MANAGER)
+endif()
+
 if(NOT TARGET ogr_ADBC)
     return()
 endif()
@@ -17,4 +21,8 @@ endif()
 gdal_standard_includes(ogr_ADBC)
 target_include_directories(ogr_ADBC PRIVATE $<TARGET_PROPERTY:ogrsf_generic,SOURCE_DIR>
                                             $<TARGET_PROPERTY:ogr_MEM,SOURCE_DIR>)
-gdal_target_link_libraries(ogr_ADBC PRIVATE AdbcDriverManager::adbc_driver_manager_shared)
+
+if (GDAL_USE_ADBCDRIVERMANAGER AND TARGET AdbcDriverManager::adbc_driver_manager_shared)
+  gdal_target_link_libraries(ogr_ADBC PRIVATE AdbcDriverManager::adbc_driver_manager_shared)
+  target_compile_definitions(ogr_ADBC PRIVATE OGR_ADBC_HAS_DRIVER_MANAGER)
+endif()
diff --git a/ogr/ogrsf_frmts/adbc/ogr_adbc.h b/ogr/ogrsf_frmts/adbc/ogr_adbc.h
index 03ea21a1f378..d1d8e0662060 100644
--- a/ogr/ogrsf_frmts/adbc/ogr_adbc.h
+++ b/ogr/ogrsf_frmts/adbc/ogr_adbc.h
@@ -17,7 +17,7 @@
 #include "ogrsf_frmts.h"
 #include "ogrlayerarrow.h"
 
-#include <arrow-adbc/adbc.h>
+#include "ogr_adbc_internal.h"
 
 /************************************************************************/
 /*                 OGRArrowArrayToOGRFeatureAdapterLayer                */
@@ -138,6 +138,7 @@ class OGRADBCDataset final : public GDALDataset
 {
     friend class OGRADBCLayer;
 
+    AdbcDriver m_driver{};
     AdbcDatabase m_database{};
     std::unique_ptr<AdbcConnection> m_connection{};
     std::vector<std::unique_ptr<OGRLayer>> m_apoLayers{};
@@ -175,12 +176,9 @@ class OGRADBCDataset final : public GDALDataset
 
 struct OGRADBCError
 {
-    AdbcError error{};
+    AdbcError error{ADBC_ERROR_INIT};
 
-    inline OGRADBCError()
-    {
-        memset(&error, 0, sizeof(error));
-    }
+    inline OGRADBCError() = default;
 
     inline ~OGRADBCError()
     {
diff --git a/ogr/ogrsf_frmts/adbc/ogr_adbc_internal.h b/ogr/ogrsf_frmts/adbc/ogr_adbc_internal.h
new file mode 100644
index 000000000000..b965672e6f48
--- /dev/null
+++ b/ogr/ogrsf_frmts/adbc/ogr_adbc_internal.h
@@ -0,0 +1,2356 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+/// \file arrow-adbc/adbc.h ADBC: Arrow Database connectivity
+///
+/// An Arrow-based interface between applications and database
+/// drivers.  ADBC aims to provide a vendor-independent API for SQL
+/// and Substrait-based database access that is targeted at
+/// analytics/OLAP use cases.
+///
+/// This API is intended to be implemented directly by drivers and
+/// used directly by client applications.  To assist portability
+/// between different vendors, a "driver manager" library is also
+/// provided, which implements this same API, but dynamically loads
+/// drivers internally and forwards calls appropriately.
+///
+/// ADBC uses structs with free functions that operate on those
+/// structs to model objects.
+///
+/// In general, objects allow serialized access from multiple threads,
+/// but not concurrent access.  Specific implementations may permit
+/// multiple threads.
+///
+/// \version 1.1.0
+
+#pragma once
+
+#include <stddef.h>
+#include <stdint.h>
+
+/// \defgroup Arrow C Data Interface
+/// Definitions for the C Data Interface/C Stream Interface.
+///
+/// See https://arrow.apache.org/docs/format/CDataInterface.html
+///
+/// @{
+
+//! @cond Doxygen_Suppress
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Extra guard for versions of Arrow without the canonical guard
+#ifndef ARROW_FLAG_DICTIONARY_ORDERED
+
+#ifndef ARROW_C_DATA_INTERFACE
+#define ARROW_C_DATA_INTERFACE
+
+#define ARROW_FLAG_DICTIONARY_ORDERED 1
+#define ARROW_FLAG_NULLABLE 2
+#define ARROW_FLAG_MAP_KEYS_SORTED 4
+
+struct ArrowSchema {
+  // Array type description
+  const char* format;
+  const char* name;
+  const char* metadata;
+  int64_t flags;
+  int64_t n_children;
+  struct ArrowSchema** children;
+  struct ArrowSchema* dictionary;
+
+  // Release callback
+  void (*release)(struct ArrowSchema*);
+  // Opaque producer-specific data
+  void* private_data;
+};
+
+struct ArrowArray {
+  // Array data description
+  int64_t length;
+  int64_t null_count;
+  int64_t offset;
+  int64_t n_buffers;
+  int64_t n_children;
+  const void** buffers;
+  struct ArrowArray** children;
+  struct ArrowArray* dictionary;
+
+  // Release callback
+  void (*release)(struct ArrowArray*);
+  // Opaque producer-specific data
+  void* private_data;
+};
+
+#endif  // ARROW_C_DATA_INTERFACE
+
+#ifndef ARROW_C_STREAM_INTERFACE
+#define ARROW_C_STREAM_INTERFACE
+
+struct ArrowArrayStream {
+  // Callback to get the stream type
+  // (will be the same for all arrays in the stream).
+  //
+  // Return value: 0 if successful, an `errno`-compatible error code otherwise.
+  //
+  // If successful, the ArrowSchema must be released independently from the stream.
+  int (*get_schema)(struct ArrowArrayStream*, struct ArrowSchema* out);
+
+  // Callback to get the next array
+  // (if no error and the array is released, the stream has ended)
+  //
+  // Return value: 0 if successful, an `errno`-compatible error code otherwise.
+  //
+  // If successful, the ArrowArray must be released independently from the stream.
+  int (*get_next)(struct ArrowArrayStream*, struct ArrowArray* out);
+
+  // Callback to get optional detailed error information.
+  // This must only be called if the last stream operation failed
+  // with a non-0 return code.
+  //
+  // Return value: pointer to a null-terminated character array describing
+  // the last error, or NULL if no description is available.
+  //
+  // The returned pointer is only valid until the next operation on this stream
+  // (including release).
+  const char* (*get_last_error)(struct ArrowArrayStream*);
+
+  // Release callback: release the stream's own resources.
+  // Note that arrays returned by `get_next` must be individually released.
+  void (*release)(struct ArrowArrayStream*);
+
+  // Opaque producer-specific data
+  void* private_data;
+};
+
+#endif  // ARROW_C_STREAM_INTERFACE
+#endif  // ARROW_FLAG_DICTIONARY_ORDERED
+
+//! @endcond
+
+/// @}
+
+#ifndef ADBC
+#define ADBC
+
+// Storage class macros for Windows
+// Allow overriding/aliasing with application-defined macros
+#if !defined(ADBC_EXPORT)
+#if defined(_WIN32)
+#if defined(ADBC_EXPORTING)
+#define ADBC_EXPORT __declspec(dllexport)
+#else
+#define ADBC_EXPORT __declspec(dllimport)
+#endif  // defined(ADBC_EXPORTING)
+#else
+#define ADBC_EXPORT
+#endif  // defined(_WIN32)
+#endif  // !defined(ADBC_EXPORT)
+
+/// \defgroup adbc-error-handling Error Handling
+/// ADBC uses integer error codes to signal errors. To provide more
+/// detail about errors, functions may also return an AdbcError via an
+/// optional out parameter, which can be inspected. If provided, it is
+/// the responsibility of the caller to zero-initialize the AdbcError
+/// value.
+///
+/// @{
+
+/// \brief Error codes for operations that may fail.
+typedef uint8_t AdbcStatusCode;
+
+/// \brief No error.
+#define ADBC_STATUS_OK 0
+/// \brief An unknown error occurred.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_UNKNOWN 1
+/// \brief The operation is not implemented or supported.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_NOT_IMPLEMENTED 2
+/// \brief A requested resource was not found.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_NOT_FOUND 3
+/// \brief A requested resource already exists.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_ALREADY_EXISTS 4
+/// \brief The arguments are invalid, likely a programming error.
+///
+/// For instance, they may be of the wrong format, or out of range.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_INVALID_ARGUMENT 5
+/// \brief The preconditions for the operation are not met, likely a
+///   programming error.
+///
+/// For instance, the object may be uninitialized, or may have not
+/// been fully configured.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_INVALID_STATE 6
+/// \brief Invalid data was processed (not a programming error).
+///
+/// For instance, a division by zero may have occurred during query
+/// execution.
+///
+/// May indicate a database-side error only.
+#define ADBC_STATUS_INVALID_DATA 7
+/// \brief The database's integrity was affected.
+///
+/// For instance, a foreign key check may have failed, or a uniqueness
+/// constraint may have been violated.
+///
+/// May indicate a database-side error only.
+#define ADBC_STATUS_INTEGRITY 8
+/// \brief An error internal to the driver or database occurred.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_INTERNAL 9
+/// \brief An I/O error occurred.
+///
+/// For instance, a remote service may be unavailable.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_IO 10
+/// \brief The operation was cancelled, not due to a timeout.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_CANCELLED 11
+/// \brief The operation was cancelled due to a timeout.
+///
+/// May indicate a driver-side or database-side error.
+#define ADBC_STATUS_TIMEOUT 12
+/// \brief Authentication failed.
+///
+/// May indicate a database-side error only.
+#define ADBC_STATUS_UNAUTHENTICATED 13
+/// \brief The client is not authorized to perform the given operation.
+///
+/// May indicate a database-side error only.
+#define ADBC_STATUS_UNAUTHORIZED 14
+
+/// \brief Inform the driver/driver manager that we are using the extended
+///   AdbcError struct from ADBC 1.1.0.
+///
+/// See the AdbcError documentation for usage.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA INT32_MIN
+
+/// \brief A detailed error message for an operation.
+///
+/// The caller must zero-initialize this struct (clarified in ADBC 1.1.0).
+///
+/// The structure was extended in ADBC 1.1.0.  Drivers and clients using ADBC
+/// 1.0.0 will not have the private_data or private_driver fields.  Drivers
+/// should read/write these fields if and only if vendor_code is equal to
+/// ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA.  Clients are required to initialize
+/// this struct to avoid the possibility of uninitialized values confusing the
+/// driver.
+struct ADBC_EXPORT AdbcError {
+  /// \brief The error message.
+  char* message;
+
+  /// \brief A vendor-specific error code, if applicable.
+  int32_t vendor_code;
+
+  /// \brief A SQLSTATE error code, if provided, as defined by the
+  ///   SQL:2003 standard.  If not set, it should be set to
+  ///   "\0\0\0\0\0".
+  char sqlstate[5];
+
+  /// \brief Release the contained error.
+  ///
+  /// Unlike other structures, this is an embedded callback to make it
+  /// easier for the driver manager and driver to cooperate.
+  void (*release)(struct AdbcError* error);
+
+  /// \brief Opaque implementation-defined state.
+  ///
+  /// This field may not be used unless vendor_code is
+  /// ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA.  If present, this field is NULLPTR
+  /// iff the error is unintialized/freed.
+  ///
+  /// \since ADBC API revision 1.1.0
+  void* private_data;
+
+  /// \brief The associated driver (used by the driver manager to help
+  ///   track state).
+  ///
+  /// This field may not be used unless vendor_code is
+  /// ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA.
+  ///
+  /// \since ADBC API revision 1.1.0
+  struct AdbcDriver* private_driver;
+};
+
+#ifdef __cplusplus
+/// \brief A helper to initialize the full AdbcError structure.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_ERROR_INIT                           \
+  (AdbcError{nullptr,                             \
+             ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA, \
+             {0, 0, 0, 0, 0},                     \
+             nullptr,                             \
+             nullptr,                             \
+             nullptr})
+#else
+/// \brief A helper to initialize the full AdbcError structure.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_ERROR_INIT \
+  ((struct AdbcError){  \
+      NULL, ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA, {0, 0, 0, 0, 0}, NULL, NULL, NULL})
+#endif
+
+/// \brief The size of the AdbcError structure in ADBC 1.0.0.
+///
+/// Drivers written for ADBC 1.1.0 and later should never touch more than this
+/// portion of an AdbcDriver struct when vendor_code is not
+/// ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_ERROR_1_0_0_SIZE (offsetof(struct AdbcError, private_data))
+/// \brief The size of the AdbcError structure in ADBC 1.1.0.
+///
+/// Drivers written for ADBC 1.1.0 and later should never touch more than this
+/// portion of an AdbcDriver struct when vendor_code is
+/// ADBC_ERROR_VENDOR_CODE_PRIVATE_DATA.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_ERROR_1_1_0_SIZE (sizeof(struct AdbcError))
+
+/// \brief Extra key-value metadata for an error.
+///
+/// The fields here are owned by the driver and should not be freed.  The
+/// fields here are invalidated when the release callback in AdbcError is
+/// called.
+///
+/// \since ADBC API revision 1.1.0
+struct ADBC_EXPORT AdbcErrorDetail {
+  /// \brief The metadata key.
+  const char* key;
+  /// \brief The binary metadata value.
+  const uint8_t* value;
+  /// \brief The length of the metadata value.
+  size_t value_length;
+};
+
+/// \brief Get the number of metadata values available in an error.
+///
+/// \since ADBC API revision 1.1.0
+ADBC_EXPORT
+int AdbcErrorGetDetailCount(const struct AdbcError* error);
+
+/// \brief Get a metadata value in an error by index.
+///
+/// If index is invalid, returns an AdbcErrorDetail initialized with NULL/0
+/// fields.
+///
+/// \since ADBC API revision 1.1.0
+ADBC_EXPORT
+struct AdbcErrorDetail AdbcErrorGetDetail(const struct AdbcError* error, int index);
+
+/// \brief Get an ADBC error from an ArrowArrayStream created by a driver.
+///
+/// This allows retrieving error details and other metadata that would
+/// normally be suppressed by the Arrow C Stream Interface.
+///
+/// The caller MUST NOT release the error; it is managed by the release
+/// callback in the stream itself.
+///
+/// \param[in] stream The stream to query.
+/// \param[out] status The ADBC status code, or ADBC_STATUS_OK if there is no
+///   error.  Not written to if the stream does not contain an ADBC error or
+///   if the pointer is NULL.
+/// \return NULL if not supported.
+/// \since ADBC API revision 1.1.0
+ADBC_EXPORT
+const struct AdbcError* AdbcErrorFromArrayStream(struct ArrowArrayStream* stream,
+                                                 AdbcStatusCode* status);
+
+/// @}
+
+/// \defgroup adbc-constants Constants
+/// @{
+
+/// \brief ADBC revision 1.0.0.
+///
+/// When passed to an AdbcDriverInitFunc(), the driver parameter must
+/// point to an AdbcDriver.
+#define ADBC_VERSION_1_0_0 1000000
+
+/// \brief ADBC revision 1.1.0.
+///
+/// When passed to an AdbcDriverInitFunc(), the driver parameter must
+/// point to an AdbcDriver.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_VERSION_1_1_0 1001000
+
+/// \brief Canonical option value for enabling an option.
+///
+/// For use as the value in SetOption calls.
+#define ADBC_OPTION_VALUE_ENABLED "true"
+/// \brief Canonical option value for disabling an option.
+///
+/// For use as the value in SetOption calls.
+#define ADBC_OPTION_VALUE_DISABLED "false"
+
+/// \brief Canonical option name for URIs.
+///
+/// Should be used as the expected option name to specify a URI for
+/// any ADBC driver.
+///
+/// The type is char*.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_OPTION_URI "uri"
+/// \brief Canonical option name for usernames.
+///
+/// Should be used as the expected option name to specify a username
+/// to a driver for authentication.
+///
+/// The type is char*.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_OPTION_USERNAME "username"
+/// \brief Canonical option name for passwords.
+///
+/// Should be used as the expected option name to specify a password
+/// for authentication to a driver.
+///
+/// The type is char*.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_OPTION_PASSWORD "password"
+
+/// \brief The database vendor/product name (e.g. the server name).
+///   (type: utf8).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_VENDOR_NAME 0
+/// \brief The database vendor/product version (type: utf8).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_VENDOR_VERSION 1
+/// \brief The database vendor/product Arrow library version (type:
+///   utf8).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_VENDOR_ARROW_VERSION 2
+/// \brief Indicates whether SQL queries are supported (type: bool).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_VENDOR_SQL 3
+/// \brief Indicates whether Substrait queries are supported (type: bool).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_VENDOR_SUBSTRAIT 4
+/// \brief The minimum supported Substrait version, or null if
+///   Substrait is not supported (type: utf8).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_VENDOR_SUBSTRAIT_MIN_VERSION 5
+/// \brief The maximum supported Substrait version, or null if
+///   Substrait is not supported (type: utf8).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_VENDOR_SUBSTRAIT_MAX_VERSION 6
+
+/// \brief The driver name (type: utf8).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_DRIVER_NAME 100
+/// \brief The driver version (type: utf8).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_DRIVER_VERSION 101
+/// \brief The driver Arrow library version (type: utf8).
+///
+/// \see AdbcConnectionGetInfo
+#define ADBC_INFO_DRIVER_ARROW_VERSION 102
+/// \brief The driver ADBC API version (type: int64).
+///
+/// The value should be one of the ADBC_VERSION constants.
+///
+/// \since ADBC API revision 1.1.0
+/// \see AdbcConnectionGetInfo
+/// \see ADBC_VERSION_1_0_0
+/// \see ADBC_VERSION_1_1_0
+#define ADBC_INFO_DRIVER_ADBC_VERSION 103
+
+/// \brief Return metadata on catalogs, schemas, tables, and columns.
+///
+/// \see AdbcConnectionGetObjects
+#define ADBC_OBJECT_DEPTH_ALL 0
+/// \brief Return metadata on catalogs only.
+///
+/// \see AdbcConnectionGetObjects
+#define ADBC_OBJECT_DEPTH_CATALOGS 1
+/// \brief Return metadata on catalogs and schemas.
+///
+/// \see AdbcConnectionGetObjects
+#define ADBC_OBJECT_DEPTH_DB_SCHEMAS 2
+/// \brief Return metadata on catalogs, schemas, and tables.
+///
+/// \see AdbcConnectionGetObjects
+#define ADBC_OBJECT_DEPTH_TABLES 3
+/// \brief Return metadata on catalogs, schemas, tables, and columns.
+///
+/// \see AdbcConnectionGetObjects
+#define ADBC_OBJECT_DEPTH_COLUMNS ADBC_OBJECT_DEPTH_ALL
+
+/// \defgroup adbc-table-statistics ADBC Statistic Types
+/// Standard statistic names for AdbcConnectionGetStatistics.
+/// @{
+
+/// \brief The dictionary-encoded name of the average byte width statistic.
+#define ADBC_STATISTIC_AVERAGE_BYTE_WIDTH_KEY 0
+/// \brief The average byte width statistic.  The average size in bytes of a
+///   row in the column.  Value type is float64.
+///
+/// For example, this is roughly the average length of a string for a string
+/// column.
+#define ADBC_STATISTIC_AVERAGE_BYTE_WIDTH_NAME "adbc.statistic.byte_width"
+/// \brief The dictionary-encoded name of the distinct value count statistic.
+#define ADBC_STATISTIC_DISTINCT_COUNT_KEY 1
+/// \brief The distinct value count (NDV) statistic.  The number of distinct
+///   values in the column.  Value type is int64 (when not approximate) or
+///   float64 (when approximate).
+#define ADBC_STATISTIC_DISTINCT_COUNT_NAME "adbc.statistic.distinct_count"
+/// \brief The dictionary-encoded name of the max byte width statistic.
+#define ADBC_STATISTIC_MAX_BYTE_WIDTH_KEY 2
+/// \brief The max byte width statistic.  The maximum size in bytes of a row
+///   in the column.  Value type is int64 (when not approximate) or float64
+///   (when approximate).
+///
+/// For example, this is the maximum length of a string for a string column.
+#define ADBC_STATISTIC_MAX_BYTE_WIDTH_NAME "adbc.statistic.max_byte_width"
+/// \brief The dictionary-encoded name of the max value statistic.
+#define ADBC_STATISTIC_MAX_VALUE_KEY 3
+/// \brief The max value statistic.  Value type is column-dependent.
+#define ADBC_STATISTIC_MAX_VALUE_NAME "adbc.statistic.max_value"
+/// \brief The dictionary-encoded name of the min value statistic.
+#define ADBC_STATISTIC_MIN_VALUE_KEY 4
+/// \brief The min value statistic.  Value type is column-dependent.
+#define ADBC_STATISTIC_MIN_VALUE_NAME "adbc.statistic.min_value"
+/// \brief The dictionary-encoded name of the null count statistic.
+#define ADBC_STATISTIC_NULL_COUNT_KEY 5
+/// \brief The null count statistic.  The number of values that are null in
+///   the column.  Value type is int64 (when not approximate) or float64
+///   (when approximate).
+#define ADBC_STATISTIC_NULL_COUNT_NAME "adbc.statistic.null_count"
+/// \brief The dictionary-encoded name of the row count statistic.
+#define ADBC_STATISTIC_ROW_COUNT_KEY 6
+/// \brief The row count statistic.  The number of rows in the column or
+///   table.  Value type is int64 (when not approximate) or float64 (when
+///   approximate).
+#define ADBC_STATISTIC_ROW_COUNT_NAME "adbc.statistic.row_count"
+/// @}
+
+/// \brief The name of the canonical option for whether autocommit is
+///   enabled.
+///
+/// The type is char*.
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_CONNECTION_OPTION_AUTOCOMMIT "adbc.connection.autocommit"
+
+/// \brief The name of the canonical option for whether the current
+///   connection should be restricted to being read-only.
+///
+/// The type is char*.
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_CONNECTION_OPTION_READ_ONLY "adbc.connection.readonly"
+
+/// \brief The name of the canonical option for the current catalog.
+///
+/// The type is char*.
+///
+/// \see AdbcConnectionGetOption
+/// \see AdbcConnectionSetOption
+/// \since ADBC API revision 1.1.0
+#define ADBC_CONNECTION_OPTION_CURRENT_CATALOG "adbc.connection.catalog"
+
+/// \brief The name of the canonical option for the current schema.
+///
+/// The type is char*.
+///
+/// \see AdbcConnectionGetOption
+/// \see AdbcConnectionSetOption
+/// \since ADBC API revision 1.1.0
+#define ADBC_CONNECTION_OPTION_CURRENT_DB_SCHEMA "adbc.connection.db_schema"
+
+/// \brief The name of the canonical option for making query execution
+///   nonblocking.
+///
+/// When enabled, AdbcStatementExecutePartitions will return
+/// partitions as soon as they are available, instead of returning
+/// them all at the end.  When there are no more to return, it will
+/// return an empty set of partitions.  AdbcStatementExecuteQuery and
+/// AdbcStatementExecuteSchema are not affected.
+///
+/// The default is ADBC_OPTION_VALUE_DISABLED.
+///
+/// The type is char*.
+///
+/// \see AdbcStatementSetOption
+/// \since ADBC API revision 1.1.0
+#define ADBC_STATEMENT_OPTION_INCREMENTAL "adbc.statement.exec.incremental"
+
+/// \brief The name of the option for getting the progress of a query.
+///
+/// The value is not necessarily in any particular range or have any
+/// particular units.  (For example, it might be a percentage, bytes of data,
+/// rows of data, number of workers, etc.)  The max value can be retrieved via
+/// ADBC_STATEMENT_OPTION_MAX_PROGRESS.  This represents the progress of
+/// execution, not of consumption (i.e., it is independent of how much of the
+/// result set has been read by the client via ArrowArrayStream.get_next().)
+///
+/// The type is double.
+///
+/// \see AdbcStatementGetOptionDouble
+/// \since ADBC API revision 1.1.0
+#define ADBC_STATEMENT_OPTION_PROGRESS "adbc.statement.exec.progress"
+
+/// \brief The name of the option for getting the maximum progress of a query.
+///
+/// This is the value of ADBC_STATEMENT_OPTION_PROGRESS for a completed query.
+/// If not supported, or if the value is nonpositive, then the maximum is not
+/// known.  (For instance, the query may be fully streaming and the driver
+/// does not know when the result set will end.)
+///
+/// The type is double.
+///
+/// \see AdbcStatementGetOptionDouble
+/// \since ADBC API revision 1.1.0
+#define ADBC_STATEMENT_OPTION_MAX_PROGRESS "adbc.statement.exec.max_progress"
+
+/// \brief The name of the canonical option for setting the isolation
+///   level of a transaction.
+///
+/// Should only be used in conjunction with autocommit disabled and
+/// AdbcConnectionCommit / AdbcConnectionRollback. If the desired
+/// isolation level is not supported by a driver, it should return an
+/// appropriate error.
+///
+/// The type is char*.
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_CONNECTION_OPTION_ISOLATION_LEVEL \
+  "adbc.connection.transaction.isolation_level"
+
+/// \brief Use database or driver default isolation level
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_OPTION_ISOLATION_LEVEL_DEFAULT \
+  "adbc.connection.transaction.isolation.default"
+
+/// \brief The lowest isolation level. Dirty reads are allowed, so one
+///   transaction may see not-yet-committed changes made by others.
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_OPTION_ISOLATION_LEVEL_READ_UNCOMMITTED \
+  "adbc.connection.transaction.isolation.read_uncommitted"
+
+/// \brief Lock-based concurrency control keeps write locks until the
+///   end of the transaction, but read locks are released as soon as a
+///   SELECT is performed. Non-repeatable reads can occur in this
+///   isolation level.
+///
+/// More simply put, Read Committed is an isolation level that guarantees
+/// that any data read is committed at the moment it is read. It simply
+/// restricts the reader from seeing any intermediate, uncommitted,
+/// 'dirty' reads. It makes no promise whatsoever that if the transaction
+/// re-issues the read, it will find the same data; data is free to change
+/// after it is read.
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_OPTION_ISOLATION_LEVEL_READ_COMMITTED \
+  "adbc.connection.transaction.isolation.read_committed"
+
+/// \brief Lock-based concurrency control keeps read AND write locks
+///   (acquired on selection data) until the end of the transaction.
+///
+/// However, range-locks are not managed, so phantom reads can occur.
+/// Write skew is possible at this isolation level in some systems.
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_OPTION_ISOLATION_LEVEL_REPEATABLE_READ \
+  "adbc.connection.transaction.isolation.repeatable_read"
+
+/// \brief This isolation guarantees that all reads in the transaction
+///   will see a consistent snapshot of the database and the transaction
+///   should only successfully commit if no updates conflict with any
+///   concurrent updates made since that snapshot.
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_OPTION_ISOLATION_LEVEL_SNAPSHOT \
+  "adbc.connection.transaction.isolation.snapshot"
+
+/// \brief Serializability requires read and write locks to be released
+///   only at the end of the transaction. This includes acquiring range-
+///   locks when a select query uses a ranged WHERE clause to avoid
+///   phantom reads.
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_OPTION_ISOLATION_LEVEL_SERIALIZABLE \
+  "adbc.connection.transaction.isolation.serializable"
+
+/// \brief The central distinction between serializability and linearizability
+///   is that serializability is a global property; a property of an entire
+///   history of operations and transactions. Linearizability is a local
+///   property; a property of a single operation/transaction.
+///
+/// Linearizability can be viewed as a special case of strict serializability
+/// where transactions are restricted to consist of a single operation applied
+/// to a single object.
+///
+/// \see AdbcConnectionSetOption
+#define ADBC_OPTION_ISOLATION_LEVEL_LINEARIZABLE \
+  "adbc.connection.transaction.isolation.linearizable"
+
+/// \defgroup adbc-statement-ingestion Bulk Data Ingestion
+/// While it is possible to insert data via prepared statements, it can
+/// be more efficient to explicitly perform a bulk insert.  For
+/// compatible drivers, this can be accomplished by setting up and
+/// executing a statement.  Instead of setting a SQL query or Substrait
+/// plan, bind the source data via AdbcStatementBind, and set the name
+/// of the table to be created via AdbcStatementSetOption and the
+/// options below.  Then, call AdbcStatementExecute with a NULL for
+/// the out parameter (to indicate you do not expect a result set).
+///
+/// @{
+
+/// \brief The name of the target table for a bulk insert.
+///
+/// The driver should attempt to create the table if it does not
+/// exist.  If the table exists but has a different schema,
+/// ADBC_STATUS_ALREADY_EXISTS should be raised.  Else, data should be
+/// appended to the target table.
+///
+/// The type is char*.
+#define ADBC_INGEST_OPTION_TARGET_TABLE "adbc.ingest.target_table"
+/// \brief Whether to create (the default) or append.
+///
+/// The type is char*.
+#define ADBC_INGEST_OPTION_MODE "adbc.ingest.mode"
+/// \brief Create the table and insert data; error if the table exists.
+#define ADBC_INGEST_OPTION_MODE_CREATE "adbc.ingest.mode.create"
+/// \brief Do not create the table, and insert data; error if the
+///   table does not exist (ADBC_STATUS_NOT_FOUND) or does not match
+///   the schema of the data to append (ADBC_STATUS_ALREADY_EXISTS).
+#define ADBC_INGEST_OPTION_MODE_APPEND "adbc.ingest.mode.append"
+/// \brief Create the table and insert data; drop the original table
+///   if it already exists.
+/// \since ADBC API revision 1.1.0
+#define ADBC_INGEST_OPTION_MODE_REPLACE "adbc.ingest.mode.replace"
+/// \brief Insert data; create the table if it does not exist, or
+///   error if the table exists, but the schema does not match the
+///   schema of the data to append (ADBC_STATUS_ALREADY_EXISTS).
+/// \since ADBC API revision 1.1.0
+#define ADBC_INGEST_OPTION_MODE_CREATE_APPEND "adbc.ingest.mode.create_append"
+/// \brief The catalog of the table for bulk insert.
+///
+/// The type is char*.
+#define ADBC_INGEST_OPTION_TARGET_CATALOG "adbc.ingest.target_catalog"
+/// \brief The schema of the table for bulk insert.
+///
+/// The type is char*.
+#define ADBC_INGEST_OPTION_TARGET_DB_SCHEMA "adbc.ingest.target_db_schema"
+/// \brief Use a temporary table for ingestion.
+///
+/// The value should be ADBC_OPTION_VALUE_ENABLED or
+/// ADBC_OPTION_VALUE_DISABLED (the default).
+///
+/// This is not supported with ADBC_INGEST_OPTION_TARGET_CATALOG and
+/// ADBC_INGEST_OPTION_TARGET_DB_SCHEMA.
+///
+/// The type is char*.
+#define ADBC_INGEST_OPTION_TEMPORARY "adbc.ingest.temporary"
+
+/// @}
+
+/// @}
+
+/// \defgroup adbc-database Database Initialization
+/// Clients first initialize a database, then create a connection
+/// (below).  This gives the implementation a place to initialize and
+/// own any common connection state.  For example, in-memory databases
+/// can place ownership of the actual database in this object.
+/// @{
+
+/// \brief An instance of a database.
+///
+/// Must be kept alive as long as any connections exist.
+struct ADBC_EXPORT AdbcDatabase {
+  /// \brief Opaque implementation-defined state.
+  /// This field is NULLPTR iff the connection is unintialized/freed.
+  void* private_data;
+  /// \brief The associated driver (used by the driver manager to help
+  ///   track state).
+  struct AdbcDriver* private_driver;
+};
+
+/// @}
+
+/// \defgroup adbc-connection Connection Establishment
+/// Functions for creating, using, and releasing database connections.
+/// @{
+
+/// \brief An active database connection.
+///
+/// Provides methods for query execution, managing prepared
+/// statements, using transactions, and so on.
+///
+/// Connections are not required to be thread-safe, but they can be
+/// used from multiple threads so long as clients take care to
+/// serialize accesses to a connection.
+struct ADBC_EXPORT AdbcConnection {
+  /// \brief Opaque implementation-defined state.
+  /// This field is NULLPTR iff the connection is unintialized/freed.
+  void* private_data;
+  /// \brief The associated driver (used by the driver manager to help
+  ///   track state).
+  struct AdbcDriver* private_driver;
+};
+
+/// @}
+
+/// \defgroup adbc-statement Managing Statements
+/// Applications should first initialize a statement with
+/// AdbcStatementNew. Then, the statement should be configured with
+/// functions like AdbcStatementSetSqlQuery and
+/// AdbcStatementSetOption. Finally, the statement can be executed
+/// with AdbcStatementExecuteQuery (or call AdbcStatementPrepare first
+/// to turn it into a prepared statement instead).
+/// @{
+
+/// \brief A container for all state needed to execute a database
+/// query, such as the query itself, parameters for prepared
+/// statements, driver parameters, etc.
+///
+/// Statements may represent queries or prepared statements.
+///
+/// Statements may be used multiple times and can be reconfigured
+/// (e.g. they can be reused to execute multiple different queries).
+/// However, executing a statement (and changing certain other state)
+/// will invalidate result sets obtained prior to that execution.
+///
+/// Multiple statements may be created from a single connection.
+/// However, the driver may block or error if they are used
+/// concurrently (whether from a single thread or multiple threads).
+///
+/// Statements are not required to be thread-safe, but they can be
+/// used from multiple threads so long as clients take care to
+/// serialize accesses to a statement.
+struct ADBC_EXPORT AdbcStatement {
+  /// \brief Opaque implementation-defined state.
+  /// This field is NULLPTR iff the connection is unintialized/freed.
+  void* private_data;
+
+  /// \brief The associated driver (used by the driver manager to help
+  ///   track state).
+  struct AdbcDriver* private_driver;
+};
+
+/// \defgroup adbc-statement-partition Partitioned Results
+/// Some backends may internally partition the results. These
+/// partitions are exposed to clients who may wish to integrate them
+/// with a threaded or distributed execution model, where partitions
+/// can be divided among threads or machines and fetched in parallel.
+///
+/// To use partitioning, execute the statement with
+/// AdbcStatementExecutePartitions to get the partition descriptors.
+/// Call AdbcConnectionReadPartition to turn the individual
+/// descriptors into ArrowArrayStream instances.  This may be done on
+/// a different connection than the one the partition was created
+/// with, or even in a different process on another machine.
+///
+/// Drivers are not required to support partitioning.
+///
+/// @{
+
+/// \brief The partitions of a distributed/partitioned result set.
+struct AdbcPartitions {
+  /// \brief The number of partitions.
+  size_t num_partitions;
+
+  /// \brief The partitions of the result set, where each entry (up to
+  ///   num_partitions entries) is an opaque identifier that can be
+  ///   passed to AdbcConnectionReadPartition.
+  const uint8_t** partitions;
+
+  /// \brief The length of each corresponding entry in partitions.
+  const size_t* partition_lengths;
+
+  /// \brief Opaque implementation-defined state.
+  /// This field is NULLPTR iff the connection is unintialized/freed.
+  void* private_data;
+
+  /// \brief Release the contained partitions.
+  ///
+  /// Unlike other structures, this is an embedded callback to make it
+  /// easier for the driver manager and driver to cooperate.
+  void (*release)(struct AdbcPartitions* partitions);
+};
+
+/// @}
+
+/// @}
+
+/// \defgroup adbc-driver Driver Initialization
+///
+/// These functions are intended to help support integration between a
+/// driver and the driver manager.
+/// @{
+
+/// \brief An instance of an initialized database driver.
+///
+/// This provides a common interface for vendor-specific driver
+/// initialization routines. Drivers should populate this struct, and
+/// applications can call ADBC functions through this struct, without
+/// worrying about multiple definitions of the same symbol.
+struct ADBC_EXPORT AdbcDriver {
+  /// \brief Opaque driver-defined state.
+  /// This field is NULL if the driver is unintialized/freed (but
+  /// it need not have a value even if the driver is initialized).
+  void* private_data;
+  /// \brief Opaque driver manager-defined state.
+  /// This field is NULL if the driver is unintialized/freed (but
+  /// it need not have a value even if the driver is initialized).
+  void* private_manager;
+
+  /// \brief Release the driver and perform any cleanup.
+  ///
+  /// This is an embedded callback to make it easier for the driver
+  /// manager and driver to cooperate.
+  AdbcStatusCode (*release)(struct AdbcDriver* driver, struct AdbcError* error);
+
+  AdbcStatusCode (*DatabaseInit)(struct AdbcDatabase*, struct AdbcError*);
+  AdbcStatusCode (*DatabaseNew)(struct AdbcDatabase*, struct AdbcError*);
+  AdbcStatusCode (*DatabaseSetOption)(struct AdbcDatabase*, const char*, const char*,
+                                      struct AdbcError*);
+  AdbcStatusCode (*DatabaseRelease)(struct AdbcDatabase*, struct AdbcError*);
+
+  AdbcStatusCode (*ConnectionCommit)(struct AdbcConnection*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetInfo)(struct AdbcConnection*, const uint32_t*, size_t,
+                                      struct ArrowArrayStream*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetObjects)(struct AdbcConnection*, int, const char*,
+                                         const char*, const char*, const char**,
+                                         const char*, struct ArrowArrayStream*,
+                                         struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetTableSchema)(struct AdbcConnection*, const char*,
+                                             const char*, const char*,
+                                             struct ArrowSchema*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetTableTypes)(struct AdbcConnection*,
+                                            struct ArrowArrayStream*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionInit)(struct AdbcConnection*, struct AdbcDatabase*,
+                                   struct AdbcError*);
+  AdbcStatusCode (*ConnectionNew)(struct AdbcConnection*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionSetOption)(struct AdbcConnection*, const char*, const char*,
+                                        struct AdbcError*);
+  AdbcStatusCode (*ConnectionReadPartition)(struct AdbcConnection*, const uint8_t*,
+                                            size_t, struct ArrowArrayStream*,
+                                            struct AdbcError*);
+  AdbcStatusCode (*ConnectionRelease)(struct AdbcConnection*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionRollback)(struct AdbcConnection*, struct AdbcError*);
+
+  AdbcStatusCode (*StatementBind)(struct AdbcStatement*, struct ArrowArray*,
+                                  struct ArrowSchema*, struct AdbcError*);
+  AdbcStatusCode (*StatementBindStream)(struct AdbcStatement*, struct ArrowArrayStream*,
+                                        struct AdbcError*);
+  AdbcStatusCode (*StatementExecuteQuery)(struct AdbcStatement*, struct ArrowArrayStream*,
+                                          int64_t*, struct AdbcError*);
+  AdbcStatusCode (*StatementExecutePartitions)(struct AdbcStatement*, struct ArrowSchema*,
+                                               struct AdbcPartitions*, int64_t*,
+                                               struct AdbcError*);
+  AdbcStatusCode (*StatementGetParameterSchema)(struct AdbcStatement*,
+                                                struct ArrowSchema*, struct AdbcError*);
+  AdbcStatusCode (*StatementNew)(struct AdbcConnection*, struct AdbcStatement*,
+                                 struct AdbcError*);
+  AdbcStatusCode (*StatementPrepare)(struct AdbcStatement*, struct AdbcError*);
+  AdbcStatusCode (*StatementRelease)(struct AdbcStatement*, struct AdbcError*);
+  AdbcStatusCode (*StatementSetOption)(struct AdbcStatement*, const char*, const char*,
+                                       struct AdbcError*);
+  AdbcStatusCode (*StatementSetSqlQuery)(struct AdbcStatement*, const char*,
+                                         struct AdbcError*);
+  AdbcStatusCode (*StatementSetSubstraitPlan)(struct AdbcStatement*, const uint8_t*,
+                                              size_t, struct AdbcError*);
+
+  /// \defgroup adbc-1.1.0 ADBC API Revision 1.1.0
+  ///
+  /// Functions added in ADBC 1.1.0.  For backwards compatibility,
+  /// these members must not be accessed unless the version passed to
+  /// the AdbcDriverInitFunc is greater than or equal to
+  /// ADBC_VERSION_1_1_0.
+  ///
+  /// For a 1.0.0 driver being loaded by a 1.1.0 driver manager: the
+  /// 1.1.0 manager will allocate the new, expanded AdbcDriver struct
+  /// and attempt to have the driver initialize it with
+  /// ADBC_VERSION_1_1_0.  This must return an error, after which the
+  /// driver will try again with ADBC_VERSION_1_0_0.  The driver must
+  /// not access the new fields, which will carry undefined values.
+  ///
+  /// For a 1.1.0 driver being loaded by a 1.0.0 driver manager: the
+  /// 1.0.0 manager will allocate the old AdbcDriver struct and
+  /// attempt to have the driver initialize it with
+  /// ADBC_VERSION_1_0_0.  The driver must not access the new fields,
+  /// and should initialize the old fields.
+  ///
+  /// @{
+
+  int (*ErrorGetDetailCount)(const struct AdbcError* error);
+  struct AdbcErrorDetail (*ErrorGetDetail)(const struct AdbcError* error, int index);
+  const struct AdbcError* (*ErrorFromArrayStream)(struct ArrowArrayStream* stream,
+                                                  AdbcStatusCode* status);
+
+  AdbcStatusCode (*DatabaseGetOption)(struct AdbcDatabase*, const char*, char*, size_t*,
+                                      struct AdbcError*);
+  AdbcStatusCode (*DatabaseGetOptionBytes)(struct AdbcDatabase*, const char*, uint8_t*,
+                                           size_t*, struct AdbcError*);
+  AdbcStatusCode (*DatabaseGetOptionDouble)(struct AdbcDatabase*, const char*, double*,
+                                            struct AdbcError*);
+  AdbcStatusCode (*DatabaseGetOptionInt)(struct AdbcDatabase*, const char*, int64_t*,
+                                         struct AdbcError*);
+  AdbcStatusCode (*DatabaseSetOptionBytes)(struct AdbcDatabase*, const char*,
+                                           const uint8_t*, size_t, struct AdbcError*);
+  AdbcStatusCode (*DatabaseSetOptionDouble)(struct AdbcDatabase*, const char*, double,
+                                            struct AdbcError*);
+  AdbcStatusCode (*DatabaseSetOptionInt)(struct AdbcDatabase*, const char*, int64_t,
+                                         struct AdbcError*);
+
+  AdbcStatusCode (*ConnectionCancel)(struct AdbcConnection*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetOption)(struct AdbcConnection*, const char*, char*,
+                                        size_t*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetOptionBytes)(struct AdbcConnection*, const char*,
+                                             uint8_t*, size_t*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetOptionDouble)(struct AdbcConnection*, const char*,
+                                              double*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetOptionInt)(struct AdbcConnection*, const char*, int64_t*,
+                                           struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetStatistics)(struct AdbcConnection*, const char*,
+                                            const char*, const char*, char,
+                                            struct ArrowArrayStream*, struct AdbcError*);
+  AdbcStatusCode (*ConnectionGetStatisticNames)(struct AdbcConnection*,
+                                                struct ArrowArrayStream*,
+                                                struct AdbcError*);
+  AdbcStatusCode (*ConnectionSetOptionBytes)(struct AdbcConnection*, const char*,
+                                             const uint8_t*, size_t, struct AdbcError*);
+  AdbcStatusCode (*ConnectionSetOptionDouble)(struct AdbcConnection*, const char*, double,
+                                              struct AdbcError*);
+  AdbcStatusCode (*ConnectionSetOptionInt)(struct AdbcConnection*, const char*, int64_t,
+                                           struct AdbcError*);
+
+  AdbcStatusCode (*StatementCancel)(struct AdbcStatement*, struct AdbcError*);
+  AdbcStatusCode (*StatementExecuteSchema)(struct AdbcStatement*, struct ArrowSchema*,
+                                           struct AdbcError*);
+  AdbcStatusCode (*StatementGetOption)(struct AdbcStatement*, const char*, char*, size_t*,
+                                       struct AdbcError*);
+  AdbcStatusCode (*StatementGetOptionBytes)(struct AdbcStatement*, const char*, uint8_t*,
+                                            size_t*, struct AdbcError*);
+  AdbcStatusCode (*StatementGetOptionDouble)(struct AdbcStatement*, const char*, double*,
+                                             struct AdbcError*);
+  AdbcStatusCode (*StatementGetOptionInt)(struct AdbcStatement*, const char*, int64_t*,
+                                          struct AdbcError*);
+  AdbcStatusCode (*StatementSetOptionBytes)(struct AdbcStatement*, const char*,
+                                            const uint8_t*, size_t, struct AdbcError*);
+  AdbcStatusCode (*StatementSetOptionDouble)(struct AdbcStatement*, const char*, double,
+                                             struct AdbcError*);
+  AdbcStatusCode (*StatementSetOptionInt)(struct AdbcStatement*, const char*, int64_t,
+                                          struct AdbcError*);
+
+  /// @}
+};
+
+/// \brief The size of the AdbcDriver structure in ADBC 1.0.0.
+/// Drivers written for ADBC 1.1.0 and later should never touch more
+/// than this portion of an AdbcDriver struct when given
+/// ADBC_VERSION_1_0_0.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_DRIVER_1_0_0_SIZE (offsetof(struct AdbcDriver, ErrorGetDetailCount))
+
+/// \brief The size of the AdbcDriver structure in ADBC 1.1.0.
+/// Drivers written for ADBC 1.1.0 and later should never touch more
+/// than this portion of an AdbcDriver struct when given
+/// ADBC_VERSION_1_1_0.
+///
+/// \since ADBC API revision 1.1.0
+#define ADBC_DRIVER_1_1_0_SIZE (sizeof(struct AdbcDriver))
+
+/// @}
+
+/// \addtogroup adbc-database
+/// @{
+
+/// \brief Allocate a new (but uninitialized) database.
+///
+/// Callers pass in a zero-initialized AdbcDatabase.
+///
+/// Drivers should allocate their internal data structure and set the private_data
+/// field to point to the newly allocated struct. This struct should be released
+/// when AdbcDatabaseRelease is called.
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseNew(struct AdbcDatabase* database, struct AdbcError* error);
+
+/// \brief Get a string option of the database.
+///
+/// This must always be thread-safe (other operations are not), though
+/// given the semantics here, it is not recommended to call GetOption
+/// concurrently with itself.
+///
+/// length must be provided and must be the size of the buffer pointed
+/// to by value.  If there is sufficient space, the driver will copy
+/// the option value (including the null terminator) to buffer and set
+/// length to the size of the actual value.  If the buffer is too
+/// small, no data will be written and length will be set to the
+/// required length.
+///
+/// In other words:
+///
+/// - If output length <= input length, value will contain a value
+///   with length bytes.
+/// - If output length > input length, nothing has been written to
+///   value.
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the string
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] database The database.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[in,out] length The length of value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseGetOption(struct AdbcDatabase* database, const char* key,
+                                     char* value, size_t* length,
+                                     struct AdbcError* error);
+
+/// \brief Get a bytestring option of the database.
+///
+/// This must always be thread-safe (other operations are not), though
+/// given the semantics here, it is not recommended to call
+/// GetOptionBytes concurrently with itself.
+///
+/// length must be provided and must be the size of the buffer pointed
+/// to by value.  If there is sufficient space, the driver will copy
+/// the option value to buffer and set length to the size of the
+/// actual value.  If the buffer is too small, no data will be written
+/// and length will be set to the required length.
+///
+/// In other words:
+///
+/// - If output length <= input length, value will contain a value
+///   with length bytes.
+/// - If output length > input length, nothing has been written to
+///   value.
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the string
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] database The database.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[in,out] length The option value length.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseGetOptionBytes(struct AdbcDatabase* database, const char* key,
+                                          uint8_t* value, size_t* length,
+                                          struct AdbcError* error);
+
+/// \brief Get a double option of the database.
+///
+/// This must always be thread-safe (other operations are not).
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the double
+/// representation of an integer option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] database The database.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseGetOptionDouble(struct AdbcDatabase* database, const char* key,
+                                           double* value, struct AdbcError* error);
+
+/// \brief Get an integer option of the database.
+///
+/// This must always be thread-safe (other operations are not).
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the integer
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] database The database.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseGetOptionInt(struct AdbcDatabase* database, const char* key,
+                                        int64_t* value, struct AdbcError* error);
+
+/// \brief Set a char* option.
+///
+/// Options may be set before AdbcDatabaseInit.  Some drivers may
+/// support setting options after initialization as well.
+///
+/// \param[in] database The database.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseSetOption(struct AdbcDatabase* database, const char* key,
+                                     const char* value, struct AdbcError* error);
+
+/// \brief Set a bytestring option on a database.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] database The database.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[in] length The option value length.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseSetOptionBytes(struct AdbcDatabase* database, const char* key,
+                                          const uint8_t* value, size_t length,
+                                          struct AdbcError* error);
+
+/// \brief Set a double option on a database.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] database The database.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseSetOptionDouble(struct AdbcDatabase* database, const char* key,
+                                           double value, struct AdbcError* error);
+
+/// \brief Set an integer option on a database.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] database The database.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseSetOptionInt(struct AdbcDatabase* database, const char* key,
+                                        int64_t value, struct AdbcError* error);
+
+/// \brief Finish setting options and initialize the database.
+///
+/// Some drivers may support setting options after initialization
+/// as well.
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseInit(struct AdbcDatabase* database, struct AdbcError* error);
+
+/// \brief Destroy this database. No connections may exist.
+/// \param[in] database The database to release.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+ADBC_EXPORT
+AdbcStatusCode AdbcDatabaseRelease(struct AdbcDatabase* database,
+                                   struct AdbcError* error);
+
+/// @}
+
+/// \addtogroup adbc-connection
+/// @{
+
+/// \brief Allocate a new (but uninitialized) connection.
+///
+/// Callers pass in a zero-initialized AdbcConnection.
+///
+/// Drivers should allocate their internal data structure and set the private_data
+/// field to point to the newly allocated struct. This struct should be released
+/// when AdbcConnectionRelease is called.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionNew(struct AdbcConnection* connection,
+                                 struct AdbcError* error);
+
+/// \brief Set a char* option.
+///
+/// Options may be set before AdbcConnectionInit.  Some drivers may
+/// support setting options after initialization as well.
+///
+/// \param[in] connection The database connection.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionSetOption(struct AdbcConnection* connection, const char* key,
+                                       const char* value, struct AdbcError* error);
+
+/// \brief Set a bytestring option on a connection.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] connection The connection.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[in] length The option value length.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionSetOptionBytes(struct AdbcConnection* connection,
+                                            const char* key, const uint8_t* value,
+                                            size_t length, struct AdbcError* error);
+
+/// \brief Set an integer option.
+///
+/// Options may be set before AdbcConnectionInit.  Some drivers may
+/// support setting options after initialization as well.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] connection The database connection.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionSetOptionInt(struct AdbcConnection* connection,
+                                          const char* key, int64_t value,
+                                          struct AdbcError* error);
+
+/// \brief Set a double option.
+///
+/// Options may be set before AdbcConnectionInit.  Some drivers may
+/// support setting options after initialization as well.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] connection The database connection.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionSetOptionDouble(struct AdbcConnection* connection,
+                                             const char* key, double value,
+                                             struct AdbcError* error);
+
+/// \brief Finish setting options and initialize the connection.
+///
+/// Some drivers may support setting options after initialization
+/// as well.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionInit(struct AdbcConnection* connection,
+                                  struct AdbcDatabase* database, struct AdbcError* error);
+
+/// \brief Destroy this connection.
+///
+/// \param[in] connection The connection to release.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionRelease(struct AdbcConnection* connection,
+                                     struct AdbcError* error);
+
+/// \brief Cancel the in-progress operation on a connection.
+///
+/// This can be called during AdbcConnectionGetObjects (or similar),
+/// or while consuming an ArrowArrayStream returned from such.
+/// Calling this function should make the other functions return
+/// ADBC_STATUS_CANCELLED (from ADBC functions) or ECANCELED (from
+/// methods of ArrowArrayStream).  (It is not guaranteed to, for
+/// instance, the result set may be buffered in memory already.)
+///
+/// This must always be thread-safe (other operations are not).  It is
+/// not necessarily signal-safe.
+///
+/// \since ADBC API revision 1.1.0
+///
+/// \param[in] connection The connection to cancel.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+///
+/// \return ADBC_STATUS_INVALID_STATE if there is no operation to cancel.
+/// \return ADBC_STATUS_UNKNOWN if the operation could not be cancelled.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionCancel(struct AdbcConnection* connection,
+                                    struct AdbcError* error);
+
+/// \defgroup adbc-connection-metadata Metadata
+/// Functions for retrieving metadata about the database.
+///
+/// Generally, these functions return an ArrowArrayStream that can be
+/// consumed to get the metadata as Arrow data.  The returned metadata
+/// has an expected schema given in the function docstring. Schema
+/// fields are nullable unless otherwise marked.  While no
+/// AdbcStatement is used in these functions, the result set may count
+/// as an active statement to the driver for the purposes of
+/// concurrency management (e.g. if the driver has a limit on
+/// concurrent active statements and it must execute a SQL query
+/// internally in order to implement the metadata function).
+///
+/// This AdbcConnection must outlive the returned ArrowArrayStream.
+///
+/// Some functions accept "search pattern" arguments, which are
+/// strings that can contain the special character "%" to match zero
+/// or more characters, or "_" to match exactly one character.  (See
+/// the documentation of DatabaseMetaData in JDBC or "Pattern Value
+/// Arguments" in the ODBC documentation.)  Escaping is not currently
+/// supported.
+///
+/// @{
+
+/// \brief Get metadata about the database/driver.
+///
+/// The result is an Arrow dataset with the following schema:
+///
+/// Field Name                  | Field Type
+/// ----------------------------|------------------------
+/// info_name                   | uint32 not null
+/// info_value                  | INFO_SCHEMA
+///
+/// INFO_SCHEMA is a dense union with members:
+///
+/// Field Name (Type Code)      | Field Type
+/// ----------------------------|------------------------
+/// string_value (0)            | utf8
+/// bool_value (1)              | bool
+/// int64_value (2)             | int64
+/// int32_bitmask (3)           | int32
+/// string_list (4)             | list<utf8>
+/// int32_to_int32_list_map (5) | map<int32, list<int32>>
+///
+/// Each metadatum is identified by an integer code.  The recognized
+/// codes are defined as constants.  Codes [0, 10_000) are reserved
+/// for ADBC usage.  Drivers/vendors will ignore requests for
+/// unrecognized codes (the row will be omitted from the result).
+///
+/// Since ADBC 1.1.0: the range [500, 1_000) is reserved for "XDBC"
+/// information, which is the same metadata provided by the same info
+/// code range in the Arrow Flight SQL GetSqlInfo RPC.
+///
+/// \param[in] connection The connection to query.
+/// \param[in] info_codes A list of metadata codes to fetch, or NULL
+///   to fetch all.
+/// \param[in] info_codes_length The length of the info_codes
+///   parameter.  Ignored if info_codes is NULL.
+/// \param[out] out The result set.
+/// \param[out] error Error details, if an error occurs.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetInfo(struct AdbcConnection* connection,
+                                     const uint32_t* info_codes, size_t info_codes_length,
+                                     struct ArrowArrayStream* out,
+                                     struct AdbcError* error);
+
+/// \brief Get a hierarchical view of all catalogs, database schemas,
+///   tables, and columns.
+///
+/// The result is an Arrow dataset with the following schema:
+///
+/// | Field Name               | Field Type              |
+/// |--------------------------|-------------------------|
+/// | catalog_name             | utf8                    |
+/// | catalog_db_schemas       | list<DB_SCHEMA_SCHEMA>  |
+///
+/// DB_SCHEMA_SCHEMA is a Struct with fields:
+///
+/// | Field Name               | Field Type              |
+/// |--------------------------|-------------------------|
+/// | db_schema_name           | utf8                    |
+/// | db_schema_tables         | list<TABLE_SCHEMA>      |
+///
+/// TABLE_SCHEMA is a Struct with fields:
+///
+/// | Field Name               | Field Type              |
+/// |--------------------------|-------------------------|
+/// | table_name               | utf8 not null           |
+/// | table_type               | utf8 not null           |
+/// | table_columns            | list<COLUMN_SCHEMA>     |
+/// | table_constraints        | list<CONSTRAINT_SCHEMA> |
+///
+/// COLUMN_SCHEMA is a Struct with fields:
+///
+/// | Field Name               | Field Type              | Comments |
+/// |--------------------------|-------------------------|----------|
+/// | column_name              | utf8 not null           |          |
+/// | ordinal_position         | int32                   | (1)      |
+/// | remarks                  | utf8                    | (2)      |
+/// | xdbc_data_type           | int16                   | (3)      |
+/// | xdbc_type_name           | utf8                    | (3)      |
+/// | xdbc_column_size         | int32                   | (3)      |
+/// | xdbc_decimal_digits      | int16                   | (3)      |
+/// | xdbc_num_prec_radix      | int16                   | (3)      |
+/// | xdbc_nullable            | int16                   | (3)      |
+/// | xdbc_column_def          | utf8                    | (3)      |
+/// | xdbc_sql_data_type       | int16                   | (3)      |
+/// | xdbc_datetime_sub        | int16                   | (3)      |
+/// | xdbc_char_octet_length   | int32                   | (3)      |
+/// | xdbc_is_nullable         | utf8                    | (3)      |
+/// | xdbc_scope_catalog       | utf8                    | (3)      |
+/// | xdbc_scope_schema        | utf8                    | (3)      |
+/// | xdbc_scope_table         | utf8                    | (3)      |
+/// | xdbc_is_autoincrement    | bool                    | (3)      |
+/// | xdbc_is_generatedcolumn  | bool                    | (3)      |
+///
+/// 1. The column's ordinal position in the table (starting from 1).
+/// 2. Database-specific description of the column.
+/// 3. Optional value.  Should be null if not supported by the driver.
+///    xdbc_ values are meant to provide JDBC/ODBC-compatible metadata
+///    in an agnostic manner.
+///
+/// CONSTRAINT_SCHEMA is a Struct with fields:
+///
+/// | Field Name               | Field Type              | Comments |
+/// |--------------------------|-------------------------|----------|
+/// | constraint_name          | utf8                    |          |
+/// | constraint_type          | utf8 not null           | (1)      |
+/// | constraint_column_names  | list<utf8> not null     | (2)      |
+/// | constraint_column_usage  | list<USAGE_SCHEMA>      | (3)      |
+///
+/// 1. One of 'CHECK', 'FOREIGN KEY', 'PRIMARY KEY', or 'UNIQUE'.
+/// 2. The columns on the current table that are constrained, in
+///    order.
+/// 3. For FOREIGN KEY only, the referenced table and columns.
+///
+/// USAGE_SCHEMA is a Struct with fields:
+///
+/// | Field Name               | Field Type              |
+/// |--------------------------|-------------------------|
+/// | fk_catalog               | utf8                    |
+/// | fk_db_schema             | utf8                    |
+/// | fk_table                 | utf8 not null           |
+/// | fk_column_name           | utf8 not null           |
+///
+/// This AdbcConnection must outlive the returned ArrowArrayStream.
+///
+/// \param[in] connection The database connection.
+/// \param[in] depth The level of nesting to display. If 0, display
+///   all levels. If 1, display only catalogs (i.e.  catalog_schemas
+///   will be null). If 2, display only catalogs and schemas
+///   (i.e. db_schema_tables will be null), and so on.
+/// \param[in] catalog Only show tables in the given catalog. If NULL,
+///   do not filter by catalog. If an empty string, only show tables
+///   without a catalog.  May be a search pattern (see section
+///   documentation).
+/// \param[in] db_schema Only show tables in the given database schema. If
+///   NULL, do not filter by database schema. If an empty string, only show
+///   tables without a database schema. May be a search pattern (see section
+///   documentation).
+/// \param[in] table_name Only show tables with the given name. If NULL, do not
+///   filter by name. May be a search pattern (see section documentation).
+/// \param[in] table_type Only show tables matching one of the given table
+///   types. If NULL, show tables of any type. Valid table types can be fetched
+///   from GetTableTypes.  Terminate the list with a NULL entry.
+/// \param[in] column_name Only show columns with the given name. If
+///   NULL, do not filter by name.  May be a search pattern (see
+///   section documentation).
+/// \param[out] out The result set.
+/// \param[out] error Error details, if an error occurs.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetObjects(struct AdbcConnection* connection, int depth,
+                                        const char* catalog, const char* db_schema,
+                                        const char* table_name, const char** table_type,
+                                        const char* column_name,
+                                        struct ArrowArrayStream* out,
+                                        struct AdbcError* error);
+
+/// \brief Get a string option of the connection.
+///
+/// This must always be thread-safe (other operations are not), though
+/// given the semantics here, it is not recommended to call GetOption
+/// concurrently with itself.
+///
+/// length must be provided and must be the size of the buffer pointed
+/// to by value.  If there is sufficient space, the driver will copy
+/// the option value (including the null terminator) to buffer and set
+/// length to the size of the actual value.  If the buffer is too
+/// small, no data will be written and length will be set to the
+/// required length.
+///
+/// In other words:
+///
+/// - If output length <= input length, value will contain a value
+///   with length bytes.
+/// - If output length > input length, nothing has been written to
+///   value.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] connection The database connection.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[in,out] length The length of value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetOption(struct AdbcConnection* connection, const char* key,
+                                       char* value, size_t* length,
+                                       struct AdbcError* error);
+
+/// \brief Get a bytestring option of the connection.
+///
+/// This must always be thread-safe (other operations are not), though
+/// given the semantics here, it is not recommended to call
+/// GetOptionBytes concurrently with itself.
+///
+/// length must be provided and must be the size of the buffer pointed
+/// to by value.  If there is sufficient space, the driver will copy
+/// the option value to buffer and set length to the size of the
+/// actual value.  If the buffer is too small, no data will be written
+/// and length will be set to the required length.
+///
+/// In other words:
+///
+/// - If output length <= input length, value will contain a value
+///   with length bytes.
+/// - If output length > input length, nothing has been written to
+///   value.
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the string
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] connection The connection.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[in,out] length The option value length.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetOptionBytes(struct AdbcConnection* connection,
+                                            const char* key, uint8_t* value,
+                                            size_t* length, struct AdbcError* error);
+
+/// \brief Get an integer option of the connection.
+///
+/// This must always be thread-safe (other operations are not).
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the string
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] connection The database connection.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetOptionInt(struct AdbcConnection* connection,
+                                          const char* key, int64_t* value,
+                                          struct AdbcError* error);
+
+/// \brief Get a double option of the connection.
+///
+/// This must always be thread-safe (other operations are not).
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the string
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] connection The database connection.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetOptionDouble(struct AdbcConnection* connection,
+                                             const char* key, double* value,
+                                             struct AdbcError* error);
+
+/// \brief Get statistics about the data distribution of table(s).
+///
+/// The result is an Arrow dataset with the following schema:
+///
+/// | Field Name               | Field Type                       |
+/// |--------------------------|----------------------------------|
+/// | catalog_name             | utf8                             |
+/// | catalog_db_schemas       | list<DB_SCHEMA_SCHEMA> not null  |
+///
+/// DB_SCHEMA_SCHEMA is a Struct with fields:
+///
+/// | Field Name               | Field Type                       |
+/// |--------------------------|----------------------------------|
+/// | db_schema_name           | utf8                             |
+/// | db_schema_statistics     | list<STATISTICS_SCHEMA> not null |
+///
+/// STATISTICS_SCHEMA is a Struct with fields:
+///
+/// | Field Name               | Field Type                       | Comments |
+/// |--------------------------|----------------------------------| -------- |
+/// | table_name               | utf8 not null                    |          |
+/// | column_name              | utf8                             | (1)      |
+/// | statistic_key            | int16 not null                   | (2)      |
+/// | statistic_value          | VALUE_SCHEMA not null            |          |
+/// | statistic_is_approximate | bool not null                    | (3)      |
+///
+/// 1. If null, then the statistic applies to the entire table.
+/// 2. A dictionary-encoded statistic name (although we do not use the Arrow
+///    dictionary type). Values in [0, 1024) are reserved for ADBC.  Other
+///    values are for implementation-specific statistics.  For the definitions
+///    of predefined statistic types, see \ref adbc-table-statistics.  To get
+///    driver-specific statistic names, use AdbcConnectionGetStatisticNames.
+/// 3. If true, then the value is approximate or best-effort.
+///
+/// VALUE_SCHEMA is a dense union with members:
+///
+/// | Field Name               | Field Type                       |
+/// |--------------------------|----------------------------------|
+/// | int64                    | int64                            |
+/// | uint64                   | uint64                           |
+/// | float64                  | float64                          |
+/// | binary                   | binary                           |
+///
+/// This AdbcConnection must outlive the returned ArrowArrayStream.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] connection The database connection.
+/// \param[in] catalog The catalog (or nullptr).  May be a search
+///   pattern (see section documentation).
+/// \param[in] db_schema The database schema (or nullptr).  May be a
+///   search pattern (see section documentation).
+/// \param[in] table_name The table name (or nullptr).  May be a
+///   search pattern (see section documentation).
+/// \param[in] approximate If zero, request exact values of
+///   statistics, else allow for best-effort, approximate, or cached
+///   values.  The database may return approximate values regardless,
+///   as indicated in the result.  Requesting exact values may be
+///   expensive or unsupported.
+/// \param[out] out The result set.
+/// \param[out] error Error details, if an error occurs.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetStatistics(struct AdbcConnection* connection,
+                                           const char* catalog, const char* db_schema,
+                                           const char* table_name, char approximate,
+                                           struct ArrowArrayStream* out,
+                                           struct AdbcError* error);
+
+/// \brief Get the names of statistics specific to this driver.
+///
+/// The result is an Arrow dataset with the following schema:
+///
+/// Field Name     | Field Type
+/// ---------------|----------------
+/// statistic_name | utf8 not null
+/// statistic_key  | int16 not null
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] connection The database connection.
+/// \param[out] out The result set.
+/// \param[out] error Error details, if an error occurs.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetStatisticNames(struct AdbcConnection* connection,
+                                               struct ArrowArrayStream* out,
+                                               struct AdbcError* error);
+
+/// \brief Get the Arrow schema of a table.
+///
+/// \param[in] connection The database connection.
+/// \param[in] catalog The catalog (or nullptr if not applicable).
+/// \param[in] db_schema The database schema (or nullptr if not applicable).
+/// \param[in] table_name The table name.
+/// \param[out] schema The table schema.
+/// \param[out] error Error details, if an error occurs.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetTableSchema(struct AdbcConnection* connection,
+                                            const char* catalog, const char* db_schema,
+                                            const char* table_name,
+                                            struct ArrowSchema* schema,
+                                            struct AdbcError* error);
+
+/// \brief Get a list of table types in the database.
+///
+/// The result is an Arrow dataset with the following schema:
+///
+/// Field Name     | Field Type
+/// ---------------|--------------
+/// table_type     | utf8 not null
+///
+/// This AdbcConnection must outlive the returned ArrowArrayStream.
+///
+/// \param[in] connection The database connection.
+/// \param[out] out The result set.
+/// \param[out] error Error details, if an error occurs.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionGetTableTypes(struct AdbcConnection* connection,
+                                           struct ArrowArrayStream* out,
+                                           struct AdbcError* error);
+
+/// @}
+
+/// \defgroup adbc-connection-partition Partitioned Results
+/// Some databases may internally partition the results. These
+/// partitions are exposed to clients who may wish to integrate them
+/// with a threaded or distributed execution model, where partitions
+/// can be divided among threads or machines for processing.
+///
+/// Drivers are not required to support partitioning.
+///
+/// Partitions are not ordered. If the result set is sorted,
+/// implementations should return a single partition.
+///
+/// @{
+
+/// \brief Construct a statement for a partition of a query. The
+///   results can then be read independently.
+///
+/// A partition can be retrieved from AdbcPartitions.
+///
+/// This AdbcConnection must outlive the returned ArrowArrayStream.
+///
+/// \param[in] connection The connection to use.  This does not have
+///   to be the same connection that the partition was created on.
+/// \param[in] serialized_partition The partition descriptor.
+/// \param[in] serialized_length The partition descriptor length.
+/// \param[out] out The result set.
+/// \param[out] error Error details, if an error occurs.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionReadPartition(struct AdbcConnection* connection,
+                                           const uint8_t* serialized_partition,
+                                           size_t serialized_length,
+                                           struct ArrowArrayStream* out,
+                                           struct AdbcError* error);
+
+/// @}
+
+/// \defgroup adbc-connection-transaction Transaction Semantics
+///
+/// Connections start out in auto-commit mode by default (if
+/// applicable for the given vendor). Use AdbcConnectionSetOption and
+/// ADBC_CONNECTION_OPTION_AUTO_COMMIT to change this.
+///
+/// @{
+
+/// \brief Commit any pending transactions. Only used if autocommit is
+///   disabled.
+///
+/// Behavior is undefined if this is mixed with SQL transaction
+/// statements.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionCommit(struct AdbcConnection* connection,
+                                    struct AdbcError* error);
+
+/// \brief Roll back any pending transactions. Only used if autocommit
+///   is disabled.
+///
+/// Behavior is undefined if this is mixed with SQL transaction
+/// statements.
+ADBC_EXPORT
+AdbcStatusCode AdbcConnectionRollback(struct AdbcConnection* connection,
+                                      struct AdbcError* error);
+
+/// @}
+
+/// @}
+
+/// \addtogroup adbc-statement
+/// @{
+
+/// \brief Create a new statement for a given connection.
+///
+/// Callers pass in a zero-initialized AdbcStatement.
+///
+/// Drivers should allocate their internal data structure and set the private_data
+/// field to point to the newly allocated struct. This struct should be released
+/// when AdbcStatementRelease is called.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementNew(struct AdbcConnection* connection,
+                                struct AdbcStatement* statement, struct AdbcError* error);
+
+/// \brief Destroy a statement.
+/// \param[in] statement The statement to release.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementRelease(struct AdbcStatement* statement,
+                                    struct AdbcError* error);
+
+/// \brief Execute a statement and get the results.
+///
+/// This invalidates any prior result sets.  This AdbcStatement must
+/// outlive the returned ArrowArrayStream.
+///
+/// Since ADBC 1.1.0: releasing the returned ArrowArrayStream without
+/// consuming it fully is equivalent to calling AdbcStatementCancel.
+///
+/// \param[in] statement The statement to execute.
+/// \param[out] out The results. Pass NULL if the client does not
+///   expect a result set.
+/// \param[out] rows_affected The number of rows affected if known,
+///   else -1. Pass NULL if the client does not want this information.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementExecuteQuery(struct AdbcStatement* statement,
+                                         struct ArrowArrayStream* out,
+                                         int64_t* rows_affected, struct AdbcError* error);
+
+/// \brief Get the schema of the result set of a query without
+///   executing it.
+///
+/// This invalidates any prior result sets.
+///
+/// Depending on the driver, this may require first executing
+/// AdbcStatementPrepare.
+///
+/// \since ADBC API revision 1.1.0
+///
+/// \param[in] statement The statement to execute.
+/// \param[out] schema The result schema.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+///
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the driver does not support this.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementExecuteSchema(struct AdbcStatement* statement,
+                                          struct ArrowSchema* schema,
+                                          struct AdbcError* error);
+
+/// \brief Turn this statement into a prepared statement to be
+///   executed multiple times.
+///
+/// This invalidates any prior result sets.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementPrepare(struct AdbcStatement* statement,
+                                    struct AdbcError* error);
+
+/// \defgroup adbc-statement-sql SQL Semantics
+/// Functions for executing SQL queries, or querying SQL-related
+/// metadata. Drivers are not required to support both SQL and
+/// Substrait semantics. If they do, it may be via converting
+/// between representations internally.
+/// @{
+
+/// \brief Set the SQL query to execute.
+///
+/// The query can then be executed with AdbcStatementExecute.  For
+/// queries expected to be executed repeatedly, AdbcStatementPrepare
+/// the statement first.
+///
+/// \param[in] statement The statement.
+/// \param[in] query The query to execute.
+/// \param[out] error Error details, if an error occurs.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementSetSqlQuery(struct AdbcStatement* statement,
+                                        const char* query, struct AdbcError* error);
+
+/// @}
+
+/// \defgroup adbc-statement-substrait Substrait Semantics
+/// Functions for executing Substrait plans, or querying
+/// Substrait-related metadata.  Drivers are not required to support
+/// both SQL and Substrait semantics.  If they do, it may be via
+/// converting between representations internally.
+/// @{
+
+/// \brief Set the Substrait plan to execute.
+///
+/// The query can then be executed with AdbcStatementExecute.  For
+/// queries expected to be executed repeatedly, AdbcStatementPrepare
+/// the statement first.
+///
+/// \param[in] statement The statement.
+/// \param[in] plan The serialized substrait.Plan to execute.
+/// \param[in] length The length of the serialized plan.
+/// \param[out] error Error details, if an error occurs.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementSetSubstraitPlan(struct AdbcStatement* statement,
+                                             const uint8_t* plan, size_t length,
+                                             struct AdbcError* error);
+
+/// @}
+
+/// \brief Bind Arrow data. This can be used for bulk inserts or
+///   prepared statements.
+///
+/// \param[in] statement The statement to bind to.
+/// \param[in] values The values to bind. The driver will call the
+///   release callback itself, although it may not do this until the
+///   statement is released.
+/// \param[in] schema The schema of the values to bind.
+/// \param[out] error An optional location to return an error message
+///   if necessary.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementBind(struct AdbcStatement* statement,
+                                 struct ArrowArray* values, struct ArrowSchema* schema,
+                                 struct AdbcError* error);
+
+/// \brief Bind Arrow data. This can be used for bulk inserts or
+///   prepared statements.
+/// \param[in] statement The statement to bind to.
+/// \param[in] stream The values to bind. The driver will call the
+///   release callback itself, although it may not do this until the
+///   statement is released.
+/// \param[out] error An optional location to return an error message
+///   if necessary.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementBindStream(struct AdbcStatement* statement,
+                                       struct ArrowArrayStream* stream,
+                                       struct AdbcError* error);
+
+/// \brief Cancel execution of an in-progress query.
+///
+/// This can be called during AdbcStatementExecuteQuery (or similar),
+/// or while consuming an ArrowArrayStream returned from such.
+/// Calling this function should make the other functions return
+/// ADBC_STATUS_CANCELLED (from ADBC functions) or ECANCELED (from
+/// methods of ArrowArrayStream).  (It is not guaranteed to, for
+/// instance, the result set may be buffered in memory already.)
+///
+/// This must always be thread-safe (other operations are not).  It is
+/// not necessarily signal-safe.
+///
+/// \since ADBC API revision 1.1.0
+///
+/// \param[in] statement The statement to cancel.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+///
+/// \return ADBC_STATUS_INVALID_STATE if there is no query to cancel.
+/// \return ADBC_STATUS_UNKNOWN if the query could not be cancelled.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementCancel(struct AdbcStatement* statement,
+                                   struct AdbcError* error);
+
+/// \brief Get a string option of the statement.
+///
+/// This must always be thread-safe (other operations are not), though
+/// given the semantics here, it is not recommended to call GetOption
+/// concurrently with itself.
+///
+/// length must be provided and must be the size of the buffer pointed
+/// to by value.  If there is sufficient space, the driver will copy
+/// the option value (including the null terminator) to buffer and set
+/// length to the size of the actual value.  If the buffer is too
+/// small, no data will be written and length will be set to the
+/// required length.
+///
+/// In other words:
+///
+/// - If output length <= input length, value will contain a value
+///   with length bytes.
+/// - If output length > input length, nothing has been written to
+///   value.
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the string
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] statement The statement.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[in,out] length The length of value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementGetOption(struct AdbcStatement* statement, const char* key,
+                                      char* value, size_t* length,
+                                      struct AdbcError* error);
+
+/// \brief Get a bytestring option of the statement.
+///
+/// This must always be thread-safe (other operations are not), though
+/// given the semantics here, it is not recommended to call
+/// GetOptionBytes concurrently with itself.
+///
+/// length must be provided and must be the size of the buffer pointed
+/// to by value.  If there is sufficient space, the driver will copy
+/// the option value to buffer and set length to the size of the
+/// actual value.  If the buffer is too small, no data will be written
+/// and length will be set to the required length.
+///
+/// In other words:
+///
+/// - If output length <= input length, value will contain a value
+///   with length bytes.
+/// - If output length > input length, nothing has been written to
+///   value.
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the string
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] statement The statement.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[in,out] length The option value length.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementGetOptionBytes(struct AdbcStatement* statement,
+                                           const char* key, uint8_t* value,
+                                           size_t* length, struct AdbcError* error);
+
+/// \brief Get an integer option of the statement.
+///
+/// This must always be thread-safe (other operations are not).
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the string
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] statement The statement.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementGetOptionInt(struct AdbcStatement* statement, const char* key,
+                                         int64_t* value, struct AdbcError* error);
+
+/// \brief Get a double option of the statement.
+///
+/// This must always be thread-safe (other operations are not).
+///
+/// For standard options, drivers must always support getting the
+/// option value (if they support getting option values at all) via
+/// the type specified in the option.  (For example, an option set via
+/// SetOptionDouble must be retrievable via GetOptionDouble.)  Drivers
+/// may also support getting a converted option value via other
+/// getters if needed.  (For example, getting the string
+/// representation of a double option.)
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] statement The statement.
+/// \param[in] key The option to get.
+/// \param[out] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_FOUND if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementGetOptionDouble(struct AdbcStatement* statement,
+                                            const char* key, double* value,
+                                            struct AdbcError* error);
+
+/// \brief Get the schema for bound parameters.
+///
+/// This retrieves an Arrow schema describing the number, names, and
+/// types of the parameters in a parameterized statement.  The fields
+/// of the schema should be in order of the ordinal position of the
+/// parameters; named parameters should appear only once.
+///
+/// If the parameter does not have a name, or the name cannot be
+/// determined, the name of the corresponding field in the schema will
+/// be an empty string.  If the type cannot be determined, the type of
+/// the corresponding field will be NA (NullType).
+///
+/// This should be called after AdbcStatementPrepare.
+///
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the schema cannot be determined.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementGetParameterSchema(struct AdbcStatement* statement,
+                                               struct ArrowSchema* schema,
+                                               struct AdbcError* error);
+
+/// \brief Set a string option on a statement.
+/// \param[in] statement The statement.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized.
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementSetOption(struct AdbcStatement* statement, const char* key,
+                                      const char* value, struct AdbcError* error);
+
+/// \brief Set a bytestring option on a statement.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] statement The statement.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[in] length The option value length.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementSetOptionBytes(struct AdbcStatement* statement,
+                                           const char* key, const uint8_t* value,
+                                           size_t length, struct AdbcError* error);
+
+/// \brief Set an integer option on a statement.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] statement The statement.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementSetOptionInt(struct AdbcStatement* statement, const char* key,
+                                         int64_t value, struct AdbcError* error);
+
+/// \brief Set a double option on a statement.
+///
+/// \since ADBC API revision 1.1.0
+/// \param[in] statement The statement.
+/// \param[in] key The option to set.
+/// \param[in] value The option value.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the option is not recognized
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementSetOptionDouble(struct AdbcStatement* statement,
+                                            const char* key, double value,
+                                            struct AdbcError* error);
+
+/// \addtogroup adbc-statement-partition
+/// @{
+
+/// \brief Execute a statement and get the results as a partitioned
+///   result set.
+///
+/// \param[in] statement The statement to execute.
+/// \param[out] schema The schema of the result set.
+/// \param[out] partitions The result partitions.
+/// \param[out] rows_affected The number of rows affected if known,
+///   else -1. Pass NULL if the client does not want this information.
+/// \param[out] error An optional location to return an error
+///   message if necessary.
+/// \return ADBC_STATUS_NOT_IMPLEMENTED if the driver does not support
+///   partitioned results
+ADBC_EXPORT
+AdbcStatusCode AdbcStatementExecutePartitions(struct AdbcStatement* statement,
+                                              struct ArrowSchema* schema,
+                                              struct AdbcPartitions* partitions,
+                                              int64_t* rows_affected,
+                                              struct AdbcError* error);
+
+/// @}
+
+/// @}
+
+/// \addtogroup adbc-driver
+/// @{
+
+/// \brief Common entry point for drivers via the driver manager
+///   (which uses dlopen(3)/LoadLibrary). The driver manager is told
+///   to load a library and call a function of this type to load the
+///   driver.
+///
+/// Although drivers may choose any name for this function, the
+/// recommended name is "AdbcDriverInit", or a name derived from the
+/// name of the driver's shared library as follows: remove the 'lib'
+/// prefix (on Unix systems) and all file extensions, then PascalCase
+/// the driver name, append Init, and prepend Adbc (if not already
+/// there).  For example:
+///
+/// - libadbc_driver_sqlite.so.2.0.0 -> AdbcDriverSqliteInit
+/// - adbc_driver_sqlite.dll -> AdbcDriverSqliteInit
+/// - proprietary_driver.dll -> AdbcProprietaryDriverInit
+///
+/// \param[in] version The ADBC revision to attempt to initialize (see
+///   ADBC_VERSION_1_0_0).
+/// \param[out] driver The table of function pointers to
+///   initialize. Should be a pointer to the appropriate struct for
+///   the given version (see the documentation for the version).
+/// \param[out] error An optional location to return an error message
+///   if necessary.
+/// \return ADBC_STATUS_OK if the driver was initialized, or
+///   ADBC_STATUS_NOT_IMPLEMENTED if the version is not supported.  In
+///   that case, clients may retry with a different version.
+typedef AdbcStatusCode (*AdbcDriverInitFunc)(int version, void* driver,
+                                             struct AdbcError* error);
+
+/// @}
+
+#endif  // ADBC
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp b/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp
index 8410f395ea45..8a03d9f0abb1 100644
--- a/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp
+++ b/ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp
@@ -6,6 +6,7 @@
  *
  ******************************************************************************
  * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2024, Dewey Dunnington <dewey@voltrondata.com>
  *
  * SPDX-License-Identifier: MIT
  ****************************************************************************/
@@ -15,6 +16,44 @@
 #include "ogr_mem.h"
 #include "ogr_p.h"
 #include "cpl_json.h"
+#include "gdal_adbc.h"
+
+#if defined(OGR_ADBC_HAS_DRIVER_MANAGER)
+#include <arrow-adbc/adbc_driver_manager.h>
+#endif
+
+#define OGR_ADBC_VERSION ADBC_VERSION_1_1_0
+static_assert(sizeof(AdbcDriver) == ADBC_DRIVER_1_1_0_SIZE);
+
+namespace
+{
+
+AdbcStatusCode OGRADBCLoadDriver(const char *driver_name,
+                                 const char *entrypoint, void *driver,
+                                 struct AdbcError *error)
+{
+    GDALAdbcLoadDriverFunc load_driver_override =
+        GDALGetAdbcLoadDriverOverride();
+    if (load_driver_override)
+    {
+        return load_driver_override(driver_name, entrypoint, OGR_ADBC_VERSION,
+                                    driver, error);
+    }
+    else
+    {
+#if defined(OGR_ADBC_HAS_DRIVER_MANAGER)
+        return AdbcLoadDriver(driver_name, entrypoint, OGR_ADBC_VERSION, driver,
+                              error);
+#else
+        return ADBC_STATUS_NOT_IMPLEMENTED;
+#endif
+    }
+}
+
+}  // namespace
+
+// Helper to wrap driver callbacks
+#define ADBC_CALL(func, ...) m_driver.func(__VA_ARGS__)
 
 /************************************************************************/
 /*                           ~OGRADBCDataset()                          */
@@ -26,9 +65,13 @@ OGRADBCDataset::~OGRADBCDataset()
     m_apoLayers.clear();
     OGRADBCError error;
     if (m_connection)
-        AdbcConnectionRelease(m_connection.get(), error);
+        ADBC_CALL(ConnectionRelease, m_connection.get(), error);
     error.clear();
-    AdbcDatabaseRelease(&m_database, error);
+    if (m_driver.release)
+    {
+        ADBC_CALL(DatabaseRelease, &m_database, error);
+        m_driver.release(&m_driver, error);
+    }
 }
 
 /************************************************************************/
@@ -82,7 +125,7 @@ OGRADBCDataset::CreateLayer(const char *pszStatement, const char *pszLayerName)
     }
 
     auto statement = std::make_unique<AdbcStatement>();
-    if (AdbcStatementNew(m_connection.get(), statement.get(), error) !=
+    if (ADBC_CALL(StatementNew, m_connection.get(), statement.get(), error) !=
         ADBC_STATUS_OK)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "AdbcStatementNew() failed: %s",
@@ -90,25 +133,25 @@ OGRADBCDataset::CreateLayer(const char *pszStatement, const char *pszLayerName)
         return nullptr;
     }
 
-    if (AdbcStatementSetSqlQuery(statement.get(), osStatement.c_str(), error) !=
-        ADBC_STATUS_OK)
+    if (ADBC_CALL(StatementSetSqlQuery, statement.get(), osStatement.c_str(),
+                  error) != ADBC_STATUS_OK)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "AdbcStatementSetSqlQuery() failed: %s", error.message());
         error.clear();
-        AdbcStatementRelease(statement.get(), error);
+        ADBC_CALL(StatementRelease, statement.get(), error);
         return nullptr;
     }
 
     auto stream = std::make_unique<OGRArrowArrayStream>();
     int64_t rows_affected = -1;
-    if (AdbcStatementExecuteQuery(statement.get(), stream->get(),
-                                  &rows_affected, error) != ADBC_STATUS_OK)
+    if (ADBC_CALL(StatementExecuteQuery, statement.get(), stream->get(),
+                  &rows_affected, error) != ADBC_STATUS_OK)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "AdbcStatementExecuteQuery() failed: %s", error.message());
         error.clear();
-        AdbcStatementRelease(statement.get(), error);
+        ADBC_CALL(StatementRelease, statement.get(), error);
         return nullptr;
     }
 
@@ -116,7 +159,7 @@ OGRADBCDataset::CreateLayer(const char *pszStatement, const char *pszLayerName)
     if (stream->get_schema(&schema) != 0)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "get_schema() failed");
-        AdbcStatementRelease(statement.get(), error);
+        ADBC_CALL(StatementRelease, statement.get(), error);
         return nullptr;
     }
 
@@ -156,13 +199,6 @@ bool OGRADBCDataset::Open(const GDALOpenInfo *poOpenInfo)
 {
     OGRADBCError error;
 
-    if (AdbcDatabaseNew(&m_database, error) != ADBC_STATUS_OK)
-    {
-        CPLError(CE_Failure, CPLE_AppDefined, "AdbcDatabaseNew() failed: %s",
-                 error.message());
-        return false;
-    }
-
     const char *pszFilename = poOpenInfo->pszFilename;
     std::unique_ptr<GDALOpenInfo> poTmpOpenInfo;
     if (STARTS_WITH(pszFilename, "ADBC:"))
@@ -182,6 +218,7 @@ bool OGRADBCDataset::Open(const GDALOpenInfo *poOpenInfo)
     const bool bIsParquet = OGRADBCDriverIsParquet(poOpenInfo) ||
                             EQUAL(CPLGetExtension(pszFilename), "parquet");
     const bool bIsPostgreSQL = STARTS_WITH(pszFilename, "postgresql://");
+
     if (!pszADBCDriverName)
     {
         if (bIsDuckDB || bIsParquet)
@@ -210,26 +247,44 @@ bool OGRADBCDataset::Open(const GDALOpenInfo *poOpenInfo)
         }
     }
 
-    if (AdbcDatabaseSetOption(&m_database, "driver", pszADBCDriverName,
-                              error) != ADBC_STATUS_OK)
+    // Load the driver
+    if (pszADBCDriverName &&
+        (bIsDuckDB || bIsParquet || strstr(pszADBCDriverName, "duckdb")))
     {
-        CPLError(CE_Failure, CPLE_AppDefined,
-                 "AdbcDatabaseSetOption() failed: %s", error.message());
-        return false;
+        if (OGRADBCLoadDriver(pszADBCDriverName, "duckdb_adbc_init", &m_driver,
+                              error) != ADBC_STATUS_OK)
+        {
+            CPLError(CE_Failure, CPLE_AppDefined, "AdbcLoadDriver() failed: %s",
+                     error.message());
+            return false;
+        }
     }
-
-    if (bIsDuckDB || bIsParquet || strstr(pszADBCDriverName, "duckdb"))
+    else
     {
-        if (AdbcDatabaseSetOption(&m_database, "entrypoint", "duckdb_adbc_init",
-                                  error) != ADBC_STATUS_OK)
+        if (OGRADBCLoadDriver(pszADBCDriverName, nullptr, &m_driver, error) !=
+            ADBC_STATUS_OK)
         {
-            CPLError(CE_Failure, CPLE_AppDefined,
-                     "AdbcDatabaseSetOption() failed: %s", error.message());
+            CPLError(CE_Failure, CPLE_AppDefined, "AdbcLoadDriver() failed: %s",
+                     error.message());
             return false;
         }
-        if (AdbcDatabaseSetOption(&m_database, "path",
-                                  bIsParquet ? ":memory:" : pszFilename,
-                                  error) != ADBC_STATUS_OK)
+    }
+
+    // Allocate the database
+    if (ADBC_CALL(DatabaseNew, &m_database, error) != ADBC_STATUS_OK)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "AdbcDatabaseNew() failed: %s",
+                 error.message());
+        return false;
+    }
+
+    // Set options
+    if (pszADBCDriverName &&
+        (bIsDuckDB || bIsParquet || strstr(pszADBCDriverName, "duckdb")))
+    {
+        if (ADBC_CALL(DatabaseSetOption, &m_database, "path",
+                      bIsParquet ? ":memory:" : pszFilename,
+                      error) != ADBC_STATUS_OK)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "AdbcDatabaseSetOption() failed: %s", error.message());
@@ -238,8 +293,8 @@ bool OGRADBCDataset::Open(const GDALOpenInfo *poOpenInfo)
     }
     else if (pszFilename[0])
     {
-        if (AdbcDatabaseSetOption(&m_database, "uri", pszFilename, error) !=
-            ADBC_STATUS_OK)
+        if (ADBC_CALL(DatabaseSetOption, &m_database, "uri", pszFilename,
+                      error) != ADBC_STATUS_OK)
         {
             CPLError(CE_Failure, CPLE_AppDefined,
                      "AdbcDatabaseSetOption() failed: %s", error.message());
@@ -252,9 +307,9 @@ bool OGRADBCDataset::Open(const GDALOpenInfo *poOpenInfo)
     {
         if (STARTS_WITH_CI(pszKey, "ADBC_OPTION_"))
         {
-            if (AdbcDatabaseSetOption(&m_database,
-                                      pszKey + strlen("ADBC_OPTION_"), pszValue,
-                                      error) != ADBC_STATUS_OK)
+            if (ADBC_CALL(DatabaseSetOption, &m_database,
+                          pszKey + strlen("ADBC_OPTION_"), pszValue,
+                          error) != ADBC_STATUS_OK)
             {
                 CPLError(CE_Failure, CPLE_AppDefined,
                          "AdbcDatabaseSetOption() failed: %s", error.message());
@@ -263,7 +318,7 @@ bool OGRADBCDataset::Open(const GDALOpenInfo *poOpenInfo)
         }
     }
 
-    if (AdbcDatabaseInit(&m_database, error) != ADBC_STATUS_OK)
+    if (ADBC_CALL(DatabaseInit, &m_database, error) != ADBC_STATUS_OK)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "AdbcDatabaseInit() failed: %s",
                  error.message());
@@ -271,14 +326,14 @@ bool OGRADBCDataset::Open(const GDALOpenInfo *poOpenInfo)
     }
 
     m_connection = std::make_unique<AdbcConnection>();
-    if (AdbcConnectionNew(m_connection.get(), error) != ADBC_STATUS_OK)
+    if (ADBC_CALL(ConnectionNew, m_connection.get(), error) != ADBC_STATUS_OK)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "AdbcConnectionNew() failed: %s",
                  error.message());
         return false;
     }
 
-    if (AdbcConnectionInit(m_connection.get(), &m_database, error) !=
+    if (ADBC_CALL(ConnectionInit, m_connection.get(), &m_database, error) !=
         ADBC_STATUS_OK)
     {
         CPLError(CE_Failure, CPLE_AppDefined, "AdbcConnectionInit() failed: %s",
@@ -394,13 +449,13 @@ OGRLayer *OGRADBCDataset::GetLayerByName(const char *pszName)
 
     OGRADBCError error;
     auto objectsStream = std::make_unique<OGRArrowArrayStream>();
-    AdbcConnectionGetObjects(m_connection.get(), ADBC_OBJECT_DEPTH_TABLES,
-                             /* catalog = */ nullptr,
-                             /* db_schema = */ nullptr,
-                             /* table_name = */ nullptr,
-                             /* table_type = */ nullptr,
-                             /* column_name = */ nullptr, objectsStream->get(),
-                             error);
+    ADBC_CALL(ConnectionGetObjects, m_connection.get(),
+              ADBC_OBJECT_DEPTH_TABLES,
+              /* catalog = */ nullptr,
+              /* db_schema = */ nullptr,
+              /* table_name = */ nullptr,
+              /* table_type = */ nullptr,
+              /* column_name = */ nullptr, objectsStream->get(), error);
 
     ArrowSchema schema = {};
     if (objectsStream->get_schema(&schema) != 0)
@@ -510,3 +565,5 @@ OGRLayer *OGRADBCDataset::GetLayerByName(const char *pszName)
     m_apoLayers.emplace_back(std::move(poTableListLayer));
     return m_apoLayers.back().get();
 }
+
+#undef ADBC_CALL
diff --git a/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp b/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp
index 3be24128f199..f9e5a295aefa 100644
--- a/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp
+++ b/ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp
@@ -12,6 +12,7 @@
 
 #include "ogrsf_frmts.h"
 #include "ogradbcdrivercore.h"
+#include "gdal_adbc.h"
 
 /************************************************************************/
 /*                             IsDuckDB()                               */
@@ -55,12 +56,15 @@ bool OGRADBCDriverIsParquet(const GDALOpenInfo *poOpenInfo)
 
 int OGRADBCDriverIdentify(GDALOpenInfo *poOpenInfo)
 {
-    return (STARTS_WITH(poOpenInfo->pszFilename, "ADBC:") ||
-            OGRADBCDriverIsDuckDB(poOpenInfo) ||
-            OGRADBCDriverIsSQLite3(poOpenInfo) ||
-            OGRADBCDriverIsParquet(poOpenInfo)) &&
-           !STARTS_WITH(poOpenInfo->pszFilename, "/vsi") &&
-           !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "mbtiles");
+    return STARTS_WITH(poOpenInfo->pszFilename, "ADBC:") ||
+           ((OGRADBCDriverIsDuckDB(poOpenInfo) ||
+             OGRADBCDriverIsSQLite3(poOpenInfo) ||
+             OGRADBCDriverIsParquet(poOpenInfo))
+#ifndef OGR_ADBC_HAS_DRIVER_MANAGER
+            && GDALGetAdbcLoadDriverOverride() != nullptr
+#endif
+            && !STARTS_WITH(poOpenInfo->pszFilename, "/vsi") &&
+            !EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "mbtiles"));
 }
 
 /************************************************************************/
@@ -88,6 +92,9 @@ void OGRADBCDriverSetCommonMetadata(GDALDriver *poDriver)
         "</OpenOptionList>");
     poDriver->SetMetadataItem(GDAL_DMD_SUPPORTED_SQL_DIALECTS,
                               "NATIVE OGRSQL SQLITE");
+#ifdef OGR_ADBC_HAS_DRIVER_MANAGER
+    poDriver->SetMetadataItem("HAS_ADBC_DRIVER_MANAGER", "YES");
+#endif
 
     poDriver->SetMetadataItem(GDAL_DCAP_OPEN, "YES");
     poDriver->pfnIdentify = OGRADBCDriverIdentify;
diff --git a/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp b/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp
index 3667c2ed5184..02a7b45d7c2e 100644
--- a/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp
+++ b/ogr/ogrsf_frmts/adbc/ogradbclayer.cpp
@@ -6,6 +6,7 @@
  *
  ******************************************************************************
  * Copyright (c) 2024, Even Rouault <even dot rouault at spatialys.com>
+ * Copyright (c) 2024, Dewey Dunnington <dewey@voltrondata.com>
  *
  * SPDX-License-Identifier: MIT
  ****************************************************************************/
@@ -13,6 +14,8 @@
 #include "ogr_adbc.h"
 #include "ogr_p.h"
 
+#define ADBC_CALL(func, ...) m_poDS->m_driver.func(__VA_ARGS__)
+
 /************************************************************************/
 /*                            OGRADBCLayer()                            */
 /************************************************************************/
@@ -45,7 +48,7 @@ OGRADBCLayer::~OGRADBCLayer()
 {
     OGRADBCError error;
     if (m_statement)
-        AdbcStatementRelease(m_statement.get(), error);
+        ADBC_CALL(StatementRelease, m_statement.get(), error);
     if (m_schema.release)
         m_schema.release(&m_schema);
 }
@@ -173,8 +176,8 @@ bool OGRADBCLayer::GetArrowStreamInternal(struct ArrowArrayStream *out_stream)
 {
     OGRADBCError error;
     int64_t rows_affected = -1;
-    if (AdbcStatementExecuteQuery(m_statement.get(), out_stream, &rows_affected,
-                                  error) != ADBC_STATUS_OK)
+    if (ADBC_CALL(StatementExecuteQuery, m_statement.get(), out_stream,
+                  &rows_affected, error) != ADBC_STATUS_OK)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "AdbcStatementExecuteQuery() failed: %s", error.message());
@@ -254,3 +257,5 @@ GIntBig OGRADBCLayer::GetFeatureCountParquet()
 
     return -1;
 }
+
+#undef ADBC_CALL

From f5dcc2e2ff524db810b40ac5787ff8b7c2225aa2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 29 Oct 2024 03:59:29 +0100
Subject: [PATCH 77/87] libertiff.hpp: avoid unsigned-integer-overflow (ossfuzz
 376100380)

---
 third_party/libertiff/libertiff.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/libertiff/libertiff.hpp b/third_party/libertiff/libertiff.hpp
index 7ea0191ffbd6..ee8f06d93bbb 100644
--- a/third_party/libertiff/libertiff.hpp
+++ b/third_party/libertiff/libertiff.hpp
@@ -1433,7 +1433,7 @@ class Image
 
                 entry.invalid_value_offset =
                     (byteCount > THRESHOLD_CHECK_FILE_SIZE &&
-                     (entry.value_offset >= m_rc->size() ||
+                     (m_rc->size() < byteCount ||
                       entry.value_offset > m_rc->size() - byteCount));
             }
         }

From 17e66b538fcb72550e8b866da31a5e43f85e5418 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 29 Oct 2024 04:16:20 +0100
Subject: [PATCH 78/87] Doc: download_past.rst: fix links to older md5 files

---
 doc/source/download_past.rst | 80 ++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/doc/source/download_past.rst b/doc/source/download_past.rst
index 1e4b3b54ed12..f732485793ef 100644
--- a/doc/source/download_past.rst
+++ b/doc/source/download_past.rst
@@ -283,279 +283,279 @@ Past Releases
 .. _`2.4.2 md5`: https://download.osgeo.org/gdal/2.4.2/gdal-2.4.2.tar.gz.md5
 
 
-* **2019-05** `gdal-3.0.0.tar.gz`_ `3.0.0 Release Notes`_ (`3.0.0 md5`)_
+* **2019-05** `gdal-3.0.0.tar.gz`_ `3.0.0 Release Notes`_ (`3.0.0 md5`_)
 
 .. _`gdal-3.0.0.tar.gz`: http://download.osgeo.org/gdal/3.0.0/gdal-3.0.0.tar.gz
 .. _`3.0.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.0/gdal/NEWS
 .. _`3.0.0 md5`: http://download.osgeo.org/gdal/3.0.0/gdal-3.0.0.tar.gz.md5
 
 
-* **2019-03** `gdal-2.4.1.tar.gz`_ `2.4.1 Release Notes`_ (`2.4.1 md5`)_
+* **2019-03** `gdal-2.4.1.tar.gz`_ `2.4.1 Release Notes`_ (`2.4.1 md5`_)
 
 .. _`gdal-2.4.1.tar.gz`: http://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz
 .. _`2.4.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.1/gdal/NEWS
 .. _`2.4.1 md5`: http://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz.md5
 
 
-* **2018-12** `gdal-2.4.0.tar.gz`_ `2.4.0 Release Notes`_ (`2.4.0 md5`)_
+* **2018-12** `gdal-2.4.0.tar.gz`_ `2.4.0 Release Notes`_ (`2.4.0 md5`_)
 
 .. _`gdal-2.4.0.tar.gz`: http://download.osgeo.org/gdal/2.4.0/gdal-2.4.0.tar.gz
 .. _`2.4.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.0/gdal/NEWS
 .. _`2.4.0 md5`: http://download.osgeo.org/gdal/2.4.0/gdal-2.4.0.tar.gz.md5
 
 
-* **2019-05** `gdal-3.0.0.tar.gz`_ `3.0.0 Release Notes`_ (`3.0.0 md5`)_
+* **2019-05** `gdal-3.0.0.tar.gz`_ `3.0.0 Release Notes`_ (`3.0.0 md5`_)
 
 .. _`gdal-3.0.0.tar.gz`: http://download.osgeo.org/gdal/3.0.0/gdal-3.0.0.tar.gz
 .. _`3.0.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v3.0.0/gdal/NEWS
 .. _`3.0.0 md5`: http://download.osgeo.org/gdal/3.0.0/gdal-3.0.0.tar.gz.md5
 
 
-* **2019-03** `gdal-2.4.1.tar.gz`_ `2.4.1 Release Notes`_ (`2.4.1 md5`)_
+* **2019-03** `gdal-2.4.1.tar.gz`_ `2.4.1 Release Notes`_ (`2.4.1 md5`_)
 
 .. _`gdal-2.4.1.tar.gz`: http://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz
 .. _`2.4.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.1/gdal/NEWS
 .. _`2.4.1 md5`: http://download.osgeo.org/gdal/2.4.1/gdal-2.4.1.tar.gz.md5
 
 
-* **2018-12** `gdal-2.4.0.tar.gz`_ `2.4.0 Release Notes`_ (`2.4.0 md5`)_
+* **2018-12** `gdal-2.4.0.tar.gz`_ `2.4.0 Release Notes`_ (`2.4.0 md5`_)
 
 .. _`gdal-2.4.0.tar.gz`: http://download.osgeo.org/gdal/2.4.0/gdal-2.4.0.tar.gz
 .. _`2.4.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.4.0/gdal/NEWS
 .. _`2.4.0 md5`: http://download.osgeo.org/gdal/2.4.0/gdal-2.4.0.tar.gz.md5
 
 
-* **2018-12** `gdal-2.3.3.tar.gz`_ `2.3.3 Release Notes`_ (`2.3.3 md5`)_
+* **2018-12** `gdal-2.3.3.tar.gz`_ `2.3.3 Release Notes`_ (`2.3.3 md5`_)
 
 .. _`gdal-2.3.3.tar.gz`: http://download.osgeo.org/gdal/2.3.3/gdal-2.3.3.tar.gz
 .. _`2.3.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.3.3/gdal/NEWS
 .. _`2.3.3 md5`: http://download.osgeo.org/gdal/2.3.3/gdal-2.3.3.tar.gz.md5
 
 
-* **2018-09** `gdal-2.3.2.tar.gz`_ `2.3.2 Release Notes`_ (`2.3.2 md5`)_
+* **2018-09** `gdal-2.3.2.tar.gz`_ `2.3.2 Release Notes`_ (`2.3.2 md5`_)
 
 .. _`gdal-2.3.2.tar.gz`: http://download.osgeo.org/gdal/2.3.2/gdal-2.3.2.tar.gz
 .. _`2.3.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.3.2/gdal/NEWS
 .. _`2.3.2 md5`: http://download.osgeo.org/gdal/2.3.2/gdal-2.3.2.tar.gz.md5
 
 
-* **2018-06** `gdal-2.3.1.tar.gz`_ `2.3.1 Release Notes`_ (`2.3.1 md5`)_
+* **2018-06** `gdal-2.3.1.tar.gz`_ `2.3.1 Release Notes`_ (`2.3.1 md5`_)
 
 .. _`gdal-2.3.1.tar.gz`: http://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz
 .. _`2.3.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.3.1/gdal/NEWS
 .. _`2.3.1 md5`: http://download.osgeo.org/gdal/2.3.1/gdal-2.3.1.tar.gz.md5
 
 
-* **2018-05** `gdal-2.3.0.tar.gz`_ `2.3.0 Release Notes`_ (`2.3.0 md5`)_
+* **2018-05** `gdal-2.3.0.tar.gz`_ `2.3.0 Release Notes`_ (`2.3.0 md5`_)
 
 .. _`gdal-2.3.0.tar.gz`: http://download.osgeo.org/gdal/2.3.0/gdal-2.3.0.tar.gz
 .. _`2.3.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.3.0/gdal/NEWS
 .. _`2.3.0 md5`: http://download.osgeo.org/gdal/2.3.0/gdal-2.3.0.tar.gz.md5
 
 
-* **2018-03** `gdal-2.2.4.tar.gz`_ `2.2.4 Release Notes`_ (`2.2.4 md5`)_
+* **2018-03** `gdal-2.2.4.tar.gz`_ `2.2.4 Release Notes`_ (`2.2.4 md5`_)
 
 .. _`gdal-2.2.4.tar.gz`: http://download.osgeo.org/gdal/2.2.4/gdal-2.2.4.tar.gz
 .. _`2.2.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.4/gdal/NEWS
 .. _`2.2.4 md5`: http://download.osgeo.org/gdal/2.2.4/gdal-2.2.4.tar.gz.md5
 
 
-* **2017-11** `gdal-2.2.3.tar.gz`_ `2.2.3 Release Notes`_ (`2.2.3 md5`)_
+* **2017-11** `gdal-2.2.3.tar.gz`_ `2.2.3 Release Notes`_ (`2.2.3 md5`_)
 
 .. _`gdal-2.2.3.tar.gz`: http://download.osgeo.org/gdal/2.2.3/gdal-2.2.3.tar.gz
 .. _`2.2.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.3/gdal/NEWS
 .. _`2.2.3 md5`: http://download.osgeo.org/gdal/2.2.3/gdal-2.2.3.tar.gz.md5
 
 
-* **2017-09** `gdal-2.2.2.tar.gz`_ `2.2.2 Release Notes`_ (`2.2.2 md5`)_
+* **2017-09** `gdal-2.2.2.tar.gz`_ `2.2.2 Release Notes`_ (`2.2.2 md5`_)
 
 .. _`gdal-2.2.2.tar.gz`: http://download.osgeo.org/gdal/2.2.2/gdal-2.2.2.tar.gz
 .. _`2.2.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.2/gdal/NEWS
 .. _`2.2.2 md5`: http://download.osgeo.org/gdal/2.2.2/gdal-2.2.2.tar.gz.md5
 
 
-* **2017-06** `gdal-2.2.1.tar.gz`_ `2.2.1 Release Notes`_ (`2.2.1 md5`)_
+* **2017-06** `gdal-2.2.1.tar.gz`_ `2.2.1 Release Notes`_ (`2.2.1 md5`_)
 
 .. _`gdal-2.2.1.tar.gz`: http://download.osgeo.org/gdal/2.2.1/gdal-2.2.1.tar.gz
 .. _`2.2.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.1/gdal/NEWS
 .. _`2.2.1 md5`: http://download.osgeo.org/gdal/2.2.1/gdal-2.2.1.tar.gz.md5
 
 
-* **2017-06** `gdal-2.1.4.tar.gz`_ `2.1.4 Release Notes`_ (`2.1.4 md5`)_
+* **2017-06** `gdal-2.1.4.tar.gz`_ `2.1.4 Release Notes`_ (`2.1.4 md5`_)
 
 .. _`gdal-2.1.4.tar.gz`: http://download.osgeo.org/gdal/2.1.4/gdal-2.1.4.tar.gz
 .. _`2.1.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.4/gdal/NEWS
 .. _`2.1.4 md5`: http://download.osgeo.org/gdal/2.1.4/gdal-2.1.4.tar.gz.md5
 
 
-* **2017-04** `gdal-2.2.0.tar.gz`_ `2.2.0 Release Notes`_ (`2.2.0 md5`)_
+* **2017-04** `gdal-2.2.0.tar.gz`_ `2.2.0 Release Notes`_ (`2.2.0 md5`_)
 
 .. _`gdal-2.2.0.tar.gz`: http://download.osgeo.org/gdal/2.2.0/gdal-2.2.0.tar.gz
 .. _`2.2.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.2.0/gdal/NEWS
 .. _`2.2.0 md5`: http://download.osgeo.org/gdal/2.2.0/gdal-2.2.0.tar.gz.md5
 
 
-* **2017-01** `gdal-2.1.3.tar.gz`_ `2.1.3 Release Notes`_ (`2.1.3 md5`)_
+* **2017-01** `gdal-2.1.3.tar.gz`_ `2.1.3 Release Notes`_ (`2.1.3 md5`_)
 
 .. _`gdal-2.1.3.tar.gz`: http://download.osgeo.org/gdal/2.1.3/gdal-2.1.3.tar.gz
 .. _`2.1.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.3/gdal/NEWS
 .. _`2.1.3 md5`: http://download.osgeo.org/gdal/2.1.3/gdal-2.1.3.tar.gz.md5
 
 
-* **2016-10** `gdal-2.1.2.tar.gz`_ `2.1.2 Release Notes`_ (`2.1.2 md5`)_
+* **2016-10** `gdal-2.1.2.tar.gz`_ `2.1.2 Release Notes`_ (`2.1.2 md5`_)
 
 .. _`gdal-2.1.2.tar.gz`: http://download.osgeo.org/gdal/2.1.2/gdal-2.1.2.tar.gz
 .. _`2.1.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.2/gdal/NEWS
 .. _`2.1.2 md5`: http://download.osgeo.org/gdal/2.1.2/gdal-2.1.2.tar.gz.md5
 
 
-* **2016-07** `gdal-2.1.1.tar.gz`_ `2.1.1 Release Notes`_ (`2.1.1 md5`)_
+* **2016-07** `gdal-2.1.1.tar.gz`_ `2.1.1 Release Notes`_ (`2.1.1 md5`_)
 
 .. _`gdal-2.1.1.tar.gz`: http://download.osgeo.org/gdal/2.1.1/gdal-2.1.1.tar.gz
 .. _`2.1.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.1/gdal/NEWS
 .. _`2.1.1 md5`: http://download.osgeo.org/gdal/2.1.1/gdal-2.1.1.tar.gz.md5
 
 
-* **2016-07** `gdal-2.0.3.tar.gz`_ `2.0.3 Release Notes`_ (`2.0.3 md5`)_
+* **2016-07** `gdal-2.0.3.tar.gz`_ `2.0.3 Release Notes`_ (`2.0.3 md5`_)
 
 .. _`gdal-2.0.3.tar.gz`: http://download.osgeo.org/gdal/2.0.3/gdal-2.0.3.tar.gz
 .. _`2.0.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.0.3/gdal/NEWS
 .. _`2.0.3 md5`: http://download.osgeo.org/gdal/2.0.3/gdal-2.0.3.tar.gz.md5
 
 
-* **2016-07** `gdal-1.11.5.tar.gz`_ `1.11.5 Release Notes`_ (`1.11.5 md5`)_
+* **2016-07** `gdal-1.11.5.tar.gz`_ `1.11.5 Release Notes`_ (`1.11.5 md5`_)
 
 .. _`gdal-1.11.5.tar.gz`: http://download.osgeo.org/gdal/1.11.5/gdal-1.11.5.tar.gz
 .. _`1.11.5 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.5/gdal/NEWS
 .. _`1.11.5 md5`: http://download.osgeo.org/gdal/1.11.5/gdal-1.11.5.tar.gz.md5
 
 
-* **2016-04** `gdal-2.1.0.tar.gz`_ `2.1.0 Release Notes`_ (`2.1.0 md5`)_
+* **2016-04** `gdal-2.1.0.tar.gz`_ `2.1.0 Release Notes`_ (`2.1.0 md5`_)
 
 .. _`gdal-2.1.0.tar.gz`: http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0.tar.gz
 .. _`2.1.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.1.0/gdal/NEWS
 .. _`2.1.0 md5`: http://download.osgeo.org/gdal/2.1.0/gdal-2.1.0.tar.gz.md5
 
 
-* **2016-01** `gdal-2.0.2.tar.gz`_ `2.0.2 Release Notes`_ (`2.0.2 md5`)_
+* **2016-01** `gdal-2.0.2.tar.gz`_ `2.0.2 Release Notes`_ (`2.0.2 md5`_)
 
 .. _`gdal-2.0.2.tar.gz`: http://download.osgeo.org/gdal/2.0.2/gdal-2.0.2.tar.gz
 .. _`2.0.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.0.2/gdal/NEWS
 .. _`2.0.2 md5`: http://download.osgeo.org/gdal/2.0.2/gdal-2.0.2.tar.gz.md5
 
 
-* **2016-01** `gdal-1.11.4.tar.gz`_ `1.11.4 Release Notes`_ (`1.11.4 md5`)_
+* **2016-01** `gdal-1.11.4.tar.gz`_ `1.11.4 Release Notes`_ (`1.11.4 md5`_)
 
 .. _`gdal-1.11.4.tar.gz`: http://download.osgeo.org/gdal/1.11.4/gdal-1.11.4.tar.gz
 .. _`1.11.4 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.4/gdal/NEWS
 .. _`1.11.4 md5`: http://download.osgeo.org/gdal/1.11.4/gdal-1.11.4.tar.gz.md5
 
 
-* **2015-09** `gdal-2.0.1.tar.gz`_ `2.0.1 Release Notes`_ (`2.0.1 md5`)_
+* **2015-09** `gdal-2.0.1.tar.gz`_ `2.0.1 Release Notes`_ (`2.0.1 md5`_)
 
 .. _`gdal-2.0.1.tar.gz`: http://download.osgeo.org/gdal/2.0.1/gdal-2.0.1.tar.gz
 .. _`2.0.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.0.1/gdal/NEWS
 .. _`2.0.1 md5`: http://download.osgeo.org/gdal/2.0.1/gdal-2.0.1.tar.gz.md5
 
 
-* **2015-09** `gdal-1.11.3.tar.gz`_ `1.11.3 Release Notes`_ (`1.11.3 md5`)_
+* **2015-09** `gdal-1.11.3.tar.gz`_ `1.11.3 Release Notes`_ (`1.11.3 md5`_)
 
 .. _`gdal-1.11.3.tar.gz`: http://download.osgeo.org/gdal/1.11.3/gdal-1.11.3.tar.gz
 .. _`1.11.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.3/gdal/NEWS
 .. _`1.11.3 md5`: http://download.osgeo.org/gdal/1.11.3/gdal-1.11.3.tar.gz.md5
 
 
-* **2015-06** `gdal-2.0.0.tar.gz`_ `2.0.0 Release Notes`_ (`2.0.0 md5`)_
+* **2015-06** `gdal-2.0.0.tar.gz`_ `2.0.0 Release Notes`_ (`2.0.0 md5`_)
 
 .. _`gdal-2.0.0.tar.gz`: http://download.osgeo.org/gdal/2.0.0/gdal-2.0.0.tar.gz
 .. _`2.0.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v2.0.0/gdal/NEWS
 .. _`2.0.0 md5`: http://download.osgeo.org/gdal/2.0.0/gdal-2.0.0.tar.gz.md5
 
 
-* **2015-02** `gdal-1.11.2.tar.gz`_ `1.11.2 Release Notes`_ (`1.11.2 md5`)_
+* **2015-02** `gdal-1.11.2.tar.gz`_ `1.11.2 Release Notes`_ (`1.11.2 md5`_)
 
 .. _`gdal-1.11.2.tar.gz`: http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.gz
 .. _`1.11.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.2/gdal/NEWS
 .. _`1.11.2 md5`: http://download.osgeo.org/gdal/1.11.2/gdal-1.11.2.tar.gz.md5
 
 
-* **2014-09** `gdal-1.11.1.tar.gz`_ `1.11.1 Release Notes`_ (`1.11.1 md5`)_
+* **2014-09** `gdal-1.11.1.tar.gz`_ `1.11.1 Release Notes`_ (`1.11.1 md5`_)
 
 .. _`gdal-1.11.1.tar.gz`: http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.gz
 .. _`1.11.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.1/gdal/NEWS
 .. _`1.11.1 md5`: http://download.osgeo.org/gdal/1.11.1/gdal-1.11.1.tar.gz.md5
 
 
-* **2014-04** `gdal-1.11.0.tar.gz`_ `1.11.0 Release Notes`_ (`1.11.0 md5`)_
+* **2014-04** `gdal-1.11.0.tar.gz`_ `1.11.0 Release Notes`_ (`1.11.0 md5`_)
 
 .. _`gdal-1.11.0.tar.gz`: http://download.osgeo.org/gdal/1.11.0/gdal-1.11.0.tar.gz
 .. _`1.11.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.11.0/gdal/NEWS
 .. _`1.11.0 md5`: http://download.osgeo.org/gdal/1.11.0/gdal-1.11.0.tar.gz.md5
 
 
-* **2013-08** `gdal-1.10.1.tar.gz`_ `1.10.1 Release Notes`_ (`1.10.1 md5`)_
+* **2013-08** `gdal-1.10.1.tar.gz`_ `1.10.1 Release Notes`_ (`1.10.1 md5`_)
 
 .. _`gdal-1.10.1.tar.gz`: http://download.osgeo.org/gdal/1.10.1/gdal-1.10.1.tar.gz
 .. _`1.10.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.10.1/gdal/NEWS
 .. _`1.10.1 md5`: http://download.osgeo.org/gdal/1.10.1/gdal-1.10.1.tar.gz.md5
 
 
-* **2013-04** `gdal-1.10.0.tar.gz`_ `1.10.0 Release Notes`_ (`1.10.0 md5`)_
+* **2013-04** `gdal-1.10.0.tar.gz`_ `1.10.0 Release Notes`_ (`1.10.0 md5`_)
 
 .. _`gdal-1.10.0.tar.gz`: http://download.osgeo.org/gdal/1.10.0/gdal-1.10.0.tar.gz
 .. _`1.10.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.10.0/gdal/NEWS
 .. _`1.10.0 md5`: http://download.osgeo.org/gdal/1.10.0/gdal-1.10.0.tar.gz.md5
 
 
-* **2012-10** `gdal-1.9.2.tar.gz`_ `1.9.2 Release Notes`_ (`1.9.2 md5`)_
+* **2012-10** `gdal-1.9.2.tar.gz`_ `1.9.2 Release Notes`_ (`1.9.2 md5`_)
 
 .. _`gdal-1.9.2.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.2.tar.gz
 .. _`1.9.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.9.2/gdal/NEWS
 .. _`1.9.2 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.2.tar.gz.md5
 
 
-* **2012-05** `gdal-1.9.1.tar.gz`_ `1.9.1 Release Notes`_ (`1.9.1 md5`)_
+* **2012-05** `gdal-1.9.1.tar.gz`_ `1.9.1 Release Notes`_ (`1.9.1 md5`_)
 
 .. _`gdal-1.9.1.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.1.tar.gz
 .. _`1.9.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.9.1/gdal/NEWS
 .. _`1.9.1 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.1.tar.gz.md5
 
 
-* **2011-12** `gdal-1.9.0.tar.gz`_ `1.9.0 Release Notes`_ (`1.9.0 md5`)_
+* **2011-12** `gdal-1.9.0.tar.gz`_ `1.9.0 Release Notes`_ (`1.9.0 md5`_)
 
 .. _`gdal-1.9.0.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.0.tar.gz
 .. _`1.9.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.9.0/gdal/NEWS
 .. _`1.9.0 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.9.0.tar.gz.md5
 
 
-* **2011-07** `gdal-1.8.1.tar.gz`_ `1.8.1 Release Notes`_ (`1.8.1 md5`)_
+* **2011-07** `gdal-1.8.1.tar.gz`_ `1.8.1 Release Notes`_ (`1.8.1 md5`_)
 
 .. _`gdal-1.8.1.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.8.1.tar.gz
 .. _`1.8.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.8.1/gdal/NEWS
 .. _`1.8.1 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.8.1.tar.gz.md5
 
 
-* **2011-01** `gdal-1.8.0.tar.gz`_ `1.8.0 Release Notes`_ (`1.8.0 md5`)_
+* **2011-01** `gdal-1.8.0.tar.gz`_ `1.8.0 Release Notes`_ (`1.8.0 md5`_)
 
 .. _`gdal-1.8.0.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.8.0.tar.gz
 .. _`1.8.0 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.8.0/gdal/NEWS
 .. _`1.8.0 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.8.0.tar.gz.md5
 
 
-* **2010-11** `gdal-1.7.3.tar.gz`_ `1.7.3 Release Notes`_ (`1.7.3 md5`)_
+* **2010-11** `gdal-1.7.3.tar.gz`_ `1.7.3 Release Notes`_ (`1.7.3 md5`_)
 
 .. _`gdal-1.7.3.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.3.tar.gz
 .. _`1.7.3 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.7.3/gdal/NEWS
 .. _`1.7.3 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.3.tar.gz.md5
 
-* **2010-04** `gdal-1.7.2.tar.gz`_ `1.7.2 Release Notes`_ (`1.7.2 md5`)_
+* **2010-04** `gdal-1.7.2.tar.gz`_ `1.7.2 Release Notes`_ (`1.7.2 md5`_)
 
 .. _`gdal-1.7.2.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.2.tar.gz
 .. _`1.7.2 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.7.2/gdal/NEWS
 .. _`1.7.2 md5`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.2.tar.gz.md5
 
 
-* **2010-02** `gdal-1.7.1.tar.gz`_ `1.7.1 Release Notes`_ (`1.7.1 md5`)_
+* **2010-02** `gdal-1.7.1.tar.gz`_ `1.7.1 Release Notes`_ (`1.7.1 md5`_)
 
 .. _`gdal-1.7.1.tar.gz`: http://download.osgeo.org/gdal/old_releases/gdal-1.7.1.tar.gz
 .. _`1.7.1 Release Notes`: https://github.com/OSGeo/gdal/blob/v1.7.1/gdal/NEWS

From 53d4d13c1618316c8f680b6fff9824e036f947e8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 29 Oct 2024 04:19:29 +0100
Subject: [PATCH 79/87] Doc: fix link to past releases in PDF output

---
 doc/source/download.rst | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/source/download.rst b/doc/source/download.rst
index cde867e88ea6..ca336557fdc3 100644
--- a/doc/source/download.rst
+++ b/doc/source/download.rst
@@ -27,7 +27,13 @@ Current Release
 Past Releases
 .............
 
-Links to :ref:`download_past` are also available.
+.. only:: html
+
+    Links to :ref:`download_past` are also available.
+
+.. only:: not html
+
+    Links to `past releases <https://gdal.org/en/latest/download_past.html>`__ are also available.
 
 .. _source:
 

From 667635360b050fc323e46ca6244ba4548a9108ea Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 29 Oct 2024 13:25:09 +0100
Subject: [PATCH 80/87] =?UTF-8?q?doc/build=5Fdoc=5Fsnapshot.sh:=20fix=20PD?=
 =?UTF-8?q?F=20generation=C2=A0[ci=20skip]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs #11162
---
 doc/build/html_extra/robots.txt | 3 ---
 doc/build_doc_snapshot.sh       | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 doc/build/html_extra/robots.txt

diff --git a/doc/build/html_extra/robots.txt b/doc/build/html_extra/robots.txt
deleted file mode 100644
index 1b0f0fd8b207..000000000000
--- a/doc/build/html_extra/robots.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-User-agent: *
-Allow: /en/latest/
-Disallow: /en/
diff --git a/doc/build_doc_snapshot.sh b/doc/build_doc_snapshot.sh
index 4d6805ccc1c9..1a3de3701892 100755
--- a/doc/build_doc_snapshot.sh
+++ b/doc/build_doc_snapshot.sh
@@ -13,7 +13,9 @@ rm -f .doxygen_up_to_date
 rm -rf build/html
 rm -rf build/latex
 make html
-make latexpdf
+
+python3 -m sphinx -T -b latex -d build/doctrees -D language=en source build/latex
+(cd build/latex && (latexmk -r latexmkrc -pdf -f -dvi- -ps- -jobname=gdal -interaction=nonstopmode || test -f gdal.pdf))
 
 rm -rf "${TMPDIR}"
 mkdir ${TMPDIR}

From 1c459f57d9409f9cffa35cd619957d7c5e9163bf Mon Sep 17 00:00:00 2001
From: Daniel Baston <dbaston@gmail.com>
Date: Mon, 28 Oct 2024 11:00:41 -0400
Subject: [PATCH 81/87] OGRFeature: Add SetGeometry overloads taking
 unique_ptr<OGRGeometry>

---
 autotest/cpp/test_ogr.cpp |  63 ++++++++++++++++++++
 ogr/ogr_feature.h         |   2 +
 ogr/ogrfeature.cpp        | 117 +++++++++++++++++++++++++++++---------
 3 files changed, 155 insertions(+), 27 deletions(-)

diff --git a/autotest/cpp/test_ogr.cpp b/autotest/cpp/test_ogr.cpp
index 5ae28fcd95f7..9f2de42a3150 100644
--- a/autotest/cpp/test_ogr.cpp
+++ b/autotest/cpp/test_ogr.cpp
@@ -4394,4 +4394,67 @@ TEST_F(test_ogr, OGRPolygon_addRingDirectly)
     ASSERT_EQ(p.addRingDirectly(lr.release()), OGRERR_NONE);
 }
 
+TEST_F(test_ogr, OGRFeature_SetGeometry)
+{
+    OGRFeatureDefn *poFeatureDefn = new OGRFeatureDefn();
+    poFeatureDefn->Reference();
+
+    OGRFeature oFeat(poFeatureDefn);
+    std::unique_ptr<OGRGeometry> poGeom;
+    OGRGeometry *poTmpGeom;
+    ASSERT_EQ(
+        OGRGeometryFactory::createFromWkt("POINT (3 7)", nullptr, &poTmpGeom),
+        OGRERR_NONE);
+    poGeom.reset(poTmpGeom);
+    ASSERT_EQ(oFeat.SetGeometry(std::move(poGeom)), OGRERR_NONE);
+    EXPECT_EQ(oFeat.GetGeometryRef()->toPoint()->getX(), 3);
+    EXPECT_EQ(oFeat.GetGeometryRef()->toPoint()->getY(), 7);
+
+    // set it again to make sure previous feature geometry is freed
+    ASSERT_EQ(
+        OGRGeometryFactory::createFromWkt("POINT (2 8)", nullptr, &poTmpGeom),
+        OGRERR_NONE);
+    poGeom.reset(poTmpGeom);
+    ASSERT_EQ(oFeat.SetGeometry(std::move(poGeom)), OGRERR_NONE);
+    EXPECT_EQ(oFeat.GetGeometryRef()->toPoint()->getX(), 2);
+    EXPECT_EQ(oFeat.GetGeometryRef()->toPoint()->getY(), 8);
+
+    poFeatureDefn->Release();
+}
+
+TEST_F(test_ogr, OGRFeature_SetGeomField)
+{
+    OGRFeatureDefn *poFeatureDefn = new OGRFeatureDefn();
+    poFeatureDefn->Reference();
+
+    OGRGeomFieldDefn oGeomField("second", wkbPoint);
+    poFeatureDefn->AddGeomFieldDefn(&oGeomField);
+
+    OGRFeature oFeat(poFeatureDefn);
+
+    // failure
+    {
+        std::unique_ptr<OGRGeometry> poGeom;
+        OGRGeometry *poTmpGeom;
+        ASSERT_EQ(OGRGeometryFactory::createFromWkt("POINT (3 7)", nullptr,
+                                                    &poTmpGeom),
+                  OGRERR_NONE);
+        poGeom.reset(poTmpGeom);
+        EXPECT_EQ(oFeat.SetGeomField(13, std::move(poGeom)), OGRERR_FAILURE);
+    }
+
+    // success
+    {
+        std::unique_ptr<OGRGeometry> poGeom;
+        OGRGeometry *poTmpGeom;
+        ASSERT_EQ(OGRGeometryFactory::createFromWkt("POINT (3 7)", nullptr,
+                                                    &poTmpGeom),
+                  OGRERR_NONE);
+        poGeom.reset(poTmpGeom);
+        EXPECT_EQ(oFeat.SetGeomField(1, std::move(poGeom)), OGRERR_NONE);
+    }
+
+    poFeatureDefn->Release();
+}
+
 }  // namespace
diff --git a/ogr/ogr_feature.h b/ogr/ogr_feature.h
index b19421f6fdb7..d710dfd54a93 100644
--- a/ogr/ogr_feature.h
+++ b/ogr/ogr_feature.h
@@ -1178,6 +1178,7 @@ class CPL_DLL OGRFeature
 
     OGRErr SetGeometryDirectly(OGRGeometry *);
     OGRErr SetGeometry(const OGRGeometry *);
+    OGRErr SetGeometry(std::unique_ptr<OGRGeometry>);
     OGRGeometry *GetGeometryRef();
     const OGRGeometry *GetGeometryRef() const;
     OGRGeometry *StealGeometry() CPL_WARN_UNUSED_RESULT;
@@ -1209,6 +1210,7 @@ class CPL_DLL OGRFeature
     const OGRGeometry *GetGeomFieldRef(const char *pszFName) const;
     OGRErr SetGeomFieldDirectly(int iField, OGRGeometry *);
     OGRErr SetGeomField(int iField, const OGRGeometry *);
+    OGRErr SetGeomField(int iField, std::unique_ptr<OGRGeometry>);
 
     void Reset();
 
diff --git a/ogr/ogrfeature.cpp b/ogr/ogrfeature.cpp
index 426e9b398600..1cc4f594dd44 100644
--- a/ogr/ogrfeature.cpp
+++ b/ogr/ogrfeature.cpp
@@ -433,7 +433,7 @@ OGRFeatureDefnH OGR_F_GetDefnRef(OGRFeatureH hFeat)
 /**
  * \brief Set feature geometry.
  *
- * This method updates the features geometry, and operate exactly as
+ * This method updates the features geometry, and operates the same as
  * SetGeometry(), except that this method assumes ownership of the
  * passed geometry (even in case of failure of that function).
  *
@@ -456,11 +456,12 @@ OGRFeatureDefnH OGR_F_GetDefnRef(OGRFeatureH hFeat)
 OGRErr OGRFeature::SetGeometryDirectly(OGRGeometry *poGeomIn)
 
 {
-    if (GetGeomFieldCount() > 0)
-        return SetGeomFieldDirectly(0, poGeomIn);
+    if (poGeomIn == GetGeometryRef())
+    {
+        return OGRERR_NONE;
+    }
 
-    delete poGeomIn;
-    return OGRERR_FAILURE;
+    return SetGeomField(0, std::unique_ptr<OGRGeometry>(poGeomIn));
 }
 
 /************************************************************************/
@@ -470,7 +471,7 @@ OGRErr OGRFeature::SetGeometryDirectly(OGRGeometry *poGeomIn)
 /**
  * \brief Set feature geometry.
  *
- * This function updates the features geometry, and operate exactly as
+ * This function updates the features geometry, and operates the same as
  * SetGeometry(), except that this function assumes ownership of the
  * passed geometry (even in case of failure of that function).
  *
@@ -506,7 +507,7 @@ OGRErr OGR_F_SetGeometryDirectly(OGRFeatureH hFeat, OGRGeometryH hGeom)
 /**
  * \brief Set feature geometry.
  *
- * This method updates the features geometry, and operate exactly as
+ * This method updates the features geometry, and operates the same as
  * SetGeometryDirectly(), except that this method does not assume ownership
  * of the passed geometry, but instead makes a copy of it.
  *
@@ -542,7 +543,7 @@ OGRErr OGRFeature::SetGeometry(const OGRGeometry *poGeomIn)
 /**
  * \brief Set feature geometry.
  *
- * This function updates the features geometry, and operate exactly as
+ * This function updates the features geometry, and operates the same as
  * SetGeometryDirectly(), except that this function does not assume ownership
  * of the passed geometry, but instead makes a copy of it.
  *
@@ -570,6 +571,37 @@ OGRErr OGR_F_SetGeometry(OGRFeatureH hFeat, OGRGeometryH hGeom)
         OGRGeometry::FromHandle(hGeom));
 }
 
+/************************************************************************/
+/*                        SetGeometry()                                 */
+/************************************************************************/
+
+/**
+ * \brief Set feature geometry.
+ *
+ * This method is the same as the C function OGR_F_SetGeometryDirectly().
+ *
+ * @note This method has only an effect on the in-memory feature object. If
+ * this object comes from a layer and the modifications must be serialized back
+ * to the datasource, OGR_L_SetFeature() must be used afterwards. Or if this is
+ * a new feature, OGR_L_CreateFeature() must be used afterwards.
+ *
+ * @param poGeomIn new geometry to apply to feature. Passing NULL value here
+ * is correct and it will result in deallocation of currently assigned geometry
+ * without assigning new one.
+ *
+ * @return OGRERR_NONE if successful, or OGR_UNSUPPORTED_GEOMETRY_TYPE if
+ * the geometry type is illegal for the OGRFeatureDefn (checking not yet
+ * implemented).
+ *
+ * @since GDAL 3.11
+ */
+
+OGRErr OGRFeature::SetGeometry(std::unique_ptr<OGRGeometry> poGeomIn)
+
+{
+    return SetGeomField(0, std::move(poGeomIn));
+}
+
 /************************************************************************/
 /*                           StealGeometry()                            */
 /************************************************************************/
@@ -907,7 +939,7 @@ OGRGeometryH OGR_F_GetGeomFieldRef(OGRFeatureH hFeat, int iField)
 /**
  * \brief Set feature geometry of a specified geometry field.
  *
- * This method updates the features geometry, and operate exactly as
+ * This method updates the features geometry, and operates the same as
  * SetGeomField(), except that this method assumes ownership of the
  * passed geometry (even in case of failure of that function).
  *
@@ -926,21 +958,13 @@ OGRGeometryH OGR_F_GetGeomFieldRef(OGRFeatureH hFeat, int iField)
  */
 
 OGRErr OGRFeature::SetGeomFieldDirectly(int iField, OGRGeometry *poGeomIn)
-
 {
-    if (iField < 0 || iField >= GetGeomFieldCount())
-    {
-        delete poGeomIn;
-        return OGRERR_FAILURE;
-    }
-
-    if (papoGeometries[iField] != poGeomIn)
+    if (poGeomIn && poGeomIn == GetGeomFieldRef(iField))
     {
-        delete papoGeometries[iField];
-        papoGeometries[iField] = poGeomIn;
+        return OGRERR_NONE;
     }
 
-    return OGRERR_NONE;
+    return SetGeomField(iField, std::unique_ptr<OGRGeometry>(poGeomIn));
 }
 
 /************************************************************************/
@@ -950,7 +974,7 @@ OGRErr OGRFeature::SetGeomFieldDirectly(int iField, OGRGeometry *poGeomIn)
 /**
  * \brief Set feature geometry of a specified geometry field.
  *
- * This function updates the features geometry, and operate exactly as
+ * This function updates the features geometry, and operates the same as
  * SetGeomField(), except that this function assumes ownership of the
  * passed geometry (even in case of failure of that function).
  *
@@ -985,7 +1009,7 @@ OGRErr OGR_F_SetGeomFieldDirectly(OGRFeatureH hFeat, int iField,
 /**
  * \brief Set feature geometry of a specified geometry field.
  *
- * This method updates the features geometry, and operate exactly as
+ * This method updates the features geometry, and operates the same as
  * SetGeomFieldDirectly(), except that this method does not assume ownership
  * of the passed geometry, but instead makes a copy of it.
  *
@@ -1031,7 +1055,7 @@ OGRErr OGRFeature::SetGeomField(int iField, const OGRGeometry *poGeomIn)
 /**
  * \brief Set feature geometry of a specified geometry field.
  *
- * This function updates the features geometry, and operate exactly as
+ * This function updates the features geometry, and operates the same as
  * SetGeometryDirectly(), except that this function does not assume ownership
  * of the passed geometry, but instead makes a copy of it.
  *
@@ -1055,6 +1079,45 @@ OGRErr OGR_F_SetGeomField(OGRFeatureH hFeat, int iField, OGRGeometryH hGeom)
         iField, OGRGeometry::FromHandle(hGeom));
 }
 
+/************************************************************************/
+/*                       SetGeomField()                                 */
+/************************************************************************/
+
+/**
+ * \brief Set feature geometry of a specified geometry field.
+ *
+ * This method is the same as the C function OGR_F_SetGeomFieldDirectly().
+ *
+ * @param iField geometry field to set.
+ * @param poGeomIn new geometry to apply to feature. Passing NULL value here
+ * is correct and it will result in deallocation of currently assigned geometry
+ * without assigning new one.
+ *
+ * @return OGRERR_NONE if successful, or OGRERR_FAILURE if the index is invalid,
+ * or OGRERR_UNSUPPORTED_GEOMETRY_TYPE if the geometry type is illegal for the
+ * OGRFeatureDefn (checking not yet implemented).
+ *
+ * @since GDAL 3.11
+ */
+
+OGRErr OGRFeature::SetGeomField(int iField,
+                                std::unique_ptr<OGRGeometry> poGeomIn)
+
+{
+    if (iField < 0 || iField >= GetGeomFieldCount())
+    {
+        return OGRERR_FAILURE;
+    }
+
+    if (papoGeometries[iField] != poGeomIn.get())
+    {
+        delete papoGeometries[iField];
+        papoGeometries[iField] = poGeomIn.release();
+    }
+
+    return OGRERR_NONE;
+}
+
 /************************************************************************/
 /*                               Clone()                                */
 /************************************************************************/
@@ -6688,7 +6751,7 @@ const char *OGR_F_GetStyleString(OGRFeatureH hFeat)
 /**
  * \brief Set feature style string.
  *
- * This method operate exactly as OGRFeature::SetStyleStringDirectly() except
+ * This method operates the same as OGRFeature::SetStyleStringDirectly() except
  * that it does not assume ownership of the passed string, but instead makes a
  * copy of it.
  *
@@ -6716,7 +6779,7 @@ void OGRFeature::SetStyleString(const char *pszString)
 /**
  * \brief Set feature style string.
  *
- * This method operate exactly as OGR_F_SetStyleStringDirectly() except that it
+ * This method operates the same as OGR_F_SetStyleStringDirectly() except that it
  * does not assume ownership of the passed string, but instead makes a copy of
  * it.
  *
@@ -6741,7 +6804,7 @@ void OGR_F_SetStyleString(OGRFeatureH hFeat, const char *pszStyle)
 /**
  * \brief Set feature style string.
  *
- * This method operate exactly as OGRFeature::SetStyleString() except that it
+ * This method operates the same as OGRFeature::SetStyleString() except that it
  * assumes ownership of the passed string.
  *
  * This method is the same as the C function OGR_F_SetStyleStringDirectly().
@@ -6762,7 +6825,7 @@ void OGRFeature::SetStyleStringDirectly(char *pszString)
 /**
  * \brief Set feature style string.
  *
- * This method operate exactly as OGR_F_SetStyleString() except that it assumes
+ * This method operates the same as OGR_F_SetStyleString() except that it assumes
  * ownership of the passed string.
  *
  * This function is the same as the C++ method

From 7c9d6a7c6a8efe2571e1b9330acdf2effa9b00ca Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 29 Oct 2024 14:57:31 +0100
Subject: [PATCH 82/87] VSICURLReadGlobalEnvVariables(): remove useless code
 (master only)

---
 port/cpl_vsil_curl.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/port/cpl_vsil_curl.cpp b/port/cpl_vsil_curl.cpp
index 66934f5fa40c..642386fedf74 100644
--- a/port/cpl_vsil_curl.cpp
+++ b/port/cpl_vsil_curl.cpp
@@ -189,10 +189,6 @@ static void VSICURLReadGlobalEnvVariables()
                         nCacheSize);
                 }
             }
-            else
-            {
-                nCacheSize = CACHE_SIZE_DEFAULT;
-            }
 
             const auto nMaxRAM = CPLGetUsablePhysicalRAM();
             const auto nMinVal = DOWNLOAD_CHUNK_SIZE_DO_NOT_USE_DIRECTLY;

From 8ce554bb2f6a44cd8e923e50514255970dce0e2d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 29 Oct 2024 20:20:45 +0100
Subject: [PATCH 83/87] Add RFC 102 text: Embedding resource files into libgdal
 (#10913)

Co-authored-by: Peter A. Jonsson <jonsson.peter.a@gmail.com>
---
 doc/source/development/rfc/index.rst          |   1 +
 .../rfc/rfc102_embedded_resources.rst         | 165 ++++++++++++++++++
 doc/source/spelling_wordlist.txt              |   6 +
 3 files changed, 172 insertions(+)
 create mode 100644 doc/source/development/rfc/rfc102_embedded_resources.rst

diff --git a/doc/source/development/rfc/index.rst b/doc/source/development/rfc/index.rst
index 73f24bcf634e..fc7714e67617 100644
--- a/doc/source/development/rfc/index.rst
+++ b/doc/source/development/rfc/index.rst
@@ -107,3 +107,4 @@ RFC list
     rfc98_build_requirements_gdal_3_9
     rfc99_geometry_coordinate_precision
     rfc101_raster_dataset_threadsafety
+    rfc102_embedded_resources
diff --git a/doc/source/development/rfc/rfc102_embedded_resources.rst b/doc/source/development/rfc/rfc102_embedded_resources.rst
new file mode 100644
index 000000000000..96ed7ade8ae3
--- /dev/null
+++ b/doc/source/development/rfc/rfc102_embedded_resources.rst
@@ -0,0 +1,165 @@
+.. _rfc-102:
+
+===================================================================
+RFC 102: Embedding resource files into libgdal
+===================================================================
+
+============== =============================================
+Author:        Even Rouault
+Contact:       even.rouault @ spatialys.com
+Started:       2024-Oct-01
+Status:        Adopted, implemented
+Target:        GDAL 3.11
+============== =============================================
+
+Summary
+-------
+
+This RFC uses C23 ``#embed`` pre-processor directive, when available,
+to be able to optionally embed GDAL resource files directly into libgdal.
+
+A similar `PROJ RFC-8 <https://github.com/OSGeo/PROJ/pull/4274>`__ has been
+submitted for PROJ to embed its :file:`proj.db` and :file:`proj.ini` files.
+
+Motivation
+----------
+
+Some parts of GDAL core, mostly drivers, require external resource files located
+in the filesystem. Locating these resource files is difficult for use cases where
+the GDAL binaries are relocated during installation time.
+One such case could be the GDAL embedded in Rasterio or Fiona binary wheels where :config:`GDAL_DATA` must be set to the directory of the resource files.
+Web-assembly (WASM) use cases come also to mind as users of GDAL builds where
+resources are directly included in libgdal.
+
+Technical solution
+------------------
+
+The C23 standard includes a `#embed "filename" <https://en.cppreference.com/w/c/preprocessor/embed>`__
+pre-processor directive that ingests the specified filename and returns its
+content as tokens that can be stored in a unsigned char or char array.
+
+Getting the content of a file into a variable is as simple as the following
+(which also demonstrates adding a nul-terminating character when this is needed):
+
+.. code-block:: c
+
+    static const char szPDS4Template[] = {
+    #embed "data/pds4_template.xml"
+        , '\0'};
+
+Compiler support
+----------------
+
+Support for that directive is still very new. clang 19.1 is the
+first compiler which has a release including it, and has an efficient
+implementation of it, able to embed very large files with minimum RAM and CPU
+usage.
+
+The development version of GCC 15 also supports it, but in a non-optimized way
+for now. i.e. trying to include large files, of several tens of megabytes could
+cause significant compilation time, but without impact on runtime. This is not
+an issue for GDAL use cases, and there is intent from GCC developers to improve
+this in the future.
+
+Embedding PROJ's :file:`proj.db` of size 9.1 MB with GCC 15dev at time of writing takes
+18 seconds and 1.7 GB RAM, compared to 0.4 second and 400 MB RAM for clang 19,
+which is still reasonable (Generating :file:`proj.db` itself from its source .sql files
+takes one minute on the same system).
+
+There is no timeline for Visual Studio C/C++ at time of writing (it has been
+`requested by users <https://developercommunity.visualstudio.com/t/Add-support-for-embed-as-voted-into-the/10451640>`__)
+
+To be noted that currently clang 19.1 only supports ``#embed`` in .c files, not
+C++ ones (the C++ standard has not yet adopted this feature). So embedding
+resources must be done in a .c file, which is obviously not a problem since
+we can easily export symbols/functions from a .c file to be available by C++.
+
+New CMake options
+-----------------
+
+Resources will only be embedded if the new ``EMBED_RESOURCE_FILES`` CMake option
+is set to ``ON``. This option will default to ``ON`` for static library builds
+and if `C23 ``#embed`` is detected to be available. Users might also turn it to ON for
+shared library builds. A CMake error is emitted if the option is turned on but
+the compiler lacks support for it.
+
+A complementary CMake option ``USE_ONLY_EMBEDDED_RESOURCE_FILES`` will also
+be added. It will default to ``OFF``. When set to ON, GDAL will not try to
+locate resource files in the GDAL_DATA directory burnt at build time into libgdal
+(``${install_prefix}/share/gdal``), or by the :config:`GDAL_DATA` configuration option.
+
+Said otherwise, if ``EMBED_RESOURCE_FILES=ON`` but ``USE_ONLY_EMBEDDED_RESOURCE_FILES=OFF``,
+GDAL will first try to locate resource files from the file system, and
+fallback to the embedded version if not found.
+
+The resource files will still be installed in ``${install_prefix}/share/gdal``,
+unless ``USE_ONLY_EMBEDDED_RESOURCE_FILES`` is set to ON.
+
+Impacted code
+-------------
+
+- gcore: embedding LICENSE.TXT, and tms_*.json files
+- frmts/grib: embedding GRIB2 CSV files
+- frmts/hdf5: embedding bag_template.xml
+- frmts/nitf: embedding nitf_spec.xml
+- frmts/pdf: embedding pdf_composition.xml
+- frmts/pds: embedding pds4_template.xml and vicar.json
+- ogr/ogrsf_frmts/dgn: embedding seed_2d.dgn and seed_3d.dgn
+- ogr/ogrsf_frmts/dxf: embedding header.dxf and leader.dxf
+- ogr/ogrsf_frmts/gml: embedding .gfs files and gml_registry.xml
+- ogr/ogrsf_frmts/gmlas: embedding gmlasconf.xml
+- ogr/ogrsf_frmts/miramon: embedding MM_m_idofic.csv
+- ogr/ogrsf_frmts/osm: embedding osm_conf.ini
+- ogr/ogrsf_frmts/plscenes: embedding plscenesconf.json
+- ogr/ogrsf_frmts/s57: embedding s57*.csv files
+- ogr/ogrsf_frmts/sxf: embedding default.rsc
+- ogr/ogrsf_frmts/vdv: embedding vdv452.xml
+
+Considered alternatives
+-----------------------
+
+Including resource files into libraries has been a long-wished feature of C/C++.
+Different workarounds have emerged over the years, such as the use of the
+``od -x`` utility, GNU ``ld`` linker ``-b`` mode, or CMake-based solutions such
+as https://jonathanhamberg.com/post/cmake-file-embedding/
+
+We could potentially use the later to address non-C23 capable compilers, but
+we have chosen not to do that, for the sake of implementation simplicity. And,
+if considering using the CMake trick as the only solution, we should note that
+C23 #embed has the potential for better compile time, as demonstrated by clang
+implementation.
+
+Backward compatibility
+----------------------
+
+Fully backwards compatible.
+
+C23 is not required, unless EMBED_RESOURCE_FILES is enabled in GDAL.
+
+Documentation
+-------------
+
+The 2 new CMake variables will be documented.
+
+Testing
+-------
+
+The existing fedora:rawhide continuous integration target, which has now clang
+19.1 available, will be modified to test the effect of the new variables.
+
+Local builds using GCC 15dev builds of https://jwakely.github.io/pkg-gcc-latest/
+have also be successfully done during the development of the candidate implementation
+
+Related issues and PRs
+----------------------
+
+- https://github.com/OSGeo/gdal/issues/10780
+
+- `GDAL candidate implementation <https://github.com/OSGeo/gdal/pull/10972>`__
+
+- `PROJ RFC-8 Embedding resource files into libproj <https://github.com/OSGeo/PROJ/pull/4274>`__
+
+Voting history
+--------------
+
++1 from PSC members JukkaR, JavierJS, KurtS, HowardB and EvenR
diff --git a/doc/source/spelling_wordlist.txt b/doc/source/spelling_wordlist.txt
index 8ab6099562d9..f60cc6b6a0c0 100644
--- a/doc/source/spelling_wordlist.txt
+++ b/doc/source/spelling_wordlist.txt
@@ -1356,6 +1356,7 @@ IdentificationTolerance
 identificator
 Identificator
 IDisposable
+idofic
 Idrisi
 iDriver
 idx
@@ -1785,6 +1786,7 @@ minY
 MinZ
 Mipmaps
 MiraD
+miramon
 mis
 mitab
 mkdir
@@ -2412,6 +2414,7 @@ Placemark
 plaintext
 Plessis
 plmosaic
+plscenes
 plscenesconf
 pM
 pnBufferSize
@@ -2844,6 +2847,7 @@ RPF
 rpr
 RRaster
 rrd
+rsc
 rsiz
 rst
 rsync
@@ -3145,6 +3149,7 @@ swi
 Swif
 swiftclient
 swq
+sxf
 sym
 symlinked
 syntaxes
@@ -3416,6 +3421,7 @@ vcpkg
 vct
 vcvars
 vdc
+vdv
 vecror
 VectorInfo
 VectorInfoOptions

From 7fc7f57d70bd74b83def9624c18f9188f9b917c1 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 29 Oct 2024 22:43:18 +0100
Subject: [PATCH 84/87] Doc: RFC102: point to PROJ RFC8

---
 doc/source/development/rfc/rfc102_embedded_resources.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/development/rfc/rfc102_embedded_resources.rst b/doc/source/development/rfc/rfc102_embedded_resources.rst
index 96ed7ade8ae3..ea41f2ec985b 100644
--- a/doc/source/development/rfc/rfc102_embedded_resources.rst
+++ b/doc/source/development/rfc/rfc102_embedded_resources.rst
@@ -157,7 +157,7 @@ Related issues and PRs
 
 - `GDAL candidate implementation <https://github.com/OSGeo/gdal/pull/10972>`__
 
-- `PROJ RFC-8 Embedding resource files into libproj <https://github.com/OSGeo/PROJ/pull/4274>`__
+- `PROJ RFC-8 Embedding resource files into libproj <https://proj.org/en/latest/community/rfc/rfc-8.html>`__
 
 Voting history
 --------------

From 2a64484b01b85ee0713ba0bbff69f09a4e91175e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 29 Oct 2024 23:20:29 +0100
Subject: [PATCH 85/87] README.md: remove mention to Trac [ci skip]

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 4d447c358b17..b76a3c4f35a8 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,6 @@ GDAL is an open source MIT licensed translator library for raster and vector geo
 * GIT repository: https://github.com/OSGeo/gdal
 * Bug tracker: https://github.com/OSGeo/gdal/issues
 * Download: https://download.osgeo.org/gdal
-* Wiki: https://trac.osgeo.org/gdal - Various user and developer contributed documentation and hints
 * Mailing list: https://lists.osgeo.org/mailman/listinfo/gdal-dev
 
 [//]: # (numfocus-fiscal-sponsor-attribution)

From 6da37eb8c2845eaab2715fbca001c391795e2eb4 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 30 Oct 2024 00:00:04 +0100
Subject: [PATCH 86/87] CI: try to fix Coverity Scan builds upload [ci skip]

---
 .github/workflows/coverity_scan/build.sh | 36 +++++++++++++++++++-----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/coverity_scan/build.sh b/.github/workflows/coverity_scan/build.sh
index 3becfb98f422..7337a13889a7 100755
--- a/.github/workflows/coverity_scan/build.sh
+++ b/.github/workflows/coverity_scan/build.sh
@@ -22,10 +22,32 @@ cmake ${GDAL_SOURCE_DIR:=..} \
 
 /tmp/cov-analysis-linux64/bin/cov-build --dir cov-int make "-j$(nproc)"
 tar czf cov-int.tgz cov-int
-curl \
-    --form token=$COVERITY_SCAN_TOKEN \
-    --form email=$COVERITY_SCAN_EMAIL \
-    --form file=@cov-int.tgz \
-    --form version=master \
-    --form description="`git rev-parse --abbrev-ref HEAD` `git rev-parse --short HEAD`" \
-    https://scan.coverity.com/builds?project=GDAL
+
+apt-get install -y jq
+
+## Below from https://scan.coverity.com/projects/gdal/builds/new
+
+# Initialize a build. Fetch a cloud upload url.
+curl -X POST \
+  -d version=master \
+  -d description="$(git rev-parse --abbrev-ref HEAD) $(git rev-parse --short HEAD)" \
+  -d token=$COVERITY_SCAN_TOKEN \
+  -d email=$COVERITY_SCAN_EMAIL \
+  -d file_name="cov-int.tgz" \
+  https://scan.coverity.com/projects/749/builds/init \
+  | tee response
+
+# Store response data to use in later stages.
+upload_url=$(jq -r '.url' response)
+build_id=$(jq -r '.build_id' response)
+
+# Upload the tarball to the Cloud.
+curl -X PUT \
+  --header 'Content-Type: application/json' \
+  --upload-file cov-int.tgz \
+  $upload_url
+
+#  Trigger the build on Scan.
+curl -X PUT \
+  -d token=$COVERITY_SCAN_TOKEN \
+  https://scan.coverity.com/projects/749/builds/$build_id/enqueue

From 51b869872a37d346fed14526e0b92e22a405b29e Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 30 Oct 2024 00:50:36 +0100
Subject: [PATCH 87/87] CI: .github/workflows/coverity_scan/build.sh: fix [ci
 skip]

---
 .github/workflows/coverity_scan/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/coverity_scan/build.sh b/.github/workflows/coverity_scan/build.sh
index 7337a13889a7..596bbbc100a9 100755
--- a/.github/workflows/coverity_scan/build.sh
+++ b/.github/workflows/coverity_scan/build.sh
@@ -23,6 +23,7 @@ cmake ${GDAL_SOURCE_DIR:=..} \
 /tmp/cov-analysis-linux64/bin/cov-build --dir cov-int make "-j$(nproc)"
 tar czf cov-int.tgz cov-int
 
+apt-get update -y
 apt-get install -y jq
 
 ## Below from https://scan.coverity.com/projects/gdal/builds/new