found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1916\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;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;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\;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\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework\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\;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\;%USERPROFILE%\.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-7-6-vc15 git clone -b branch-7-6 https://github.com/mapserver/mapserver.git src\mapserver-7-6-vc15 cd src\mapserver-7-6-vc15 git reset --hard HEAD HEAD is now at d5eaaa0b3 Merge pull request #6418 from MaxKellermann/fuzzer2 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 d5eaaa0b3 Merge pull request #6418 from MaxKellermann/fuzzer2 git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916\doc\ms_revision.txt type E:\buildsystem\release-1916\doc\ms_revision.txt d5eaaa0b37f66749f902e023f7c41c15799a451f cd E:\buildsystem if not exist src\gdal-3-4-vc15 git clone -b release/3.4 https://github.com/OSGeo/gdal.git src\gdal-3-4-vc15 cd src\gdal-3-4-vc15 git reset --hard HEAD HEAD is now at 1788cd2478 Merge pull request #4926 from OSGeo/backport-4924-to-release/3.4 git fetch git checkout release/3.4 Your branch is behind 'origin/release/3.4' by 27 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin release/3.4 Updating 1788cd2478..7682bd1032 Fast-forward autotest/cpp/test_ogr.cpp | 36 ++ autotest/gcore/cog.py | 19 + autotest/gcore/tiff_ovr.py | 135 +++++++ autotest/gcore/tiff_write.py | 370 +++++++++++++++++- autotest/gdrivers/grib.py | 2 +- autotest/ogr/data/topojson/topojson1.topojson | 4 +- autotest/ogr/data/topojson/topojson2.topojson | 4 +- autotest/ogr/ogr_s57.py | 4 +- autotest/ogr/ogr_topojson.py | 16 +- autotest/pyscripts/test_gdal_edit.py | 382 ++++++++++--------- gdal/doc/source/drivers/raster/gtiff.rst | 3 + gdal/doc/source/drivers/vector/s57.rst | 4 +- gdal/doc/source/programs/gdaladdo.rst | 4 + gdal/frmts/grib/gribcreatecopy.cpp | 14 +- gdal/frmts/grib/gribdataset.cpp | 16 +- gdal/frmts/gtiff/cogdriver.cpp | 25 +- gdal/frmts/gtiff/geotiff.cpp | 413 ++++++++++++++------- gdal/frmts/gtiff/gt_overview.cpp | 8 +- gdal/frmts/gtiff/libtiff/GNUmakefile | 12 - gdal/frmts/gtiff/libtiff/dump_symbols.sh | 7 +- .../gtiff/libtiff/gdal_libtiff_symbol_rename.h | 6 +- gdal/frmts/gtiff/libtiff/tif_jpeg.c | 6 +- gdal/frmts/gtiff/libtiff/tif_jpeg_12.c | 9 + gdal/frmts/gtiff/libtiff/tif_write.c | 31 +- .../pcidsk/sdk/segment/cpcidskbinarysegment.cpp | 7 +- gdal/gcore/gdal_pam.h | 1 + gdal/gcore/gdal_priv.h | 1 + gdal/gcore/gdalcolortable.cpp | 26 ++ gdal/gcore/gdalpamdataset.cpp | 20 + gdal/gcore/overview.cpp | 86 ++++- gdal/nmake.opt | 2 +- gdal/ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp | 8 + .../ogrsf_frmts/geojson/directedacyclicgraph.hpp | 1 + gdal/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp | 171 ++++++--- gdal/ogr/ogrsf_frmts/pg/ogr_pg.h | 5 +- gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp | 20 +- gdal/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp | 14 + gdal/ogr/ogrsf_frmts/s57/ogrs57driver.cpp | 4 +- gdal/ogr/ogrsf_frmts/s57/ogrs57layer.cpp | 7 + gdal/ogr/ogrsf_frmts/s57/s57reader.cpp | 2 +- gdal/ogr/ogrsf_frmts/selafin/io_selafin.cpp | 2 +- .../ogrsf_frmts/selafin/ogrselafindatasource.cpp | 8 +- .../python/gdal-utils/osgeo_utils/gdal2tiles.py | 10 +- 43 files changed, 1444 insertions(+), 481 deletions(-) git reset --hard HEAD HEAD is now at 7682bd1032 nmake.opt: fix wrong variable name in example MSODBCSQL_LIB [ci skip] git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916\doc\gdal_revision.txt type E:\buildsystem\release-1916\doc\gdal_revision.txt 7682bd1032c8371e460a3e03094f6256cc96366d cd E:\buildsystem set PATH=E:\buildsystem\release-1916\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX86\x86;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;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\;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\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework\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\;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\;%USERPROFILE%\.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-branch-1-10-vc15 git clone -b branch-1-10 https://github.com/MapServer/mapcache.git src\mapcache-branch-1-10-vc15 cd src\mapcache-branch-1-10-vc15 git reset --hard HEAD HEAD is now at decc71a Merge branch 'master' into branch-1-10: Fixed some memory leaks of curl headers #233 git fetch git checkout branch-1-10 Your branch is up to date with 'origin/branch-1-10'. git pull origin branch-1-10 Already up to date. git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916\doc\mapcache_revision.txt type E:\buildsystem\release-1916\doc\mapcache_revision.txt decc71a775d6d8bec9892ac3e56852e16b2f094f cd E:\buildsystem