SET PATH=E:\builds\release-1911-x64\bin;E:\builds\release-1911-x64\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64;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\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\\x64;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\x64\;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\x64;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\\MSBuild\15.0\bin;C:\WINDOWS\Microsoft.NET\Framework64\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\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;;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-x64\bin\curl\curl.exe E:\builds\release-1911-x64\bin\curl\curl.exe -o E:\builds\release-1911-x64\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc15x64\mapserver-7-6 git reset --hard HEAD HEAD is now at dfdda8a18 update for 7.6.2 release git fetch git checkout branch-7-6 Your branch is behind 'origin/branch-7-6' by 55 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin branch-7-6 Updating 59821b7c4..292ea2e2b Fast-forward .travis.yml | 24 +--- CMakeLists.txt | 2 +- CONTRIBUTING.md | 25 ++-- HISTORY.TXT | 24 +++- ci/travis/after_success.sh | 6 +- ci/travis/before_install.sh | 45 +++--- ci/travis/script.sh | 14 +- cmake/FindProj.cmake | 2 +- fontcache.c | 16 ++- mapcontext.c | 4 +- mapcpl.c | 2 + mapdraw.c | 22 ++- mapfile.c | 80 ++++++----- mapgml.c | 26 ++-- maphttp.c | 4 +- maplabel.c | 2 +- maplegend.c | 6 + mapobject.c | 10 +- mapogcsld.c | 4 +- mapogcsos.c | 6 + mapogr.cpp | 157 ++++++++++++--------- mapows.c | 18 +-- mappostgis.c | 58 ++++++-- mapprimitive.c | 2 +- mapproject.c | 2 +- mapquery.c | 2 +- mapraster.c | 10 +- mapserv.c | 12 ++ mapserv.h | 1 + mapserver.h | 2 + mapservutil.c | 65 ++++++--- mapshape.c | 10 +- mapsmoothing.c | 6 +- mapstring.c | 16 ++- maptemplate.c | 11 +- mapwcs.c | 4 +- mapwcs20.c | 1 + mapwfs.c | 17 ++- mapwmslayer.c | 22 +-- mapxbase.c | 9 ++ msautotest/create_postgis_test_data.sh | 8 ++ msautotest/gdal/expected/wmsclient_3543.png | Bin 24643 -> 24821 bytes msautotest/misc/data/union/layer1.dbf | Bin 0 -> 370 bytes msautotest/misc/data/union/layer1.shp | Bin 0 -> 3060 bytes msautotest/misc/data/union/layer1.shx | Bin 0 -> 148 bytes msautotest/misc/data/union/layer2.dbf | Bin 0 -> 118 bytes msautotest/misc/data/union/layer2.shp | Bin 0 -> 1620 bytes msautotest/misc/data/union/layer2.shx | Bin 0 -> 132 bytes msautotest/misc/expected/union.png | Bin 0 -> 14966 bytes msautotest/misc/union.map | 57 ++++++++ .../renderers/expected/font-fail-missing-glyph.png | Bin 0 -> 2307 bytes .../renderers/expected/legend_sizeunits_meters.png | Bin 12659 -> 13145 bytes .../renderers/expected/legend_sizeunits_meters.svg | 12 +- msautotest/renderers/font-fail.map | 18 +++ msautotest/wxs/data/test_6325.gpkg | Bin 0 -> 98304 bytes .../wxs/expected/wfs_ogr_gpkg_issue_6325.xml | 36 +++++ msautotest/wxs/expected/wfs_postgis_issue_6181.xml | 35 +++++ .../wfs_postgis_issue_6181_startindex_1.xml | 35 +++++ msautotest/wxs/expected/wms_filter_color_bind.png | Bin 0 -> 1922 bytes msautotest/wxs/wfs_ogr_gpkg.map | 21 +++ msautotest/wxs/wfs_postgis_paging.map | 62 ++++++++ msautotest/wxs/wms_filter_color_bind.map | 106 ++++++++++++++ scripts/vagrant/packages.sh | 2 +- textlayout.c | 13 +- 64 files changed, 879 insertions(+), 275 deletions(-) create mode 100644 msautotest/misc/data/union/layer1.dbf create mode 100644 msautotest/misc/data/union/layer1.shp create mode 100644 msautotest/misc/data/union/layer1.shx create mode 100644 msautotest/misc/data/union/layer2.dbf create mode 100644 msautotest/misc/data/union/layer2.shp create mode 100644 msautotest/misc/data/union/layer2.shx create mode 100644 msautotest/misc/expected/union.png create mode 100644 msautotest/misc/union.map create mode 100644 msautotest/renderers/expected/font-fail-missing-glyph.png create mode 100644 msautotest/wxs/data/test_6325.gpkg create mode 100644 msautotest/wxs/expected/wfs_ogr_gpkg_issue_6325.xml create mode 100644 msautotest/wxs/expected/wfs_postgis_issue_6181.xml create mode 100644 msautotest/wxs/expected/wfs_postgis_issue_6181_startindex_1.xml create mode 100644 msautotest/wxs/expected/wms_filter_color_bind.png create mode 100644 msautotest/wxs/wfs_postgis_paging.map create mode 100644 msautotest/wxs/wms_filter_color_bind.map git reset --hard HEAD HEAD is now at 292ea2e2b update for 7.6.4 release git log --pretty=format:%H -n 1 > E:\builds\release-1911-x64\doc\ms_revision.txt type E:\builds\release-1911-x64\doc\ms_revision.txt 292ea2e2b179b1eb4b99ac0de8457bde4f59a326 cd E:\builds cd ..\sdk\vc15x64\gdal-3.2\gdal git reset --hard HEAD HEAD is now at 258d73a17b Prepare for GDAL 3.2.1 git fetch git checkout release/3.2 Your branch is behind 'origin/release/3.2' by 44 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin release/3.2 Updating fe4d9aa157..e6e6309ffa Fast-forward autotest/gcore/tiff_read.py | 10 +- autotest/gcore/tiff_write.py | 16 ++ autotest/gdrivers/bag.py | 18 ++ .../data/grib/one_value_and_nodata_points.grb2 | Bin 0 -> 253 bytes autotest/gdrivers/grib.py | 121 ++++++++++-- autotest/gdrivers/netcdf.py | 4 +- autotest/gdrivers/netcdf_multidim.py | 56 +++++- autotest/ogr/data/mdb/null_memo.mdb | Bin 0 -> 286720 bytes autotest/ogr/data/shp/pointnan.dbf | Bin 0 -> 116 bytes autotest/ogr/data/shp/pointnan.shp | Bin 0 -> 156 bytes autotest/ogr/data/shp/pointnan.shx | Bin 0 -> 116 bytes .../data/xlsx/cells_with_inline_formatting.xlsx | Bin 0 -> 10419 bytes autotest/ogr/ogr_flatgeobuf.py | 31 +++ autotest/ogr/ogr_geom.py | 38 ++-- autotest/ogr/ogr_geos.py | 3 - autotest/ogr/ogr_gpkg.py | 22 ++- autotest/ogr/ogr_odbc.py | 50 ++++- autotest/ogr/ogr_shape.py | 46 +++-- autotest/ogr/ogr_xlsx.py | 18 +- gdal/GDALmake.opt.in | 2 +- gdal/NEWS | 179 +++++++++++++++--- gdal/VERSION | 2 +- gdal/alg/gdalwarper.cpp | 3 +- gdal/apps/gdalbuildvrt_lib.cpp | 2 + gdal/frmts/ecw/gdal_ecw.h | 10 +- gdal/frmts/grib/gribcreatecopy.cpp | 14 +- gdal/frmts/gtiff/GNUmakefile | 5 + gdal/frmts/gtiff/generate_quant_table_md5sum.cpp | 169 +++++++++++++++++ gdal/frmts/gtiff/geotiff.cpp | 71 ++++++- gdal/frmts/gtiff/quant_table_md5sum.h | 210 +++++++++++++++++++++ gdal/frmts/hdf5/bagdataset.cpp | 4 +- gdal/frmts/jaxapalsar/jaxapalsardataset.cpp | 2 + gdal/frmts/jp2kak/jp2kakdataset.cpp | 10 +- gdal/frmts/jpipkak/jpipkakdataset.cpp | 2 +- gdal/frmts/netcdf/netcdfdataset.cpp | 22 ++- gdal/frmts/netcdf/netcdfmultidim.cpp | 12 +- gdal/frmts/northwood/GNUmakefile | 2 + gdal/frmts/northwood/grcdataset.cpp | 19 +- gdal/frmts/northwood/grddataset.cpp | 137 +++++++------- gdal/frmts/northwood/northwood.cpp | 4 +- gdal/frmts/northwood/northwood.h | 6 +- gdal/frmts/postgisraster/postgisraster.h | 19 +- gdal/frmts/rmf/rmfdataset.cpp | 24 +-- gdal/frmts/rmf/rmfdem.cpp | 8 +- gdal/frmts/rmf/rmflzw.cpp | 25 ++- gdal/frmts/tsx/tsxdataset.cpp | 2 + gdal/gcore/gdal_version.h.in | 6 +- gdal/gcore/gdalpython.cpp | 80 +++++--- gdal/ogr/ogr_core.h | 1 + gdal/ogr/ogr_geometry.h | 11 +- gdal/ogr/ogrgeometry.cpp | 18 +- gdal/ogr/ogrpoint.cpp | 18 +- gdal/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h | 1 - .../amigocloud/ogramigoclouddatasource.cpp | 110 ++--------- .../ogrsf_frmts/amigocloud/ogramigocloudlayer.cpp | 27 +-- .../amigocloud/ogramigocloudtablelayer.cpp | 106 +++++------ gdal/ogr/ogrsf_frmts/cad/libopencad/cadheader.cpp | 11 +- gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.cpp | 86 +++++---- gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/io.h | 22 ++- gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp | 99 +++++----- gdal/ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h | 27 +-- .../flatgeobuf/ogrflatgeobufdataset.cpp | 16 +- .../ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp | 6 +- gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 5 +- .../ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 45 +++-- gdal/ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp | 12 +- .../ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 12 +- gdal/ogr/ogrsf_frmts/sxf/ogrsxflayer.cpp | 7 +- gdal/ogr/ogrsf_frmts/xlsx/ogr_xlsx.h | 1 + gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdatasource.cpp | 16 +- gdal/port/cpl_odbc.cpp | 17 +- gdal/swig/include/gdal.i | 3 +- gdal/swig/include/gdalconst.i | 1 + gdal/swig/include/ogr.i | 6 +- gdal/swig/include/perl/gdal_perl.i | 4 +- gdal/swig/include/perl/ogr_perl.i | 2 +- gdal/swig/include/python/typemaps_python.i | 4 +- gdal/swig/python/README.rst | 142 +++++++------- gdal/swig/python/extensions/gdal_wrap.cpp | 8 +- gdal/swig/python/extensions/gdalconst_wrap.c | 1 + gdal/swig/python/extensions/ogr_wrap.cpp | 6 +- gdal/swig/python/osgeo/gdalconst.py | 1 + gdal/swig/python/setup.py | 4 +- gdal/third_party/LercLib/Lerc.cpp | 10 +- gdal/third_party/LercLib/Lerc2.h | 8 +- 85 files changed, 1635 insertions(+), 723 deletions(-) create mode 100644 autotest/gdrivers/data/grib/one_value_and_nodata_points.grb2 create mode 100644 autotest/ogr/data/mdb/null_memo.mdb create mode 100644 autotest/ogr/data/shp/pointnan.dbf create mode 100644 autotest/ogr/data/shp/pointnan.shp create mode 100644 autotest/ogr/data/shp/pointnan.shx create mode 100644 autotest/ogr/data/xlsx/cells_with_inline_formatting.xlsx create mode 100644 gdal/frmts/gtiff/generate_quant_table_md5sum.cpp create mode 100644 gdal/frmts/gtiff/quant_table_md5sum.h git reset --hard HEAD HEAD is now at e6e6309ffa Prepare for v3.2.3RC1 git log --pretty=format:%H -n 1 > E:\builds\release-1911-x64\doc\gdal_revision.txt type E:\builds\release-1911-x64\doc\gdal_revision.txt e6e6309ffaaddeef737579f944ea68635cbf32f8 cd E:\builds