SET PATH=E:\builds\release-1911\bin;E:\builds\release-1911\bin\curl;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\;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:\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 exist E:\builds\release-1911\bin\curl\curl.exe E:\builds\release-1911\bin\curl\curl.exe -o E:\builds\release-1911\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc15\mapserver git reset --hard HEAD HEAD is now at b4818606 Merge pull request #6124 from PDOK/define_rect git pull origin Updating b4818606..3fcec141 Fast-forward maptemplate.c | 2 ++ 1 file changed, 2 insertions(+) git reset --hard HEAD HEAD is now at 3fcec141 Merge pull request #6128 from jmckenna/branch-ol-viewer git log --pretty=format:%H -n 1 > E:\builds\release-1911\doc\ms_revision.txt type E:\builds\release-1911\doc\ms_revision.txt 3fcec141c4b30b95906cd3e50ec88a54e4743e0b cd E:\builds cd ..\sdk\vc15\gdal\gdal git reset --hard HEAD HEAD is now at 84090e20f2 Internal libgeotiff: avoid look up of user-defined GeogGeodeticDatumGeoKey that cause PROJ warnings (fixes https://github.com/OSGeo/libgeotiff/issues/41) git pull origin Updating 84090e20f2..26fe87c742 Fast-forward .gitignore | 4 + autotest/cpp/test_osr_set_proj_search_paths.cpp | 12 + autotest/gcore/cog.py | 9 + autotest/gcore/gdal_stats.py | 15 +- autotest/gcore/hdf4multidim.py | 7 + autotest/gcore/vsis3.py | 41 + autotest/gdrivers/envi.py | 21 + autotest/gdrivers/gpkg.py | 12 +- autotest/gdrivers/memmultidim.py | 53 + autotest/gdrivers/mrf.py | 2 + autotest/gdrivers/netcdf_multidim.py | 90 ++ autotest/ogr/data/dxf/3d.dxf | 30 + autotest/ogr/ogr_dxf.py | 9 +- autotest/ogr/ogr_geojson.py | 22 + autotest/ogr/ogr_mitab.py | 6 +- autotest/ogr/ogr_pg.py | 2 +- autotest/osr/osr_ct_proj.py | 9 +- autotest/utilities/test_gdal_grid.py | 27 + gdal/alg/polygonize.cpp | 15 +- gdal/apps/gdal_grid_bin.cpp | 2 +- gdal/apps/gdal_grid_lib.cpp | 70 +- gdal/apps/gdalinfo_lib.cpp | 6 +- gdal/apps/gdalmdiminfo_bin.cpp | 2 +- gdal/apps/gdalmdiminfo_lib.cpp | 65 +- gdal/doc/source/drivers/raster/cog.rst | 6 + gdal/doc/source/drivers/raster/kea.rst | 4 +- gdal/doc/source/drivers/vector/dxf.rst | 46 +- gdal/doc/source/drivers/vector/pg.rst | 33 +- gdal/doc/source/drivers/vector/pgeo.rst | 34 +- gdal/doc/source/programs/gdal_grid.rst | 10 +- gdal/doc/source/programs/gdalmdiminfo.rst | 9 +- gdal/doc/source/user/sql_sqlite_dialect.rst | 13 + gdal/docker/alpine-normal/Dockerfile | 4 +- gdal/frmts/fits/fitsdataset.cpp | 6 + gdal/frmts/grib/gribdataset.cpp | 9 + gdal/frmts/gtiff/geotiff.cpp | 44 +- gdal/frmts/gtiff/gt_wkt_srs.cpp | 6 + gdal/frmts/hdf4/hdf4multidim.cpp | 42 +- gdal/frmts/hdf5/hdf5multidim.cpp | 6 + gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 10 + gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 +- gdal/frmts/mrf/GNUmakefile | 14 +- gdal/frmts/mrf/JPEG_band.cpp | 4 +- gdal/frmts/mrf/JPNG_band.cpp | 4 +- gdal/frmts/mrf/{libLERC => LERCV1}/GNUmakefile | 5 +- gdal/frmts/mrf/{libLERC => LERCV1}/LICENSE.TXT | 0 gdal/frmts/mrf/LERCV1/Lerc1Image.cpp | 911 +++++++++++++ gdal/frmts/mrf/LERCV1/Lerc1Image.h | 178 +++ gdal/frmts/mrf/{libLERC => LERCV1}/NOTICE.TXT | 0 gdal/frmts/mrf/LERCV1/makefile.vc | 22 + gdal/frmts/mrf/LERC_band.cpp | 320 ++--- gdal/frmts/mrf/PNG_band.cpp | 4 +- gdal/frmts/mrf/Tif_band.cpp | 4 +- gdal/frmts/mrf/libLERC/BitMaskV1.cpp | 185 --- gdal/frmts/mrf/libLERC/BitMaskV1.h | 70 - gdal/frmts/mrf/libLERC/BitStufferV1.cpp | 374 ------ gdal/frmts/mrf/libLERC/BitStufferV1.h | 59 - gdal/frmts/mrf/libLERC/CntZImage.cpp | 1361 -------------------- gdal/frmts/mrf/libLERC/CntZImage.h | 167 --- gdal/frmts/mrf/libLERC/DefinesV1.h | 120 -- gdal/frmts/mrf/libLERC/Image.h | 87 -- gdal/frmts/mrf/libLERC/TImage.hpp | 198 --- gdal/frmts/mrf/libLERC/makefile.vc | 27 - gdal/frmts/mrf/makefile.vc | 19 +- gdal/frmts/mrf/marfa.h | 76 +- gdal/frmts/mrf/marfa_dataset.cpp | 112 +- gdal/frmts/mrf/mrf_band.cpp | 44 +- gdal/frmts/mrf/mrf_overview.cpp | 10 +- gdal/frmts/mrf/mrf_util.cpp | 14 +- gdal/frmts/netcdf/netcdfdataset.cpp | 4 +- gdal/frmts/netcdf/netcdfmultidim.cpp | 2 + gdal/frmts/raw/envidataset.cpp | 20 +- gdal/frmts/vrt/vrtmultidim.cpp | 8 +- gdal/gcore/gdal.h | 13 + gdal/gcore/gdal_pam.h | 28 + gdal/gcore/gdal_priv.h | 22 + gdal/gcore/gdaldataset.cpp | 39 +- gdal/gcore/gdalmultidim.cpp | 424 +++++- gdal/gcore/gdalpamdataset.cpp | 181 +++ gdal/gcore/gdalrasterband.cpp | 2 + gdal/ogr/ogr_proj_p.cpp | 5 + gdal/ogr/ogrgeometryfactory.cpp | 8 +- gdal/ogr/ogrsf_frmts/dxf/ogr_dxf.h | 72 +- gdal/ogr/ogrsf_frmts/dxf/ogrdxf_ocstransformer.cpp | 90 +- gdal/ogr/ogrsf_frmts/geojson/libjson/json_object.c | 113 +- gdal/ogr/ogrsf_frmts/geojson/libjson/json_object.h | 5 + .../ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp | 7 +- .../ogrsf_frmts/geomedia/ogrgeomediadatasource.cpp | 2 +- .../ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 100 +- gdal/ogr/ogrsf_frmts/mitab/mitab_spatialref.cpp | 17 +- gdal/ogr/ogrsf_frmts/nas/nasreader.cpp | 3 +- gdal/ogr/ogrsf_frmts/odbc/ogrodbcdatasource.cpp | 4 +- gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp | 176 ++- gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp | 4 +- gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp | 2 + gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp | 27 + gdal/ogr/ogrsf_frmts/walk/ogrwalkdatasource.cpp | 2 +- gdal/port/cpl_odbc.cpp | 44 +- gdal/port/cpl_vsil.cpp | 8 +- gdal/port/cpl_vsil_s3.cpp | 132 +- gdal/swig/include/Dataset.i | 5 + gdal/swig/include/MultiDimensional.i | 86 ++ gdal/swig/perl/t/alg.t | 4 +- gdal/swig/python/extensions/gdal_wrap.cpp | 648 +++++++++- gdal/swig/python/osgeo/gdal.py | 51 + gdal/swig/python/scripts/gdal_sieve.py | 4 +- 106 files changed, 4111 insertions(+), 3457 deletions(-) rename gdal/frmts/mrf/{libLERC => LERCV1}/GNUmakefile (87%) rename gdal/frmts/mrf/{libLERC => LERCV1}/LICENSE.TXT (100%) create mode 100644 gdal/frmts/mrf/LERCV1/Lerc1Image.cpp create mode 100644 gdal/frmts/mrf/LERCV1/Lerc1Image.h rename gdal/frmts/mrf/{libLERC => LERCV1}/NOTICE.TXT (100%) create mode 100644 gdal/frmts/mrf/LERCV1/makefile.vc delete mode 100644 gdal/frmts/mrf/libLERC/BitMaskV1.cpp delete mode 100644 gdal/frmts/mrf/libLERC/BitMaskV1.h delete mode 100644 gdal/frmts/mrf/libLERC/BitStufferV1.cpp delete mode 100644 gdal/frmts/mrf/libLERC/BitStufferV1.h delete mode 100644 gdal/frmts/mrf/libLERC/CntZImage.cpp delete mode 100644 gdal/frmts/mrf/libLERC/CntZImage.h delete mode 100644 gdal/frmts/mrf/libLERC/DefinesV1.h delete mode 100644 gdal/frmts/mrf/libLERC/Image.h delete mode 100644 gdal/frmts/mrf/libLERC/TImage.hpp delete mode 100644 gdal/frmts/mrf/libLERC/makefile.vc git reset --hard HEAD HEAD is now at 26fe87c742 Merge pull request #2850 from rouault/mdarray_stats git log --pretty=format:%H -n 1 > E:\builds\release-1911\doc\gdal_revision.txt type E:\builds\release-1911\doc\gdal_revision.txt 26fe87c742a3cd52afeebbb512f7ea86650b348c cd E:\builds