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)\Windows Kits\10\bin\10.0.19041.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:\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:\php;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;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 git config --global core.autocrlf false 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 17db70f6a Merge pull request #6844 from rouault/cppcheck_fixes 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 17db70f6a..49838efd5 Fast-forward mapfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) git reset --hard HEAD HEAD is now at 49838efd5 Merge pull request #6847 from rouault/fix_ossfuzz_57056 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 49838efd57eef335be1f040dd9fecf1c90567422 cd E:\buildsystem git config --global core.autocrlf false 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 68f655c60e Merge pull request #7461 from edzer/master git fetch git checkout master Your branch is behind 'origin/master' by 33 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 68f655c60e..ffe6e1fb6e Fast-forward .github/workflows/doc_build.yml | 2 +- MIGRATION_GUIDE.TXT | 9 + alg/gdalpansharpen.cpp | 154 ++++++-- alg/gdalpansharpen.h | 11 +- apps/ogr2ogr_lib.cpp | 44 ++- apps/ogrinfo_lib.cpp | 40 ++- autotest/gcore/cog.py | 24 +- autotest/gdrivers/envisat.py | 2 +- autotest/gdrivers/gpkg.py | 136 +++++++ autotest/gdrivers/roipac.py | 2 +- autotest/gdrivers/vrtpansharpen.py | 309 ++++++++++++++-- autotest/ogr/ogr_gpkg.py | 46 +++ autotest/ogr/ogr_sqlite.py | 46 +++ autotest/utilities/test_ogr2ogr_lib.py | 33 ++ autotest/utilities/test_ogrinfo_lib.py | 99 ++++++ cmake/helpers/CheckDependentLibraries.cmake | 31 +- doc/source/download.rst | 2 +- doc/source/drivers/raster/vrt.rst | 4 +- doc/source/programs/gdalcompare.rst | 2 +- docker/README.md | 20 +- docker/alpine-normal/build.sh | 12 +- docker/alpine-small/build.sh | 12 +- docker/ubuntu-full/build.sh | 24 +- docker/ubuntu-small/build.sh | 12 +- docker/util.sh | 38 +- frmts/gtiff/cogdriver.cpp | 10 +- frmts/gtiff/geotiff.cpp | 17 +- frmts/jp2kak/subfile_source.h | 11 +- frmts/pdf/pdfcreatecopy.cpp | 3 +- frmts/vrt/vrtpansharpened.cpp | 410 ++++++++++++---------- frmts/xyz/xyzdataset.cpp | 3 +- ogr/ogrfeature.cpp | 44 ++- ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp | 3 +- ogr/ogrsf_frmts/gpkg/CMakeLists.txt | 3 + ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp | 184 +++++++++- ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 37 +- ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 176 +++++++++- ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp | 2 +- ogr/ogrsf_frmts/sqlite/CMakeLists.txt | 1 + ogr/ogrsf_frmts/sqlite/ogr_sqlite.h | 2 + ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h | 3 +- ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp | 61 +++- ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp | 35 +- ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp | 34 +- port/cpl_vsi.h | 2 +- port/cpl_vsi_mem.cpp | 2 +- port/cpl_vsi_virtual.h | 2 +- port/cpl_vsil.cpp | 53 +-- port/cpl_vsil_curl.cpp | 16 +- port/cpl_vsil_gzip.cpp | 47 +-- port/cpl_vsil_webhdfs.cpp | 3 +- 51 files changed, 1749 insertions(+), 529 deletions(-) git reset --hard HEAD HEAD is now at ffe6e1fb6e Merge pull request #7470 from rouault/test_envisat 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 ffe6e1fb6e8e73d968701cb85b3ec16814cc4a93 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)\Windows Kits\10\bin\10.0.19041.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:\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:\php;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;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 git config --global core.autocrlf false 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 0cb6c00 change Migration Guide to markdown (#305) 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 0cb6c00d19708cab7fbb1719eac62a738aa5405d cd E:\buildsystem