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-7-6 git reset --hard HEAD HEAD is now at 74ae370a update for 7.6.1 release git pull origin Updating 74ae370a..dac7adc6 Fast-forward .github/workflows/check-crlf.yml | 20 + .travis.yml | 3 - CMakeLists.txt | 2 +- HISTORY.TXT | 5 + INSTALL.CMAKE | 5 +- MIGRATION_GUIDE.txt | 7 +- README.rst | 12 +- cmake/FindOracle.cmake | 2 +- cmake/FindProj.cmake | 80 +- fontcache.c | 20 + mapcontour.c | 19 +- mapgdal.c | 18 +- mapgdal.h | 46 + mapproject.c | 10 + mapscript/csharp/Makefile.vc | 2 +- mapscript/csharp/examples/drawmapDirect.cs | 200 +- mapscript/csharp/examples/drawmapDirectPrint.cs | 232 +- mapscript/csharp/examples/inline.cs | 270 +- maptemplate.c | 5 + maptile.h | 2 - mapwcs11.c | 5 +- mapwcs20.c | 4 +- mapwmslayer.c | 5 +- msautotest/README | 4 +- msautotest/gdal/wmsclient.map | 2 +- msautotest/gdal/wmsclient_3543.map | 2 +- msautotest/misc/expected/mode_tile_output.png | Bin 0 -> 3412 bytes msautotest/misc/mode_tile.map | 36 + msautotest/misc/ogr_direct.map | 58 +- msautotest/mssql/create_mssql_db.bat | 14 +- msautotest/mssql/include/bdry_counpy2_mssql.map | 26 +- msautotest/mssql/include/cities_mssql.map | 12 +- msautotest/renderers/wmsclient.map | 2 +- msautotest/wxs/wms_client_111.map | 2 +- msautotest/wxs/wms_client_111_axis_fail.map | 2 +- msautotest/wxs/wms_client_130.map | 2 +- msautotest/wxs/wms_client_130_axis_fail.map | 2 +- renderers/agg/include/agg_conv_clipper.h | 598 +- renderers/agg/include/agg_rendering_buffer.h | 4 +- renderers/agg/include/clipper.hpp | 604 +-- renderers/agg/src/clipper.cpp | 6604 +++++++++++------------ version.rc.in | 104 +- 42 files changed, 4605 insertions(+), 4447 deletions(-) create mode 100644 .github/workflows/check-crlf.yml create mode 100644 mapgdal.h create mode 100644 msautotest/misc/expected/mode_tile_output.png create mode 100644 msautotest/misc/mode_tile.map git reset --hard HEAD HEAD is now at dac7adc6 Merge pull request #6199 from MapServer-backport-bot/backport-6198-to-branch-7-6 git log --pretty=format:%H -n 1 > E:\builds\release-1900\doc\ms_revision.txt type E:\builds\release-1900\doc\ms_revision.txt dac7adc6c6cc1f92febb78d15accf71ca8dbadf9 cd E:\builds cd ..\sdk\vc14\gdal-3.2\gdal git reset --hard HEAD HEAD is now at 75134407da Prepare for 3.2.0 release git pull origin Updating 75134407da..ea7ab778d7 Fast-forward .github/workflows/macos.yml | 29 +- .github/workflows/windows_build.yml | 1 + .gitignore | 7 + autotest/alg/applyverticalshiftgrid.py | 2 +- autotest/cpp/test_osr.cpp | 42 + autotest/gcore/cog.py | 4 +- autotest/gcore/hfa_srs.py | 17 + autotest/gcore/vsiaz.py | 3 + .../netcdf/byte_hdf5_starting_at_offset_1024.nc | Bin 0 -> 14846 bytes autotest/gdrivers/eedai.py | 4 + autotest/gdrivers/fits.py | 498 ++++++++- autotest/gdrivers/hdf5.py | 14 + autotest/gdrivers/mbtiles.py | 6 +- autotest/gdrivers/mrf.py | 21 + autotest/gdrivers/netcdf.py | 20 + autotest/gdrivers/vrtpansharpen.py | 89 ++ autotest/gdrivers/wmts.py | 55 + autotest/gdrivers/xyz.py | 47 +- autotest/ogr/ogr_basic_test.py | 26 + autotest/ogr/ogr_elasticsearch.py | 258 ++++- autotest/ogr/ogr_flatgeobuf.py | 66 +- autotest/ogr/ogr_geojson.py | 94 +- autotest/ogr/ogr_geom.py | 33 + autotest/ogr/ogr_gml_geom.py | 9 +- autotest/ogr/ogr_openfilegdb.py | 8 +- autotest/ogr/ogr_sql_rfc28.py | 32 + autotest/osr/osr_epsg.py | 24 + autotest/osr/osr_metacrs.py | 3 + autotest/pymod/gdaltest.py | 7 + autotest/pyscripts/test_gdal2tiles.py | 24 +- autotest/utilities/test_gdal_rasterize_lib.py | 46 +- autotest/utilities/test_gdal_translate_lib.py | 62 ++ autotest/utilities/test_gdalwarp.py | 14 +- autotest/utilities/test_gdalwarp_lib.py | 28 +- gdal/GDALmake.opt.in | 2 +- gdal/MIGRATION_GUIDE.TXT | 9 + gdal/NEWS | 148 +++ gdal/VERSION | 2 +- gdal/alg/gdal_alg_priv.h | 3 + gdal/alg/gdalpansharpen.cpp | 5 +- gdal/alg/gdaltransformer.cpp | 25 +- gdal/alg/gdalwarpkernel.cpp | 8 +- gdal/alg/gdalwarpoperation.cpp | 68 +- gdal/apps/GNUmakefile | 2 +- gdal/apps/gdal_rasterize_lib.cpp | 56 +- gdal/apps/gdal_translate_lib.cpp | 71 +- gdal/apps/gdalwarp_lib.cpp | 32 + gdal/ci/travis/osx/before_install.sh | 23 +- gdal/ci/travis/osx/install.sh | 58 +- gdal/ci/travis/osx/script.sh | 5 +- gdal/ci/travis/trusty_clang/before_install.sh | 4 +- gdal/ci/travis/ubuntu_1604/before_install.sh | 4 +- gdal/ci/travis/ubuntu_1804/before_install.sh | 4 +- gdal/data/tms_MapML_CBMTILE.json | 200 ++-- gdal/doc/source/drivers/raster/fits.rst | 38 +- gdal/doc/source/drivers/raster/xyz.rst | 22 +- gdal/doc/source/drivers/vector/elasticsearch.rst | 15 + gdal/doc/source/programs/gdal2tiles.rst | 1 - gdal/frmts/blx/blx.c | 8 +- gdal/frmts/fit/fitdataset.cpp | 12 + gdal/frmts/fits/fitsdataset.cpp | 1170 +++++++++++++++++++- gdal/frmts/grib/degrib/degrib/metaname.cpp | 1 + gdal/frmts/grib/degrib/degrib/metaparse.cpp | 24 +- gdal/frmts/gtiff/cogdriver.cpp | 121 +- gdal/frmts/hdf5/hdf5dataset.cpp | 74 +- gdal/frmts/heif/makefile.vc | 13 + gdal/frmts/hfa/GNUmakefile | 2 + gdal/frmts/hfa/hfadataset.cpp | 44 +- gdal/frmts/hfa/makefile.vc | 2 + gdal/frmts/makefile.vc | 2 +- gdal/frmts/mbtiles/mbtilesdataset.cpp | 118 +- gdal/frmts/mrf/LERCV1/Lerc1Image.cpp | 41 +- gdal/frmts/mrf/LERCV1/Lerc1Image.h | 4 + gdal/frmts/mrf/LERCV1/makefile.vc | 2 - gdal/frmts/mrf/LERC_band.cpp | 16 +- gdal/frmts/netcdf/netcdfdataset.cpp | 131 ++- gdal/frmts/pcraster/libcsf/mopen.c | 41 +- gdal/frmts/raw/doq1dataset.cpp | 2 +- gdal/frmts/vrt/vrtmultidim.cpp | 5 +- gdal/frmts/vrt/vrtpansharpened.cpp | 16 +- gdal/frmts/wcs/wcsdataset.cpp | 3 + gdal/frmts/wms/gdalhttp.cpp | 42 +- gdal/frmts/wms/wmsdriver.cpp | 12 + gdal/frmts/wms/wmsmetadataset.cpp | 3 - gdal/frmts/xyz/xyzdataset.cpp | 276 ++++- gdal/gcore/gdal_version.h.in | 6 +- gdal/gcore/gdalpython.cpp | 12 +- gdal/gcore/overview.cpp | 4 +- gdal/gcore/rawdataset.cpp | 17 +- gdal/ogr/gml2ogrgeometry.cpp | 76 +- gdal/ogr/ogr_fromepsg.cpp | 81 -- gdal/ogr/ogr_p.h | 3 + gdal/ogr/ogrfeature.cpp | 38 +- gdal/ogr/ogrpgeogeometry.cpp | 28 +- gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp | 1 + gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp | 1 + gdal/ogr/ogrsf_frmts/dxf/ogrdxf_hatch.cpp | 8 +- gdal/ogr/ogrsf_frmts/elastic/ogr_elastic.h | 21 +- .../ogrsf_frmts/elastic/ogrelasticdatasource.cpp | 6 +- gdal/ogr/ogrsf_frmts/elastic/ogrelasticdriver.cpp | 8 + gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp | 229 +++- gdal/ogr/ogrsf_frmts/flatgeobuf/GNUmakefile | 6 +- gdal/ogr/ogrsf_frmts/flatgeobuf/makefile.vc | 4 +- gdal/ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h | 43 +- .../flatgeobuf/ogrflatgeobufdataset.cpp | 151 +-- .../flatgeobuf/ogrflatgeobufeditablelayer.cpp | 193 ++++ .../ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp | 169 ++- gdal/ogr/ogrsf_frmts/flatgeobuf/packedrtree.cpp | 81 +- gdal/ogr/ogrsf_frmts/flatgeobuf/packedrtree.h | 14 +- gdal/ogr/ogrsf_frmts/generic/ogr_gensql.cpp | 2 +- gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp | 65 +- .../ogrsf_frmts/geojson/ogrgeojsonwritelayer.cpp | 23 +- gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp | 144 ++- .../ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 134 ++- gdal/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp | 70 +- .../ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp | 15 +- gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h | 2 + gdal/ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp | 7 +- gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp | 17 +- gdal/ogr/ogrsf_frmts/pg/ogrpgresultlayer.cpp | 6 +- gdal/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp | 4 +- gdal/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp | 15 +- gdal/ogr/ogrspatialreference.cpp | 137 +++ gdal/ogr/ogrutils.cpp | 65 ++ gdal/port/cpl_vsi_mem.cpp | 51 +- gdal/port/cpl_vsil_cache.cpp | 3 + gdal/port/cpl_vsil_curl_streaming.cpp | 2 +- gdal/port/cpl_vsil_subfile.cpp | 13 +- gdal/swig/csharp/makefile.vc | 5 + gdal/swig/include/perl/gdal_perl.i | 4 +- gdal/swig/include/perl/ogr_perl.i | 2 +- gdal/swig/include/python/ogr_python.i | 9 + gdal/swig/perl/t/osr.t | 2 +- gdal/swig/python/README.rst | 2 +- gdal/swig/python/gdal.py | 5 - gdal/swig/python/gdalconst.py | 5 - gdal/swig/python/gdalnumeric.py | 5 - gdal/swig/python/ogr.py | 5 - gdal/swig/python/osgeo/__init__.py | 71 ++ gdal/swig/python/osgeo/ogr.py | 9 + gdal/swig/python/osr.py | 5 - gdal/swig/python/scripts/gdal2tiles.py | 20 + gdal/swig/python/setup.py | 2 +- gdal/third_party/LercLib/Lerc2.h | 1 + 144 files changed, 5646 insertions(+), 1064 deletions(-) create mode 100644 autotest/gdrivers/data/netcdf/byte_hdf5_starting_at_offset_1024.nc create mode 100644 gdal/frmts/heif/makefile.vc create mode 100644 gdal/ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobufeditablelayer.cpp delete mode 100644 gdal/swig/python/gdal.py delete mode 100644 gdal/swig/python/gdalconst.py delete mode 100644 gdal/swig/python/gdalnumeric.py delete mode 100644 gdal/swig/python/ogr.py delete mode 100644 gdal/swig/python/osr.py git reset --hard HEAD HEAD is now at ea7ab778d7 Sign csharp assemblies as part of the netcore build process, verify signature during tests (#1368) (#3332) (#3334) git log --pretty=format:%H -n 1 > E:\builds\release-1900\doc\gdal_revision.txt type E:\builds\release-1900\doc\gdal_revision.txt ea7ab778d71bd03be382a7d33b18dcf015068af6 cd E:\builds