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\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.30.30705\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:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\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:\Users\szekeres\.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\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\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\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\Program Files (x86)\dotnet\;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\Azure Data Studio\bin;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-7-6-vc17x64 git clone -b branch-7-6 https://github.com/mapserver/mapserver.git src\mapserver-7-6-vc17x64 cd src\mapserver-7-6-vc17x64 git reset --hard HEAD HEAD is now at 292ea2e2b update for 7.6.4 release git fetch git checkout branch-7-6 Your branch is up to date with 'origin/branch-7-6'. git pull origin branch-7-6 Already up to date. git reset --hard HEAD HEAD is now at c87d549bc Merge pull request #6526 from MapServer/backport-6525-to-branch-7-6 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 c87d549bc9467c25e2f62813873eaf2eb36029cd cd E:\buildsystem if not exist src\gdal-3-5-vc17x64 git clone -b release/3.5 https://github.com/OSGeo/gdal.git src\gdal-3-5-vc17x64 cd src\gdal-3-5-vc17x64 git reset --hard HEAD HEAD is now at e4e7cb6461 Prepare for GDAL 3.5.0RC4 git fetch git checkout release/3.5 Your branch is behind 'origin/release/3.5' by 69 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin release/3.5 Updating f89ecd3f5c..4c2fdd54fb Fast-forward .github/workflows/fedora_rawhide/start.sh | 8 +- .github/workflows/ubuntu_18.04_32bit/start.sh | 2 +- GDALmake.opt.in | 2 +- NEWS.md | 208 +++++++++ VERSION | 2 +- alg/gdaltransformer.cpp | 63 +-- apps/gdalwarp_lib.cpp | 14 +- autotest/alg/warp.py | 5 +- autotest/cpp/test_gdal.cpp | 92 ++++ autotest/gcore/gdal_stats.py | 7 +- autotest/gcore/geoloc.py | 3 +- autotest/gcore/vsiaz_real_instance_auto.py | 20 +- autotest/gdrivers/bag.py | 4 +- autotest/gdrivers/data/netcdf/cf_geog_with_srs.nc | Bin 0 -> 1088 bytes autotest/gdrivers/mbtiles.py | 9 +- autotest/gdrivers/netcdf.py | 15 + autotest/gdrivers/vrtpansharpen.py | 3 +- autotest/ogr/ogr_geom.py | 4 +- autotest/ogr/ogr_geos.py | 9 + autotest/ogr/ogr_sql_sqlite.py | 6 +- autotest/ogr/ogr_sql_test.py | 26 +- autotest/osr/osr_ct.py | 14 +- autotest/osr/osr_ct_proj.py | 4 +- autotest/pyscripts/test_gdal2xyz.py | 38 ++ cmake/helpers/CheckDependentLibraries.cmake | 5 - cmake/helpers/configure.cmake | 7 + cmake/modules/3.16/FindPython/Support.cmake | 2 +- cmake/template/cpl_config.h.in | 5 +- data/s57objectclasses.csv | 6 +- docker/ubuntu-full/Dockerfile | 4 +- docker/ubuntu-full/bh-gdal.sh | 4 +- docker/ubuntu-small/Dockerfile | 2 +- frmts/CMakeLists.txt | 2 +- frmts/daas/daasdataset.cpp | 5 + frmts/gtiff/geotiff.cpp | 17 +- frmts/gtiff/libtiff/tif_predict.c | 28 +- frmts/gtiff/libtiff/tif_webp.c | 123 ++++-- frmts/jpeg/jpgdataset.cpp | 1 + frmts/netcdf/netcdfdataset.cpp | 29 +- frmts/vrt/vrtsources.cpp | 12 +- gcore/gdal_version.h.in | 6 +- gcore/gdalproxypool.cpp | 63 ++- gdal.cmake | 35 +- ogr/ogr_proj_p.cpp | 34 +- ogr/ogr_srs_pci.cpp | 2 +- ogr/ogrct.cpp | 486 ++++++++++++---------- ogr/ogrgeometry.cpp | 11 + ogr/ogrsf_frmts/CMakeLists.txt | 2 +- ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp | 18 +- ogr/ogrsf_frmts/generic/ogr_gensql.cpp | 52 +-- ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp | 33 +- ogr/ogrsf_frmts/sqlite/ogrsqlitesqlfunctions.cpp | 59 ++- ogr/ogrsf_frmts/vfk/ogrvfklayer.cpp | 3 + ogr/ogrsf_frmts/vfk/vfkdatablock.cpp | 2 +- ogr/ogrsf_frmts/vfk/vfkpropertydefn.cpp | 8 +- ogr/ogrsf_frmts/vfk/vfkreader.cpp | 119 +++++- ogr/ogrsf_frmts/vfk/vfkreader.h | 4 +- ogr/ogrsf_frmts/vfk/vfkreaderp.h | 5 +- port/CMakeLists.txt | 5 + port/cpl_error.h | 2 +- port/cpl_json.cpp | 2 + swig/python/README.rst | 2 +- swig/python/gdal-utils/osgeo_utils/__init__.py | 2 +- swig/python/gdal-utils/osgeo_utils/gdal2xyz.py | 36 ++ swig/python/setup.py | 2 +- 65 files changed, 1329 insertions(+), 474 deletions(-) create mode 100644 autotest/gdrivers/data/netcdf/cf_geog_with_srs.nc git reset --hard HEAD HEAD is now at 4c2fdd54fb CMake: fix typo in function call in cmake/modules/3.16/FindPython/Support.cmake (fixes #6009) 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 4c2fdd54fbf9899fd6fc384a6f10a40b2fbff879 cd E:\buildsystem set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.30.30705\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:\ActiveTcl\bin;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files\Microsoft MPI\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:\Users\szekeres\.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\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\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\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\TortoiseGit\bin;C:\Program Files\Git\cmd;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\Program Files (x86)\dotnet\;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\Azure Data Studio\bin;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-branch-1-12-vc17x64 git clone -b branch-1-12 https://github.com/MapServer/mapcache.git src\mapcache-branch-1-12-vc17x64 cd src\mapcache-branch-1-12-vc17x64 git reset --hard HEAD HEAD is now at e6917f5 Prepare for 1.12.1 Release (#284) git fetch git checkout branch-1-12 Your branch is up to date with 'origin/branch-1-12'. git pull origin branch-1-12 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 e6917f54d3e42a26d324739733d276e90d052f75 cd E:\buildsystem