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; 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..0d4473aa Fast-forward .github/workflows/check-crlf.yml | 20 + cmake/FindOracle.cmake | 2 +- cmake/FindProj.cmake | 80 +- fontcache.c | 20 + 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 | 2 + mapwcs11.c | 5 +- mapwcs20.c | 4 +- mapwmslayer.c | 5 +- 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 +- renderers/agg/include/agg_conv_clipper.h | 598 +- renderers/agg/include/clipper.hpp | 604 +-- renderers/agg/src/clipper.cpp | 6604 +++++++++++------------ version.rc.in | 104 +- 23 files changed, 4520 insertions(+), 4416 deletions(-) create mode 100644 .github/workflows/check-crlf.yml create mode 100644 mapgdal.h git reset --hard HEAD HEAD is now at 0d4473aa Merge pull request #6161 from MapServer-backport-bot/backport-6158-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 0d4473aa923e45f0877125038651239655aa7da8 cd E:\builds cd ..\sdk\vc14\gdal-3.1\gdal git reset --hard HEAD HEAD is now at 1be35bb911 Prepare for GDAL 3.1.1 git pull origin Updating 1be35bb911..d0541eaf0c Fast-forward autotest/alg/tps.py | 62 ---- autotest/gcore/cog.py | 23 ++ autotest/gcore/transformer.py | 2 + autotest/gcore/vrt_read.py | 111 +++++++ autotest/gdrivers/data/grib/subgrids.grib2 | Bin 0 -> 1062 bytes autotest/gdrivers/data/jpeg2000/tile_size_16.jp2 | Bin 0 -> 21777 bytes autotest/gdrivers/grib.py | 65 ++-- autotest/gdrivers/jp2openjpeg.py | 15 + autotest/gdrivers/pcraster.py | 20 +- autotest/ogr/ogr_eeda.py | 269 ++++++++-------- autotest/ogr/ogr_esrijson.py | 4 +- autotest/ogr/ogr_flatgeobuf.py | 54 ++++ autotest/ogr/ogr_libkml.py | 10 +- autotest/ogr/ogr_plscenes.py | 4 +- autotest/ogr/ogr_sql_rfc28.py | 23 ++ autotest/ogr/ogr_wfs.py | 2 +- autotest/utilities/test_gdalbuildvrt_lib.py | 93 ++++++ gdal/NEWS | 2 +- gdal/alg/gdal_tps.cpp | 104 +++---- gdal/apps/gdalbuildvrt_lib.cpp | 33 +- gdal/doc/source/drivers/vector/gml.rst | 26 +- gdal/frmts/aaigrid/aaigriddataset.cpp | 6 +- gdal/frmts/ecw/ecwdataset.cpp | 2 +- gdal/frmts/grib/degrib/degrib/degrib1.cpp | 14 +- gdal/frmts/grib/gribdataset.cpp | 103 ++++++- gdal/frmts/gtiff/gt_overview.cpp | 2 + gdal/frmts/gtiff/libtiff/tif_fax3.c | 2 + gdal/frmts/gtiff/libtiff/tif_fax3.h | 25 ++ gdal/frmts/hdf4/hdf4multidim.cpp | 1 + gdal/frmts/jp2lura/jp2luradataset.cpp | 2 +- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +- gdal/frmts/openjpeg/openjpegdataset.cpp | 46 +-- gdal/frmts/pcraster/pcrasterdataset.cpp | 5 +- gdal/frmts/pcraster/pcrasterdataset.h | 2 +- gdal/frmts/vrt/vrtdataset.cpp | 46 ++- gdal/frmts/vrt/vrtdataset.h | 2 + gdal/ogr/ogrgeometry.cpp | 3 + gdal/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp | 27 +- gdal/ogr/ogrsf_frmts/flatgeobuf/header_generated.h | 194 +++++++++++- .../ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp | 31 +- gdal/ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp | 4 +- gdal/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp | 17 +- gdal/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/gml/resolvexlinks.cpp | 3 +- gdal/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp | 2 +- gdal/ogr/ogrsf_frmts/nas/ogrnasdatasource.cpp | 1 + gdal/ogr/ogrsf_frmts/oci/ogrocisession.cpp | 2 +- gdal/ogr/ogrsf_frmts/ods/ogrodsdatasource.cpp | 2 + gdal/ogr/ogrsf_frmts/pgeo/ogrpgeodriver.cpp | 2 +- gdal/ogr/ogrsf_frmts/segy/ogrsegydriver.cpp | 1 - gdal/ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp | 11 +- gdal/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp | 16 +- gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp | 2 + gdal/ogr/swq.cpp | 5 +- gdal/ogr/swq_parser.cpp | 340 +++++++++++---------- gdal/ogr/swq_parser.y | 20 +- gdal/port/cpl_json.cpp | 11 +- gdal/port/cpl_path.cpp | 4 +- gdal/port/cpl_vsil_cache.cpp | 4 +- gdal/port/cpl_vsil_curl_streaming.cpp | 32 +- gdal/port/cpl_vsil_s3.cpp | 4 +- gdal/swig/python/scripts/gdal2tiles.py | 22 +- gdal/swig/python/scripts/gdalcompare.py | 2 +- 63 files changed, 1316 insertions(+), 630 deletions(-) delete mode 100755 autotest/alg/tps.py create mode 100644 autotest/gdrivers/data/grib/subgrids.grib2 create mode 100644 autotest/gdrivers/data/jpeg2000/tile_size_16.jp2 git reset --hard HEAD HEAD is now at d0541eaf0c CSV: do not try to read .csvt if CSV filename has no extension (fixes #3006) git log --pretty=format:%H -n 1 > E:\builds\release-1900\doc\gdal_revision.txt type E:\builds\release-1900\doc\gdal_revision.txt d0541eaf0cd48f01139e10379fd1af9019c90559 cd E:\builds