found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1928\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29333\bin\HostX86\x86;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Team Tools\Performance Tools;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\;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\\MSBuild\Current\Bin;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\Bin\;E:\app\szekeres\product\11.2.0\dbhome_1\bin;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\WINDOWS\system32\config\systemprofile\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\nodejs\;C:\Program Files (x86)\Microsoft Team Foundation Server 2015 Power Tools\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\dotnet\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;;C:\Program Files\7-Zip;C:\Program Files (x86)\Certum\proCertum CardManager;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\dotnet\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;C:\Users\szekeres\.dotnet\tools;C:\Users\szekeres\.dotnet\tools;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe if not exist src\mapserver-vc16 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc16 cd src\mapserver-vc16 git reset --hard HEAD HEAD is now at 3795609b Merge pull request #6306 from rouault/coverity_scan_fixes git fetch git checkout main Your branch is behind 'origin/main' by 30 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 3795609ba..8ba01d5ce Fast-forward .github/workflows/backport.yml | 10 +++--- .github/workflows/start.sh | 36 +++++++++++++++++++-- mapdraw.c | 4 +-- mapfile.c | 30 ++++++++++++++++++ maplabel.c | 7 ++++- maplegend.c | 10 ++++-- mapogcsld.c | 1 + mapserv.c | 3 +- mapserver.h | 7 +++++ mapservutil.c | 56 ++++++++++++++++++++++++--------- mapshape.c | 30 +++++++++++++----- maptemplate.c | 3 ++ mapuvraster.c | 4 +-- mapwcs20.cpp | 9 +----- mapwfs.cpp | 2 +- mapwms.cpp | 7 ++++- mapwmslayer.c | 41 +++++++++++++----------- mapxbase.c | 9 ++++++ renderers/agg/src/agg_font_freetype.cpp | 4 +-- 19 files changed, 203 insertions(+), 70 deletions(-) git reset --hard HEAD HEAD is now at 8ba01d5ce switch to QGIS m-kuhn/backport method git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928\doc\ms_revision.txt type E:\buildsystem\release-1928\doc\ms_revision.txt 8ba01d5cebb2d8efd76bc76573f3013c92c65a19 cd E:\buildsystem if not exist src\gdal-vc16 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc16 cd src\gdal-vc16 git reset --hard HEAD HEAD is now at b203968c5e docker/ubuntu-full/Dockerfile: update dependencies versions [ci skip] git fetch git checkout master Your branch is behind 'origin/master' by 142 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating b203968c5e..bd5a022ead Fast-forward .github/workflows/fedora_rawhide.yml | 2 +- .github/workflows/ubuntu_20.04/build-deps.sh | 17 +- .github/workflows/ubuntu_20.04/build.sh | 3 +- .github/workflows/windows_build.yml | 15 +- autotest/gcore/basic_test.py | 17 +- autotest/gcore/cog.py | 5 +- autotest/gcore/multidim.py | 372 +++++ autotest/gcore/numpy_rw_multidim.py | 32 + autotest/gcore/rat.py | 45 +- autotest/gcore/tiff_read.py | 84 +- autotest/gcore/tiff_write.py | 16 + autotest/gcore/vsiaz.py | 8 +- autotest/gdrivers/data/netcdf/sentinel5p_fake.nc | Bin 0 -> 66968 bytes autotest/gdrivers/eedai.py | 2 +- autotest/gdrivers/hdf5multidim.py | 5 +- autotest/gdrivers/memmultidim.py | 11 +- autotest/gdrivers/netcdf.py | 270 ++-- autotest/gdrivers/netcdf_multidim.py | 44 + autotest/gdrivers/nitf.py | 20 + .../featuredataset.gdb/a00000001.TablesByName.atx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a00000001.gdbindexes | Bin 0 -> 110 bytes .../filegdb/featuredataset.gdb/a00000001.gdbtable | Bin 0 -> 375 bytes .../filegdb/featuredataset.gdb/a00000001.gdbtablx | Bin 0 -> 5152 bytes .../filegdb/featuredataset.gdb/a00000002.gdbtable | Bin 0 -> 2059 bytes .../filegdb/featuredataset.gdb/a00000002.gdbtablx | Bin 0 -> 5152 bytes .../featuredataset.gdb/a00000003.gdbindexes | Bin 0 -> 42 bytes .../filegdb/featuredataset.gdb/a00000003.gdbtable | Bin 0 -> 1738 bytes .../filegdb/featuredataset.gdb/a00000003.gdbtablx | Bin 0 -> 5152 bytes .../a00000004.CatItemsByPhysicalName.atx | Bin 0 -> 4118 bytes .../a00000004.CatItemsByType.atx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a00000004.FDO_UUID.atx | Bin 0 -> 4118 bytes .../filegdb/featuredataset.gdb/a00000004.freelist | Bin 0 -> 4440 bytes .../featuredataset.gdb/a00000004.gdbindexes | Bin 0 -> 310 bytes .../filegdb/featuredataset.gdb/a00000004.gdbtable | Bin 0 -> 12703 bytes .../filegdb/featuredataset.gdb/a00000004.gdbtablx | Bin 0 -> 5152 bytes .../data/filegdb/featuredataset.gdb/a00000004.spx | Bin 0 -> 4118 bytes .../a00000005.CatItemTypesByName.atx | Bin 0 -> 12310 bytes .../a00000005.CatItemTypesByParentTypeID.atx | Bin 0 -> 4118 bytes .../a00000005.CatItemTypesByUUID.atx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a00000005.gdbindexes | Bin 0 -> 296 bytes .../filegdb/featuredataset.gdb/a00000005.gdbtable | Bin 0 -> 1709 bytes .../filegdb/featuredataset.gdb/a00000005.gdbtablx | Bin 0 -> 5152 bytes .../a00000006.CatRelsByDestinationID.atx | Bin 0 -> 4118 bytes .../a00000006.CatRelsByOriginID.atx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a00000006.CatRelsByType.atx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a00000006.FDO_UUID.atx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a00000006.gdbindexes | Bin 0 -> 318 bytes .../filegdb/featuredataset.gdb/a00000006.gdbtable | Bin 0 -> 632 bytes .../filegdb/featuredataset.gdb/a00000006.gdbtablx | Bin 0 -> 5152 bytes .../a00000007.CatRelTypesByBackwardLabel.atx | Bin 0 -> 4118 bytes .../a00000007.CatRelTypesByDestItemTypeID.atx | Bin 0 -> 4118 bytes .../a00000007.CatRelTypesByForwardLabel.atx | Bin 0 -> 4118 bytes .../a00000007.CatRelTypesByName.atx | Bin 0 -> 4118 bytes .../a00000007.CatRelTypesByOriginItemTypeID.atx | Bin 0 -> 4118 bytes .../a00000007.CatRelTypesByUUID.atx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a00000007.gdbindexes | Bin 0 -> 602 bytes .../filegdb/featuredataset.gdb/a00000007.gdbtable | Bin 0 -> 2267 bytes .../filegdb/featuredataset.gdb/a00000007.gdbtablx | Bin 0 -> 5152 bytes .../featuredataset.gdb/a00000009.gdbindexes | Bin 0 -> 116 bytes .../filegdb/featuredataset.gdb/a00000009.gdbtable | Bin 0 -> 512 bytes .../filegdb/featuredataset.gdb/a00000009.gdbtablx | Bin 0 -> 32 bytes .../data/filegdb/featuredataset.gdb/a00000009.spx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a0000000a.gdbindexes | Bin 0 -> 116 bytes .../filegdb/featuredataset.gdb/a0000000a.gdbtable | Bin 0 -> 512 bytes .../filegdb/featuredataset.gdb/a0000000a.gdbtablx | Bin 0 -> 32 bytes .../data/filegdb/featuredataset.gdb/a0000000a.spx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a0000000b.gdbindexes | Bin 0 -> 116 bytes .../filegdb/featuredataset.gdb/a0000000b.gdbtable | Bin 0 -> 1022 bytes .../filegdb/featuredataset.gdb/a0000000b.gdbtablx | Bin 0 -> 32 bytes .../data/filegdb/featuredataset.gdb/a0000000b.spx | Bin 0 -> 4118 bytes .../featuredataset.gdb/a0000000c.gdbindexes | Bin 0 -> 116 bytes .../filegdb/featuredataset.gdb/a0000000c.gdbtable | Bin 0 -> 1022 bytes .../filegdb/featuredataset.gdb/a0000000c.gdbtablx | Bin 0 -> 32 bytes .../data/filegdb/featuredataset.gdb/a0000000c.spx | Bin 0 -> 4118 bytes autotest/ogr/data/filegdb/featuredataset.gdb/gdb | Bin 0 -> 8 bytes .../ogr/data/filegdb/featuredataset.gdb/timestamps | 1 + autotest/ogr/ogr_fgdb.py | 53 + autotest/ogr/ogr_geom.py | 6 + autotest/ogr/ogr_gpkg.py | 205 ++- autotest/ogr/ogr_openfilegdb.py | 52 + autotest/ogr/ogr_wkbwkt_geom.py | 17 +- autotest/osr/osr_ct.py | 22 +- autotest/osr/osr_metacrs.py | 3 +- autotest/pymod/test_py_scripts.py | 18 +- .../tests => autotest/pyscripts}/data/warped.vrt | 0 .../pyscripts}/data/warped_grey.vrt | 0 .../pyscripts}/data/warped_rgb.vrt | 0 .../pyscripts/gdal2tiles}/__init__.py | 0 .../test_add_alpha_band_to_string_vrt.py | 33 +- .../test_add_gdal_warp_options_to_string.py | 71 + .../pyscripts/gdal2tiles/test_nb_data_bands.py | 74 + .../pyscripts}/gdal2tiles/test_option_parser.py | 48 +- .../gdal2tiles/test_reproject_dataset.py | 35 +- .../pyscripts}/gdal2tiles/test_setup_input_srs.py | 39 +- .../gdal2tiles/test_setup_no_data_value.py | 33 +- ...test_update_alpha_value_for_non_alpha_inputs.py | 60 + autotest/pyscripts/test_gdal_calc.py | 46 +- autotest/pyscripts/test_gdal_utils.py | 34 +- autotest/pyscripts/test_osr_util.py | 164 +++ autotest/utilities/test_ogrinfo.py | 17 + gdal/HOWTO-RELEASE | 6 +- gdal/NEWS | 22 +- gdal/VERSION | 2 +- gdal/alg/gdalwarpkernel.cpp | 249 ++-- gdal/alg/gdalwarpkernel_opencl.cpp | 1203 +++++++-------- gdal/alg/gdalwarpkernel_opencl.h | 2 + gdal/alg/polygonize.cpp | 18 +- gdal/apps/gdal_contour.cpp | 12 +- gdal/apps/ogrinfo.cpp | 125 +- gdal/configure | 16 +- gdal/configure.ac | 10 +- gdal/doc/Makefile | 6 +- gdal/doc/generate-sponsor-logos.sh | 1 + gdal/doc/images/sponsors/logo-maxar.ai | 621 ++++++++ gdal/doc/images/sponsors/logo-maxar.png | Bin 0 -> 4622 bytes gdal/doc/images/sponsors/logo-maxar.svg | 89 ++ gdal/doc/source/about_no_title.rst | 4 +- gdal/doc/source/api/csharp.rst | 45 - gdal/doc/source/api/csharp/csharp_compile.rst | 186 +++ gdal/doc/source/api/csharp/csharp_conda.rst | 63 + gdal/doc/source/api/csharp/csharp_raster.rst | 228 +++ gdal/doc/source/api/csharp/csharp_usage.rst | 48 + gdal/doc/source/api/csharp/csharp_vector.rst | 220 +++ gdal/doc/source/api/csharp/index.rst | 72 + gdal/doc/source/api/index.rst | 4 +- gdal/doc/source/api/{java.rst => java/index.rst} | 0 gdal/doc/source/download.rst | 18 +- gdal/doc/source/drivers/raster/cog.rst | 5 +- gdal/doc/source/drivers/vector/filegdb.rst | 17 +- gdal/doc/source/drivers/vector/openfilegdb.rst | 17 +- gdal/doc/source/gdal_rtd/footer.html | 1 + .../Sustainable GDAL Sponsorship Prospectus.pdf | Bin 207723 -> 207680 bytes gdal/doc/source/sponsors/index.rst | 27 +- gdal/docker/README.md | 6 +- gdal/frmts/exr/exrdataset.cpp | 34 +- gdal/frmts/exr/openexr_headers.h | 1 + gdal/frmts/georaster/oci_wrapper.cpp | 19 +- gdal/frmts/gtiff/geotiff.cpp | 12 +- gdal/frmts/hdf5/hdf5multidim.cpp | 71 +- gdal/frmts/idrisi/IdrisiDataset.cpp | 22 +- gdal/frmts/mem/memdataset.cpp | 22 +- gdal/frmts/netcdf/netcdfdataset.cpp | 80 +- gdal/frmts/netcdf/netcdfdataset.h | 16 +- gdal/frmts/netcdf/netcdfmultidim.cpp | 42 + gdal/frmts/nitf/nitfdataset.cpp | 28 +- gdal/frmts/nitf/nitffile.c | 16 +- gdal/frmts/nitf/nitflib.h | 6 + gdal/frmts/ogcapi/gdalogcapidataset.cpp | 2 +- gdal/frmts/postgisraster/postgisraster.h | 6 +- gdal/frmts/postgisraster/postgisrasterdataset.cpp | 45 +- gdal/frmts/postgisraster/postgisrasterdriver.cpp | 10 +- gdal/fuzzers/build.sh | 4 +- gdal/gcore/gdal.h | 10 + gdal/gcore/gdal_priv.h | 32 +- gdal/gcore/gdal_version.h.in | 6 +- gdal/gcore/gdalmultidim.cpp | 1528 +++++++++++++++++--- gdal/gcore/gdalrasterband.cpp | 87 +- gdal/gcore/overview.cpp | 193 +-- gdal/m4/geos.m4 | 3 +- gdal/m4/sfcgal.m4 | 3 +- gdal/ogr/ogr_api.h | 1 + gdal/ogr/ogr_geometry.h | 2 +- gdal/ogr/ogrct.cpp | 2 +- gdal/ogr/ogrgeometry.cpp | 79 +- gdal/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp | 85 +- gdal/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h | 7 +- .../ogrsf_frmts/generic/ogrmutexeddatasource.cpp | 7 + .../ogr/ogrsf_frmts/generic/ogrmutexeddatasource.h | 2 + .../ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 190 ++- gdal/ogr/ogrsf_frmts/ili/ili2reader.cpp | 35 +- gdal/ogr/ogrsf_frmts/oci/ogrocidatasource.cpp | 13 +- gdal/ogr/ogrsf_frmts/oci/ogrocisession.cpp | 15 +- gdal/ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h | 5 +- .../openfilegdb/ogropenfilegdbdatasource.cpp | 162 ++- gdal/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp | 8 +- gdal/ogr/ogrutils.cpp | 4 +- gdal/port/cpl_port.h | 4 - gdal/port/cpl_vsil_az.cpp | 4 + gdal/port/cpl_vsil_s3.cpp | 1 + gdal/scripts/fix_typos.sh | 2 +- gdal/swig/csharp/apps/ogrinfo.cs | 2 +- gdal/swig/include/MultiDimensional.i | 44 +- gdal/swig/include/gdal_array.i | 35 +- gdal/swig/include/java/gdal_java.i | 4 + gdal/swig/include/ogr.i | 4 +- gdal/swig/include/python/python_exceptions.i | 3 + gdal/swig/include/python/typemaps_python.i | 90 ++ gdal/swig/python/extensions/gdal_wrap.cpp | 423 +++++- gdal/swig/python/extensions/gnm_wrap.cpp | 3 + gdal/swig/python/extensions/ogr_wrap.cpp | 34 +- gdal/swig/python/extensions/osr_wrap.cpp | 3 + .../swig/python/gdal-utils/osgeo_utils/__init__.py | 5 +- .../gdal-utils/osgeo_utils/auxiliary/array_util.py | 69 + .../osgeo_utils/auxiliary/color_table.py | 8 +- .../osgeo_utils/auxiliary/gdal_argparse.py | 86 +- .../gdal-utils/osgeo_utils/auxiliary/numpy_util.py | 17 +- .../gdal-utils/osgeo_utils/auxiliary/osr_util.py | 99 +- .../osgeo_utils/auxiliary/raster_creation.py | 18 +- .../gdal-utils/osgeo_utils/auxiliary/util.py | 1 + .../python/gdal-utils/osgeo_utils/gdal2tiles.py | 3 +- .../swig/python/gdal-utils/osgeo_utils/gdal2xyz.py | 125 +- .../python/gdal-utils/osgeo_utils/gdal_calc.py | 511 ++++--- .../gdal-utils/osgeo_utils/gdal_fillnodata.py | 160 +- .../python/gdal-utils/osgeo_utils/gdal_merge.py | 20 +- .../gdal-utils/osgeo_utils/gdal_pansharpen.py | 171 ++- .../gdal-utils/osgeo_utils/gdal_polygonize.py | 174 ++- .../gdal-utils/osgeo_utils/gdal_proximity.py | 58 +- .../python/gdal-utils/osgeo_utils/gdal_sieve.py | 28 +- .../python/gdal-utils/osgeo_utils/gdalattachpct.py | 27 +- .../python/gdal-utils/osgeo_utils/gdalcompare.py | 4 +- .../swig/python/gdal-utils/osgeo_utils/gdalmove.py | 10 +- .../swig/python/gdal-utils/osgeo_utils/ogrmerge.py | 67 +- gdal/swig/python/gdal-utils/osgeo_utils/pct2rgb.py | 133 +- gdal/swig/python/gdal-utils/osgeo_utils/rgb2pct.py | 139 +- .../gdal-utils/osgeo_utils/samples/densify.py | 59 +- .../gdal-utils/osgeo_utils/samples/epsg_tr.py | 48 +- .../gdal-utils/osgeo_utils/samples/esri2wkt.py | 50 +- .../python/gdal-utils/osgeo_utils/samples/fft.py | 6 +- .../gdal-utils/osgeo_utils/samples/gcps2vec.py | 49 +- .../gdal-utils/osgeo_utils/samples/gdal_lut.py | 8 +- .../osgeo_utils/samples/gdallocationinfo.py | 262 ++-- .../gdal-utils/osgeo_utils/samples/hsv_merge.py | 6 +- .../gdal-utils/osgeo_utils/samples/ogr_dispatch.py | 6 +- .../osgeo_utils/samples/ogr_layer_algebra.py | 14 +- .../python/gdal-utils/osgeo_utils/samples/rel.py | 4 +- .../gdal-utils/osgeo_utils/samples/val_repl.py | 6 +- .../osgeo_utils/samples/validate_gpkg.py | 52 +- .../scripts/tests/gdal2tiles/__init__.py | 0 .../test_add_gdal_warp_options_to_string.py | 40 - .../scripts/tests/gdal2tiles/test_nb_data_bands.py | 43 - ...test_update_alpha_value_for_non_alpha_inputs.py | 29 - gdal/swig/python/gdal-utils/setup.py | 4 +- gdal/swig/python/osgeo/gdal.py | 20 + gdal/swig/python/osgeo/gdal_array.py | 35 +- gdal/swig/python/osgeo/ogr.py | 2 +- 235 files changed, 8691 insertions(+), 2898 deletions(-) create mode 100644 autotest/gcore/multidim.py create mode 100644 autotest/gdrivers/data/netcdf/sentinel5p_fake.nc create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000001.TablesByName.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000001.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000001.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000001.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000002.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000002.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000003.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000003.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000003.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000004.CatItemsByPhysicalName.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000004.CatItemsByType.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000004.FDO_UUID.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000004.freelist create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000004.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000004.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000004.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000004.spx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000005.CatItemTypesByName.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000005.CatItemTypesByParentTypeID.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000005.CatItemTypesByUUID.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000005.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000005.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000005.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000006.CatRelsByDestinationID.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000006.CatRelsByOriginID.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000006.CatRelsByType.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000006.FDO_UUID.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000006.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000006.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000006.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000007.CatRelTypesByBackwardLabel.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000007.CatRelTypesByDestItemTypeID.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000007.CatRelTypesByForwardLabel.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000007.CatRelTypesByName.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000007.CatRelTypesByOriginItemTypeID.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000007.CatRelTypesByUUID.atx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000007.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000007.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000007.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000009.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000009.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000009.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a00000009.spx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000a.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000a.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000a.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000a.spx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000b.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000b.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000b.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000b.spx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000c.gdbindexes create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000c.gdbtable create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000c.gdbtablx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/a0000000c.spx create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/gdb create mode 100644 autotest/ogr/data/filegdb/featuredataset.gdb/timestamps rename {gdal/swig/python/gdal-utils/scripts/tests => autotest/pyscripts}/data/warped.vrt (100%) rename {gdal/swig/python/gdal-utils/scripts/tests => autotest/pyscripts}/data/warped_grey.vrt (100%) rename {gdal/swig/python/gdal-utils/scripts/tests => autotest/pyscripts}/data/warped_rgb.vrt (100%) rename {gdal/swig/python/gdal-utils/scripts/tests => autotest/pyscripts/gdal2tiles}/__init__.py (100%) rename {gdal/swig/python/gdal-utils/scripts/tests => autotest/pyscripts}/gdal2tiles/test_add_alpha_band_to_string_vrt.py (71%) create mode 100644 autotest/pyscripts/gdal2tiles/test_add_gdal_warp_options_to_string.py create mode 100644 autotest/pyscripts/gdal2tiles/test_nb_data_bands.py rename {gdal/swig/python/gdal-utils/scripts/tests => autotest/pyscripts}/gdal2tiles/test_option_parser.py (76%) rename {gdal/swig/python/gdal-utils/scripts/tests => autotest/pyscripts}/gdal2tiles/test_reproject_dataset.py (54%) rename {gdal/swig/python/gdal-utils/scripts/tests => autotest/pyscripts}/gdal2tiles/test_setup_input_srs.py (63%) rename {gdal/swig/python/gdal-utils/scripts/tests => autotest/pyscripts}/gdal2tiles/test_setup_no_data_value.py (54%) create mode 100644 autotest/pyscripts/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py create mode 100644 autotest/pyscripts/test_osr_util.py create mode 100644 gdal/doc/images/sponsors/logo-maxar.ai create mode 100644 gdal/doc/images/sponsors/logo-maxar.png create mode 100644 gdal/doc/images/sponsors/logo-maxar.svg delete mode 100644 gdal/doc/source/api/csharp.rst create mode 100644 gdal/doc/source/api/csharp/csharp_compile.rst create mode 100644 gdal/doc/source/api/csharp/csharp_conda.rst create mode 100644 gdal/doc/source/api/csharp/csharp_raster.rst create mode 100644 gdal/doc/source/api/csharp/csharp_usage.rst create mode 100644 gdal/doc/source/api/csharp/csharp_vector.rst create mode 100644 gdal/doc/source/api/csharp/index.rst rename gdal/doc/source/api/{java.rst => java/index.rst} (100%) create mode 100644 gdal/swig/python/gdal-utils/osgeo_utils/auxiliary/array_util.py delete mode 100644 gdal/swig/python/gdal-utils/scripts/tests/gdal2tiles/__init__.py delete mode 100644 gdal/swig/python/gdal-utils/scripts/tests/gdal2tiles/test_add_gdal_warp_options_to_string.py delete mode 100644 gdal/swig/python/gdal-utils/scripts/tests/gdal2tiles/test_nb_data_bands.py delete mode 100644 gdal/swig/python/gdal-utils/scripts/tests/gdal2tiles/test_update_alpha_value_for_non_alpha_inputs.py git reset --hard HEAD HEAD is now at bd5a022ead PostgisRaster: hopuflly fix CSA warning git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928\doc\gdal_revision.txt type E:\buildsystem\release-1928\doc\gdal_revision.txt bd5a022eadf5eb934283f26e430767ddc8d14f59 cd E:\buildsystem set PATH=E:\buildsystem\release-1928\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29333\bin\HostX86\x86;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Team Tools\Performance Tools;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\;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\\MSBuild\Current\Bin;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\Bin\;E:\app\szekeres\product\11.2.0\dbhome_1\bin;C:\ProgramData\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\PrivateAssemblies\;C:\Program Files (x86)\Microsoft ASP.NET\ASP.NET Web Pages\v1.0\;C:\WINDOWS\system32\config\systemprofile\.dnx\bin;C:\Program Files\Microsoft DNX\Dnvm\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\nodejs\;C:\Program Files (x86)\Microsoft Team Foundation Server 2015 Power Tools\;C:\Program Files\TortoiseSVN\bin;C:\Program Files\Microsoft Network Monitor 3\;C:\Program Files\dotnet\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files\Microsoft SQL Server\110\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;;C:\Program Files\7-Zip;C:\Program Files (x86)\Certum\proCertum CardManager;C:\Program Files (x86)\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\ManagementStudio\;C:\Program Files (x86)\dotnet\;C:\Program Files\Microsoft\Web Platform Installer\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;C:\Users\szekeres\.dotnet\tools;C:\Users\szekeres\.dotnet\tools;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe if not exist src\mapcache-vc16 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc16 cd src\mapcache-vc16 git reset --hard HEAD HEAD is now at 447c0c6 Merge pull request #249 from constantinius/fix-issue-246 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-1928\doc\mapcache_revision.txt type E:\buildsystem\release-1928\doc\mapcache_revision.txt 447c0c6848fd101c11e6d54e451037e571117ef1 cd E:\buildsystem