found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.41.34120\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\DiagnosticsHub\Collector;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\\x64;C:\Program Files (x86)\Windows Kits\10\bin\\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapserver-vc17x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc17x64 cd src\mapserver-vc17x64 git reset --hard HEAD HEAD is now at 3df0b33a4 Merge pull request #7180 from geographika/jsonschema git fetch git checkout main Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 3df0b33a4..4726b9c44 Fast-forward .../wxs/expected/wms_getstyles_expressions24.xml | 28 +++++++++ .../wxs/expected/wms_getstyles_expressions25.xml | 28 +++++++++ msautotest/wxs/wms_styles_expressions.map | 61 +++++++++++++++++++ src/mapogcsld.cpp | 68 ++++++++++++---------- 4 files changed, 155 insertions(+), 30 deletions(-) create mode 100644 msautotest/wxs/expected/wms_getstyles_expressions24.xml create mode 100644 msautotest/wxs/expected/wms_getstyles_expressions25.xml git reset --hard HEAD HEAD is now at 4726b9c44 SLD Filters missing due to logicial keywords in expressions (#7178) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\ms_revision.txt type E:\buildsystem\release-1930-x64\doc\ms_revision.txt 4726b9c4422806590faa798edb89861d38f32cb2 cd E:\buildsystem git config --global core.autocrlf false if not exist src\gdal-vc17x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc17x64 cd src\gdal-vc17x64 git reset --hard HEAD HEAD is now at d61b835459 Merge pull request #11160 from rouault/doc_past_releases git fetch git checkout master Your branch is behind 'origin/master' by 49 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating d61b835459..51b869872a Fast-forward .github/workflows/coverity_scan/build.sh | 37 +- .github/workflows/fedora_rawhide/build.sh | 10 + .github/workflows/linux_build.yml | 15 +- .github/workflows/ubuntu_24.04/Dockerfile.ci | 20 + .../ubuntu_24.04/expected_gdalinfo_formats.txt | 2 +- .../ubuntu_24.04/expected_ogrinfo_formats.txt | 3 +- .../windows_conda_expected_gdalinfo_formats.txt | 2 +- .../windows_conda_expected_ogrinfo_formats.txt | 3 +- .pre-commit-config.yaml | 1 + README.md | 1 - apps/gdalenhance.cpp | 19 +- apps/gdallocationinfo.cpp | 8 +- apps/gdaltransform.cpp | 8 +- apps/gdalwarp_lib.cpp | 4 +- apps/test_ogrsf.cpp | 8 +- autotest/cpp/test_ogr.cpp | 63 + autotest/gcore/basic_test.py | 25 +- autotest/ogr/data/duckdb/poly.duckdb | Bin 0 -> 536576 bytes autotest/ogr/ogr_adbc.py | 351 +++ autotest/ogr/ogr_osm.py | 7 + autotest/ogr/ogr_sxf.py | 6 +- autotest/pymod/test_cli_utilities.py | 8 + autotest/pyscripts/test_gdalmove.py | 7 + autotest/utilities/test_gdalenhance.py | 107 + ci/travis/conda/libgdal-adbc.patch | 78 + ci/travis/conda/setup.sh | 2 + cmake/helpers/CheckDependentLibraries.cmake | 2 + cmake/helpers/GdalDriverHelper.cmake | 13 + doc/build/html_extra/robots.txt | 3 - doc/build_doc_snapshot.sh | 4 +- doc/images/programs/gdalenhance_little_spruce.jpg | Bin 0 -> 9661 bytes .../gdalenhance_little_spruce_enhanced.jpg | Bin 0 -> 13387 bytes doc/source/api/vector_c_api.rst | 3 + doc/source/development/building_from_source.rst | 30 + doc/source/development/rfc/index.rst | 1 + .../development/rfc/rfc102_embedded_resources.rst | 165 ++ doc/source/drivers/vector/adbc.rst | 129 ++ doc/source/drivers/vector/index.rst | 1 + doc/source/programs/gdalenhance.rst | 94 + doc/source/programs/index.rst | 2 + doc/source/spelling_wordlist.txt | 8 + docker/ubuntu-full/Dockerfile | 43 + frmts/drivers.ini | 1 + frmts/gdalallregister.cpp | 3 + frmts/grib/CMakeLists.txt | 151 +- frmts/grib/degrib/degrib/embedded_resources.c | 23 + frmts/grib/degrib/degrib/embedded_resources.h | 10 + frmts/grib/degrib/degrib/embedded_resources_gen1.c | 326 +++ frmts/grib/degrib/degrib/embedded_resources_gen2.c | 66 + frmts/grib/degrib/degrib/metaname.cpp | 60 +- frmts/grib/degrib/degrib/metaname.h | 2 + frmts/grib/degrib/generate_embedded_resources.py | 37 + frmts/grib/gribdataset.cpp | 13 +- frmts/hdf5/CMakeLists.txt | 23 +- frmts/hdf5/bagdataset.cpp | 25 +- frmts/hdf5/embedded_resources.c | 13 + frmts/hdf5/embedded_resources.h | 10 + 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 + frmts/pdf/CMakeLists.txt | 23 +- frmts/pdf/embedded_resources.c | 13 + frmts/pdf/embedded_resources.h | 10 + frmts/pdf/pdfcreatefromcomposition.cpp | 36 + frmts/pds/CMakeLists.txt | 19 +- frmts/pds/embedded_resources.c | 22 + frmts/pds/embedded_resources.h | 11 + frmts/pds/pds4dataset.cpp | 25 +- frmts/pds/vicardataset.cpp | 20 +- gcore/CMakeLists.txt | 14 + gcore/embedded_resources.c | 13 + gcore/embedded_resources.h | 10 + gcore/gdal_adbc.cpp | 49 + gcore/gdal_adbc.h | 46 + gcore/gdal_misc.cpp | 29 +- gdal.cmake | 39 + ogr/ogr_feature.h | 2 + ogr/ogr_p.h | 9 + ogr/ogrfeature.cpp | 117 +- ogr/ogrsf_frmts/CMakeLists.txt | 1 + ogr/ogrsf_frmts/adbc/CMakeLists.txt | 28 + ogr/ogrsf_frmts/adbc/ogr_adbc.h | 208 ++ ogr/ogrsf_frmts/adbc/ogr_adbc_internal.h | 2356 ++++++++++++++++++++ ogr/ogrsf_frmts/adbc/ogradbcdataset.cpp | 569 +++++ ogr/ogrsf_frmts/adbc/ogradbcdriver.cpp | 46 + ogr/ogrsf_frmts/adbc/ogradbcdrivercore.cpp | 122 + ogr/ogrsf_frmts/adbc/ogradbcdrivercore.h | 34 + ogr/ogrsf_frmts/adbc/ogradbclayer.cpp | 261 +++ 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 +- 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 + ogr/ogrsf_frmts/generic/ogrlayerarrow.h | 2 + ogr/ogrsf_frmts/generic/ogrregisterall.cpp | 3 + 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 + ogr/ogrsf_frmts/gml/generate_embedded_resources.py | 40 + ogr/ogrsf_frmts/gml/gmlreader.cpp | 28 +- ogr/ogrsf_frmts/gml/gmlregistry.cpp | 38 +- 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 +- 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 +- ogr/ogrsf_frmts/ogrsf_frmts.h | 2 + .../openfilegdb/ogropenfilegdbdrivercore.cpp | 3 +- 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 +- 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 +- ogr/ogrsf_frmts/s57/CMakeLists.txt | 30 +- ogr/ogrsf_frmts/s57/embedded_resources.c | 33 + ogr/ogrsf_frmts/s57/embedded_resources.h | 10 + ogr/ogrsf_frmts/s57/s57classregistrar.cpp | 41 +- ogr/ogrsf_frmts/s57/s57tables.h | 848 ------- ogr/ogrsf_frmts/s57/s57tables.py | 55 - 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 +- 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 +- ogr/ogrutils.cpp | 10 + port/cpl_conv.cpp | 27 + port/cpl_conv.h | 6 + port/cpl_error.cpp | 6 +- port/cpl_progress.cpp | 129 +- port/cpl_vsil_curl.cpp | 4 - 150 files changed, 7529 insertions(+), 1291 deletions(-) create mode 100644 autotest/ogr/data/duckdb/poly.duckdb create mode 100755 autotest/ogr/ogr_adbc.py create mode 100644 autotest/utilities/test_gdalenhance.py create mode 100644 ci/travis/conda/libgdal-adbc.patch delete mode 100644 doc/build/html_extra/robots.txt 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/development/rfc/rfc102_embedded_resources.rst create mode 100644 doc/source/drivers/vector/adbc.rst create mode 100644 doc/source/programs/gdalenhance.rst 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 create mode 100644 frmts/hdf5/embedded_resources.c create mode 100644 frmts/hdf5/embedded_resources.h create mode 100644 frmts/nitf/embedded_resources.c create mode 100644 frmts/nitf/embedded_resources.h create mode 100644 frmts/pdf/embedded_resources.c create mode 100644 frmts/pdf/embedded_resources.h create mode 100644 frmts/pds/embedded_resources.c create mode 100644 frmts/pds/embedded_resources.h create mode 100644 gcore/embedded_resources.c create mode 100644 gcore/embedded_resources.h create mode 100644 gcore/gdal_adbc.cpp create mode 100644 gcore/gdal_adbc.h 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/ogr_adbc_internal.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 create mode 100644 ogr/ogrsf_frmts/dgn/embedded_resources.c create mode 100644 ogr/ogrsf_frmts/dgn/embedded_resources.h create mode 100644 ogr/ogrsf_frmts/dxf/embedded_resources.c create mode 100644 ogr/ogrsf_frmts/dxf/embedded_resources.h 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 create mode 100644 ogr/ogrsf_frmts/gmlas/embedded_resources.c create mode 100644 ogr/ogrsf_frmts/gmlas/embedded_resources.h create mode 100644 ogr/ogrsf_frmts/miramon/embedded_resources.c create mode 100644 ogr/ogrsf_frmts/miramon/embedded_resources.h create mode 100644 ogr/ogrsf_frmts/osm/embedded_resources.c create mode 100644 ogr/ogrsf_frmts/osm/embedded_resources.h create mode 100644 ogr/ogrsf_frmts/plscenes/embedded_resources.c create mode 100644 ogr/ogrsf_frmts/plscenes/embedded_resources.h create mode 100644 ogr/ogrsf_frmts/s57/embedded_resources.c create mode 100644 ogr/ogrsf_frmts/s57/embedded_resources.h delete mode 100644 ogr/ogrsf_frmts/s57/s57tables.h delete mode 100755 ogr/ogrsf_frmts/s57/s57tables.py create mode 100644 ogr/ogrsf_frmts/sxf/embedded_resources.c create mode 100644 ogr/ogrsf_frmts/sxf/embedded_resources.h create mode 100644 ogr/ogrsf_frmts/vdv/embedded_resources.c create mode 100644 ogr/ogrsf_frmts/vdv/embedded_resources.h git reset --hard HEAD HEAD is now at 51b869872a CI: .github/workflows/coverity_scan/build.sh: fix [ci skip] git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\gdal_revision.txt type E:\buildsystem\release-1930-x64\doc\gdal_revision.txt 51b869872a37d346fed14526e0b92e22a405b29e cd E:\buildsystem set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.41.34120\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\DiagnosticsHub\Collector;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\\x64;C:\Program Files (x86)\Windows Kits\10\bin\\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\.dotnet\tools;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapcache-vc17x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc17x64 cd src\mapcache-vc17x64 git reset --hard HEAD HEAD is now at 339008f handle CMake deprecation warning (#342) git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1930-x64\doc\mapcache_revision.txt 339008f3d010364a4c0489bb4b8f0dc68039ca79 cd E:\buildsystem