SET PATH=E:\builds\release-1900\bin;E:\builds\release-1900\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 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 (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;C:\Users\szekeres\.dotnet\tools if exist E:\builds\release-1900\bin\curl\curl.exe E:\builds\release-1900\bin\curl\curl.exe -o E:\builds\release-1900\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc14\mapserver git reset --hard HEAD HEAD is now at 1a0602ae Merge pull request #6165 from rouault/drawgdal_bands_mask_band git pull origin Updating 1a0602ae..de33bb37 Fast-forward .travis.yml | 3 -- mapmetadata.c | 37 ++++------------------ mapwfs11.cpp | 1 - .../wxs/expected/ows_metadata_layer_raster.xml | 11 +------ .../wxs/expected/ows_metadata_layer_vector.xml | 14 +++----- .../expected/ows_metadata_wms_capabilities111.xml | 3 ++ .../expected/ows_metadata_wms_capabilities130.xml | 3 ++ msautotest/wxs/ows_metadata.map | 1 + 8 files changed, 18 insertions(+), 55 deletions(-) git reset --hard HEAD HEAD is now at de33bb37 Merge pull request #6171 from rouault/fix_6170 git log --pretty=format:%H -n 1 > E:\builds\release-1900\doc\ms_revision.txt type E:\builds\release-1900\doc\ms_revision.txt de33bb3744f5418f16b81ace5b17045369477dc3 cd E:\builds cd ..\sdk\vc14\gdal\gdal git reset --hard HEAD HEAD is now at f999a23041 Merge pull request #3054 from rouault/fix_3051 git pull origin Updating f999a23041..f02356245e Fast-forward autotest/gdrivers/memmultidim.py | 10 ++ autotest/gdrivers/netcdf_multidim.py | 47 ++++++++ autotest/gdrivers/nitf.py | 89 +++++++++++++++ gdal/data/nitf_spec.xml | 69 ++++++++++- gdal/data/nitf_spec.xsd | 1 + gdal/doc/source/programs/gdaladdo.rst | 6 +- gdal/doc/source/programs/ogr2ogr.rst | 6 +- gdal/frmts/netcdf/netcdfmultidim.cpp | 101 +++++++++++++++++ gdal/frmts/nitf/nitffile.c | 23 ++-- gdal/gcore/gdal.h | 3 + gdal/gcore/gdal_priv.h | 7 ++ gdal/gcore/gdalmultidim.cpp | 182 ++++++++++++++++++++++++++++-- gdal/swig/include/MultiDimensional.i | 38 +++++++ gdal/swig/include/python/gdal_python.i | 7 ++ gdal/swig/python/extensions/gdal_wrap.cpp | 156 +++++++++++++++++++++++++ gdal/swig/python/osgeo/gdal.py | 12 ++ 16 files changed, 735 insertions(+), 22 deletions(-) git reset --hard HEAD HEAD is now at f02356245e Merge pull request #3002 from rouault/mdarray_adviseread git log --pretty=format:%H -n 1 > E:\builds\release-1900\doc\gdal_revision.txt type E:\builds\release-1900\doc\gdal_revision.txt f02356245e81e2f9d95069b6d126219d1d85736b cd E:\builds