SET PATH=E:\builds\release-1900-x64\bin;E:\builds\release-1900-x64\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\MSBuild\14.0\bin\amd64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN\amd64;C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;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 (x86)\Microsoft SDKs\TypeScript\1.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; if exist E:\builds\release-1900-x64\bin\curl\curl.exe E:\builds\release-1900-x64\bin\curl\curl.exe -o E:\builds\release-1900-x64\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc14x64\mapserver-7-6 git reset --hard HEAD HEAD is now at 7aba93dd Merge pull request #6129 from MapServer-backport-bot/backport-6128-to-branch-7-6 git pull origin Already up to date. git reset --hard HEAD HEAD is now at 7aba93dd Merge pull request #6129 from MapServer-backport-bot/backport-6128-to-branch-7-6 git log --pretty=format:%H -n 1 > E:\builds\release-1900-x64\doc\ms_revision.txt type E:\builds\release-1900-x64\doc\ms_revision.txt 7aba93dd04a2388fb56803620b260680b6fc1d86 cd E:\builds cd ..\sdk\vc14x64\gdal-3.1\gdal git reset --hard HEAD HEAD is now at 3ec05913e8 gdal2tiles.py: fix generation of tiles at high zoom levels when input is small (fixes #2896) git pull origin Updating 3ec05913e8..31ff5e2664 Fast-forward ...10t101603-20160510t101606-011195-010ea1-001.xml | 62 + ...10t101618-20160510t101621-011195-010ea1-002.xml | 73 ++ autotest/gdrivers/data/SAFE_FAKE_WV/manifest.safe | 1377 ++++++++++++++++++++ ...0t101603-20160510t101606-011195-010ea1-001.tiff | Bin 0 -> 180 bytes ...0t101618-20160510t101621-011195-010ea1-002.tiff | Bin 0 -> 180 bytes autotest/gdrivers/netcdf.py | 17 +- autotest/gdrivers/safe.py | 21 +- autotest/ogr/ogr_gpkg.py | 34 +- gdal/doc/source/drivers/vector/gpkg.rst | 6 + gdal/frmts/netcdf/netcdfdataset.cpp | 41 +- gdal/frmts/safe/safedataset.cpp | 81 +- .../ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp | 5 + .../ogrsf_frmts/geomedia/ogrgeomediadatasource.cpp | 46 +- gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 2 + .../ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 2 + gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp | 4 + .../ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 47 +- gdal/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp | 42 +- gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp | 59 +- gdal/ogr/ogrsf_frmts/walk/ogrwalkdatasource.cpp | 39 +- gdal/port/cpl_odbc.cpp | 72 + gdal/port/cpl_odbc.h | 3 + gdal/port/cpl_vsi.h | 2 + gdal/port/cpl_vsil_plugin.cpp | 8 +- 24 files changed, 1843 insertions(+), 200 deletions(-) create mode 100644 autotest/gdrivers/data/SAFE_FAKE_WV/annotation/s1a-wv1-slc-vv-20160510t101603-20160510t101606-011195-010ea1-001.xml create mode 100644 autotest/gdrivers/data/SAFE_FAKE_WV/annotation/s1a-wv2-slc-vv-20160510t101618-20160510t101621-011195-010ea1-002.xml create mode 100644 autotest/gdrivers/data/SAFE_FAKE_WV/manifest.safe create mode 100644 autotest/gdrivers/data/SAFE_FAKE_WV/measurement/s1a-wv1-slc-vv-20160510t101603-20160510t101606-011195-010ea1-001.tiff create mode 100644 autotest/gdrivers/data/SAFE_FAKE_WV/measurement/s1a-wv2-slc-vv-20160510t101618-20160510t101621-011195-010ea1-002.tiff git reset --hard HEAD HEAD is now at 31ff5e2664 SAFE: deal correctly with WV swaths (fixes #2843) git log --pretty=format:%H -n 1 > E:\builds\release-1900-x64\doc\gdal_revision.txt type E:\builds\release-1900-x64\doc\gdal_revision.txt 31ff5e26642745ed26fe5e6c0f22cca5c54b32d4 cd E:\builds