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\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 20b7671f Document imageObj and hashTableObj (#6168) git fetch git checkout master Your branch is up to date with 'origin/master'. git pull origin master Already up to date. git reset --hard HEAD HEAD is now at 20b7671f Document imageObj and hashTableObj (#6168) git log --pretty=format:%H -n 1 > E:\builds\release-1900\doc\ms_revision.txt type E:\builds\release-1900\doc\ms_revision.txt 20b7671f788952c6097ae154b667dd564cf70764 cd E:\builds cd ..\sdk\vc14\gdal\gdal git reset --hard HEAD HEAD is now at 803e1e612a PDS4: update value of for TIFF/BigTIFF to what is expected by PDS4 IM (fixes #3362) git fetch git checkout master Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 803e1e612a..4e0add8b53 Fast-forward .github/workflows/windows_build.yml | 1 + autotest/alg/warp.py | 9 +- autotest/gcore/gdal_stats.py | 2 +- autotest/gcore/numpy_rw.py | 101 ++++++-------------- autotest/gcore/numpy_rw_multidim.py | 16 ++-- autotest/gcore/pixfun.py | 54 +++++------ autotest/gcore/rasterio.py | 69 ++++++-------- autotest/gcore/thread_test.py | 10 +- autotest/gcore/tiff_write.py | 49 +++++----- autotest/gcore/virtualmem.py | 61 ++++-------- autotest/gcore/vrt_read.py | 6 +- autotest/gdrivers/netcdf.py | 18 ++++ autotest/gdrivers/vrtpansharpen.py | 8 +- autotest/pyscripts/test_gdal_calc.py | 46 +++++---- autotest/pyscripts/test_gdal_edit.py | 14 +-- autotest/pyscripts/test_gdal_merge.py | 8 +- autotest/pyscripts/test_gdal_retile.py | 2 - autotest/pyscripts/test_rgb2pct.py | 10 +- autotest/utilities/test_gdal_rasterize.py | 19 ++-- gdal/doc/source/programs/gdal_calc.rst | 2 +- gdal/frmts/netcdf/GNUmakefile | 4 + gdal/frmts/netcdf/makefile.vc | 3 + gdal/frmts/netcdf/netcdfdataset.cpp | 64 ++++++++++--- gdal/frmts/netcdf/netcdfdataset.h | 1 + gdal/nmake.opt | 3 + gdal/swig/include/python/gdal_python.i | 48 +++++----- gdal/swig/python/README.rst | 144 ++++++++++++++--------------- gdal/swig/python/osgeo/gdal.py | 48 +++++----- gdal/swig/python/osgeo/gdalnumeric.py | 5 + gdal/swig/python/osgeo/utils/gdal_calc.py | 15 +-- gdal/swig/python/osgeo/utils/gdal_merge.py | 22 ++--- gdal/swig/python/osgeo/utils/pct2rgb.py | 17 ++-- gdal/swig/python/samples/classify.py | 25 +++-- gdal/swig/python/samples/gdal_lut.py | 16 ++-- gdal/swig/python/samples/magphase.py | 18 ++-- gdal/swig/python/samples/rel.py | 22 ++--- gdal/swig/python/samples/val_repl.py | 7 +- gdal/swig/python/setup.py | 12 ++- 38 files changed, 456 insertions(+), 523 deletions(-) git reset --hard HEAD HEAD is now at 4e0add8b53 Merge pull request #3365 from talos-gis/develop git log --pretty=format:%H -n 1 > E:\builds\release-1900\doc\gdal_revision.txt type E:\builds\release-1900\doc\gdal_revision.txt 4e0add8b5370b8859692c8fb5be5025b0f1f0787 cd E:\builds