found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\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\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja if not exist src\mapserver-vc15x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc15x64 cd src\mapserver-vc15x64 git reset --hard HEAD HEAD is now at b3e340dde Merge pull request #6428 from MapServer/sdlime-security.md git fetch git checkout main Your branch is behind 'origin/main' by 9 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating b3e340dde..ba726960b Fast-forward .github/workflows/start.sh | 4 + CMakeLists.txt | 16 +++ fuzzers/CMakeLists.txt | 3 + fuzzers/shapefuzzer.c | 60 ++++++++++ map2img.c | 41 ++++--- mapserv-config.cpp | 1 + mapserv.c | 86 +++++++++------ mapshape.c | 268 ++++++++++++++++++++++++++++----------------- mapshape.h | 4 + mapxbase.c | 96 ++++++++-------- 10 files changed, 386 insertions(+), 193 deletions(-) create mode 100644 fuzzers/CMakeLists.txt create mode 100644 fuzzers/shapefuzzer.c git reset --hard HEAD HEAD is now at ba726960b Merge pull request #6421 from MaxKellermann/shapefile_fuzzer git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\ms_revision.txt type E:\buildsystem\release-1916-x64\doc\ms_revision.txt ba726960b0a74f6ded19efb28edccb78bead8018 cd E:\buildsystem if not exist src\gdal-vc15x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc15x64 cd src\gdal-vc15x64 git reset --hard HEAD HEAD is now at 6ba1c44cbe CMake: python bindings: use parallel build git fetch git checkout master Your branch is behind 'origin/master' by 43 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 6ba1c44cbe..c528f1a716 Fast-forward .github/workflows/cmake_builds.yml | 31 ++- .github/workflows/ubuntu_20.04/build-deps.sh | 7 +- CMakeLists.txt | 34 +++ CONTRIBUTING.md | 32 ++- HOWTO-RELEASE | 13 +- README.md | 4 +- alg/gdalwarpkernel.cpp | 15 +- autotest/CMakeLists.txt | 132 +++++++--- autotest/cpp/CMakeLists.txt | 46 +++- autotest/cpp/testclosedondestroydm.cpp | 2 +- autotest/gcore/tiff_write.py | 2 +- autotest/gdrivers/data/netcdf/netcdf_crs_wkt.nc | Bin 0 -> 13381 bytes .../data/vrt/warp_inconsistent_blockxsize.vrt | 36 +++ .../data/vrt/warp_inconsistent_blockysize.vrt | 36 +++ autotest/gdrivers/netcdf.py | 8 + autotest/gdrivers/netcdf_cf.py | 5 +- autotest/gdrivers/vrtwarp.py | 35 ++- cmake/helpers/GenerateConfig.cmake | 50 ++-- cmake/helpers/configure.cmake | 2 +- cmake/helpers/generate_gdal_version_h.cmake | 2 +- cmake/modules/packages/FindOpenJPEG.cmake | 2 + cmake/template/cpl_config.h.in | 8 +- cmake/template/gdal.pc.in | 7 +- cmake/template/setup.py.in | 14 +- doc/.azure-pipelines.yml | 2 +- doc/source/api/python_gotchas.rst | 96 ++++--- doc/source/drivers/raster/netcdf.rst | 5 +- frmts/bmp/bmpdataset.cpp | 34 ++- frmts/netcdf/netcdfdataset.cpp | 18 +- frmts/netcdf/netcdfdataset.h | 1 + frmts/tiledb/CMakeLists.txt | 8 +- frmts/vrt/vrtrasterband.cpp | 13 +- frmts/vrt/vrtwarped.cpp | 48 +++- gcore/gdal.h | 2 +- gcore/gdal_version.h.in | 2 +- gdal.cmake | 128 +++++---- ogr/ogr_core.h | 2 +- ogr/ogrsf_frmts/gml/gmlreader.cpp | 4 +- ogr/ogrsf_frmts/nas/nasreader.cpp | 4 +- port/cpl_error.cpp | 6 +- scripts/setdevenv.sh | 110 +++++--- swig/java/CMakeLists.txt | 3 +- swig/python/CMakeLists.txt | 287 +++++++++++++-------- .../gdal-utils/osgeo_utils/gdal_pansharpen.py | 3 + swig/python/gdal-utils/scripts/gdal2tiles.py | 0 swig/python/gdal-utils/scripts/gdal2xyz.py | 0 swig/python/gdal-utils/scripts/gdal_calc.py | 0 swig/python/gdal-utils/scripts/gdal_edit.py | 0 swig/python/gdal-utils/scripts/gdal_fillnodata.py | 0 swig/python/gdal-utils/scripts/gdal_merge.py | 0 swig/python/gdal-utils/scripts/gdal_pansharpen.py | 0 swig/python/gdal-utils/scripts/gdal_polygonize.py | 0 swig/python/gdal-utils/scripts/gdal_proximity.py | 0 swig/python/gdal-utils/scripts/gdal_retile.py | 0 swig/python/gdal-utils/scripts/gdal_sieve.py | 0 swig/python/gdal-utils/scripts/gdalattachpct.py | 0 swig/python/gdal-utils/scripts/gdalcompare.py | 0 swig/python/gdal-utils/scripts/gdalmove.py | 0 swig/python/gdal-utils/scripts/ogrmerge.py | 0 swig/python/gdal-utils/scripts/pct2rgb.py | 0 swig/python/gdal-utils/scripts/rgb2pct.py | 0 61 files changed, 904 insertions(+), 395 deletions(-) create mode 100644 autotest/gdrivers/data/netcdf/netcdf_crs_wkt.nc create mode 100644 autotest/gdrivers/data/vrt/warp_inconsistent_blockxsize.vrt create mode 100644 autotest/gdrivers/data/vrt/warp_inconsistent_blockysize.vrt mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal2tiles.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal2xyz.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal_calc.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal_edit.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal_fillnodata.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal_merge.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal_pansharpen.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal_polygonize.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal_proximity.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal_retile.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdal_sieve.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdalattachpct.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdalcompare.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/gdalmove.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/ogrmerge.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/pct2rgb.py mode change 100644 => 100755 swig/python/gdal-utils/scripts/rgb2pct.py git reset --hard HEAD HEAD is now at c528f1a716 swig/python/gdal-utils/scripts: make scripts executable git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\gdal_revision.txt type E:\buildsystem\release-1916-x64\doc\gdal_revision.txt c528f1a7167ddbe4dacddb94a4b2cd4bf5fe439a cd E:\buildsystem set PATH=E:\buildsystem\release-1916-x64\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft SDKs\TypeScript\3.1;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2017\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\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja if not exist src\mapcache-vc15x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc15x64 cd src\mapcache-vc15x64 git reset --hard HEAD HEAD is now at 11f7713 Merge pull request #265 from geographika/content-headers 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-1916-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt 11f7713c5efb730a1699dfd35bbf7300b38c8e06 cd E:\buildsystem