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.33.31629\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\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;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 (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:\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:\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 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 7c1100958 Merge pull request #6744 from rouault/fix_52702 git fetch git checkout main Your branch is behind 'origin/main' by 2 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 7c1100958..5eea88a3f Fast-forward mapfile.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) git reset --hard HEAD HEAD is now at 5eea88a3f Merge pull request #6747 from rouault/fix_ossfuzz_52947 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 5eea88a3fd365eee86196f9bbc6aeb002fa9514d cd E:\buildsystem 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 cc78d80d5d Merge pull request #6598 from rouault/libkml_conda_win git fetch git checkout master Your branch is behind 'origin/master' by 13 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating cc78d80d5d..7f16b09a89 Fast-forward .github/workflows/cmake_builds.yml | 4 +- CMakeLists.txt | 6 + NEWS.md | 16 +-- alg/gdalwarpkernel.cpp | 2 +- autotest/CMakeLists.txt | 6 +- autotest/cpp/test_cpl.cpp | 2 +- autotest/gcore/tiff_read.py | 2 +- autotest/gcore/tiff_write.py | 2 +- .../data/dimap2/single_component/DIM_foo.XML | 2 +- autotest/gdrivers/dimap.py | 2 +- autotest/gdrivers/nitf.py | 150 +++++++++++++++++++ cmake/helpers/GdalSetRuntimeEnv.cmake | 6 +- data/nitf_spec.xml | 2 +- doc/source/_extensions/redirects.py | 2 + doc/source/drivers/raster/nitf.rst | 2 + doc/source/drivers/raster/nitf_advanced.rst | 38 +++++ doc/source/programs/ogr_layer_algebra.rst | 2 +- doc/source/user/configoptions.rst | 2 +- frmts/eeda/CMakeLists.txt | 4 + frmts/eeda/eedadataset.cpp | 4 + frmts/gtiff/libtiff/tif_dir.c | 14 +- frmts/gtiff/libtiff/tif_dirinfo.c | 19 ++- frmts/gtiff/libtiff/tif_dirread.c | 9 +- frmts/nitf/CMakeLists.txt | 44 ++++++ frmts/nitf/nitfdataset.cpp | 158 +++++++++++++++++++-- frmts/nitf/nitfdump.c | 97 +------------ frmts/nitf/nitffile.c | 56 +++++++- frmts/nitf/nitfimage.c | 38 +++-- frmts/nitf/nitflib.h | 3 + frmts/openjpeg/openjpegdataset.cpp | 2 +- ogr/ogrsf_frmts/dxf/intronurbs.cpp | 2 +- ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 2 +- ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 18 +-- ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp | 2 +- port/cpl_vsil.cpp | 6 +- scripts/fix_typos.sh | 1 + swig/csharp/CMakeLists.txt | 51 +++++-- swig/csharp/add_dll_xsc.cmake | 6 +- swig/python/CMakeLists.txt | 30 ++-- swig/python/install_python.cmake.in | 2 +- 40 files changed, 609 insertions(+), 207 deletions(-) git reset --hard HEAD HEAD is now at 7f16b09a89 Merge pull request #6607 from rouault/eeda_plugin 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 7f16b09a896a9aeb7e1dc047c2c1744d1ab97fe7 cd E:\buildsystem set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.33.31629\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\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;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 (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:\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:\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 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 882c009 docs(cache_disk.c): proofread comment text (#292) 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 882c009d6e059286753007bdcc9e7cd4af66dbd6 cd E:\buildsystem