found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1916-x64\bin;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)\Windows Kits\10\bin\10.0.19041.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:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;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 git config --global core.autocrlf false if not exist src\mapserver-vc15x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc15x64 cd src\mapserver-vc15x64 git reset --hard HEAD HEAD is now at 4b7ad75ed Merge pull request #6901 from rouault/remove_gdal_2_support git fetch git checkout main Your branch is behind 'origin/main' by 9 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 4b7ad75ed..257c646a7 Fast-forward mapfile.c | 15 +- mapogcapi.cpp | 383 +++++++++++++++++---- msautotest/api/expected/conformance.json | 2 +- msautotest/api/expected/ogcapi_api.json | 2 +- msautotest/api/expected/ogcapi_collections.json | 2 +- .../expected/ogcapi_collections_mn_counties.html | 75 ++++ .../expected/ogcapi_collections_mn_counties.json | 2 +- ...collections_mn_counties_items_bad_bbox_crs.json | 1 + ...capi_collections_mn_counties_items_bad_crs.json | 1 + ...api_collections_mn_counties_items_bbox_crs.json | 1 + ...tions_mn_counties_items_bbox_crs_epsg_4326.json | 1 + ...llections_mn_counties_items_empty_bbox_crs.json | 1 + ...pi_collections_mn_counties_items_empty_crs.json | 1 + ...pi_collections_mn_counties_items_epsg_4326.json | 1 + ..._mn_counties_items_limit_bbox_empty_result.json | 2 +- ..._collections_mn_counties_items_storage_crs.json | 4 + ...ns_mn_counties_items_unknown_parameter.json.txt | 2 +- .../ogcapi_error_repeated_query_parameter.json | 1 + msautotest/api/ogcapi.map | 13 +- .../renderers/expected/style_size_binding.png | Bin 0 -> 2191 bytes .../renderers/expected/style_size_expression.png | Bin 0 -> 2926 bytes msautotest/renderers/expected/style_size_fixed.png | Bin 0 -> 3396 bytes msautotest/renderers/style-size.map | 63 ++++ .../templates/html-bootstrap4/collection.html | 17 + share/ogcapi/templates/html-plain/collection.html | 14 + 25 files changed, 522 insertions(+), 82 deletions(-) create mode 100644 msautotest/api/expected/ogcapi_collections_mn_counties.html create mode 100644 msautotest/api/expected/ogcapi_collections_mn_counties_items_bad_bbox_crs.json create mode 100644 msautotest/api/expected/ogcapi_collections_mn_counties_items_bad_crs.json create mode 100644 msautotest/api/expected/ogcapi_collections_mn_counties_items_bbox_crs.json create mode 100644 msautotest/api/expected/ogcapi_collections_mn_counties_items_bbox_crs_epsg_4326.json create mode 100644 msautotest/api/expected/ogcapi_collections_mn_counties_items_empty_bbox_crs.json create mode 100644 msautotest/api/expected/ogcapi_collections_mn_counties_items_empty_crs.json create mode 100644 msautotest/api/expected/ogcapi_collections_mn_counties_items_epsg_4326.json create mode 100644 msautotest/api/expected/ogcapi_collections_mn_counties_items_storage_crs.json create mode 100644 msautotest/api/expected/ogcapi_error_repeated_query_parameter.json create mode 100644 msautotest/renderers/expected/style_size_binding.png create mode 100644 msautotest/renderers/expected/style_size_expression.png create mode 100644 msautotest/renderers/expected/style_size_fixed.png create mode 100644 msautotest/renderers/style-size.map git reset --hard HEAD HEAD is now at 257c646a7 Merge pull request #6895 from geographika/style-size-expressions git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\ms_revision.txt type E:\buildsystem\release-1916-x64\doc\ms_revision.txt 257c646a77eafa1f55c7d42448e60714cb211fa5 cd E:\buildsystem git config --global core.autocrlf false if not exist src\gdal-vc15x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc15x64 cd src\gdal-vc15x64 git reset --hard HEAD HEAD is now at 8430958062 Merge pull request #7931 from dbaston/linux-parallel-ctest git fetch git checkout master Your branch is behind 'origin/master' by 28 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 8430958062..818e536b10 Fast-forward apps/CMakeLists.txt | 1 + apps/gdalwarp_lib.cpp | 161 +++++- apps/nearblack_bin.cpp | 4 +- apps/nearblack_lib.cpp | 245 ++++---- apps/nearblack_lib.h | 83 +++ apps/nearblack_lib_floodfill.cpp | 640 +++++++++++++++++++++ autotest/alg/polygonize.py | 49 +- autotest/gcore/tiff_read.py | 15 + autotest/gcore/vsiaz.py | 135 ++++- autotest/gdrivers/esric.py | 2 +- autotest/gdrivers/gpkg.py | 371 ++---------- autotest/ogr/ogr_avc.py | 3 +- autotest/ogr/ogr_csv.py | 54 +- autotest/ogr/ogr_dgn.py | 16 +- autotest/ogr/ogr_geoconcept.py | 15 +- autotest/ogr/ogr_gmt.py | 7 +- autotest/ogr/ogr_gpkg.py | 144 ++++- autotest/ogr/ogr_gpx.py | 42 +- autotest/ogr/ogr_hana.py | 23 +- autotest/ogr/ogr_index_test.py | 20 +- autotest/ogr/ogr_join_test.py | 120 ++-- autotest/ogr/ogr_mem.py | 67 +-- autotest/ogr/ogr_mitab.py | 47 +- autotest/ogr/ogr_mssqlspatial.py | 66 ++- autotest/ogr/ogr_mvt.py | 62 +- autotest/ogr/ogr_mysql.py | 89 ++- autotest/ogr/ogr_pg.py | 90 ++- autotest/ogr/ogr_shape.py | 136 ++--- autotest/ogr/ogr_sql_rfc28.py | 393 ++++++------- autotest/ogr/ogr_sql_sqlite.py | 33 +- autotest/ogr/ogr_sqlite.py | 157 +++-- autotest/ogr/ogr_vrt.py | 18 +- autotest/pymod/ogrtest.py | 39 ++ autotest/pyscripts/test_gdal_polygonize.py | 82 ++- autotest/utilities/test_gdalwarp.py | 32 -- autotest/utilities/test_gdalwarp_lib.py | 7 +- autotest/utilities/test_nearblack_lib.py | 199 ++++++- doc/source/drivers/raster/esric.rst | 35 +- doc/source/drivers/vector/gpkg.rst | 3 +- doc/source/programs/gdal_polygonize.rst | 13 +- doc/source/programs/gdalwarp.rst | 4 +- doc/source/programs/nearblack.rst | 33 +- doc/source/user/virtual_file_systems.rst | 22 + frmts/esric/esric_dataset.cpp | 36 +- frmts/gtiff/gtiffdataset_read.cpp | 31 +- ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 2 + ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 5 + ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp | 10 +- ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 201 +++++-- ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp | 18 +- ogr/ogrsf_frmts/openfilegdb/filegdbtable_write.cpp | 6 + port/cpl_azure.cpp | 117 ++-- port/cpl_azure.h | 10 +- swig/include/python/gdal_python.i | 5 + .../gdal-utils/osgeo_utils/gdal_polygonize.py | 41 +- .../osgeo_utils/samples/validate_gpkg.py | 36 +- 56 files changed, 2712 insertions(+), 1583 deletions(-) create mode 100644 apps/nearblack_lib.h create mode 100644 apps/nearblack_lib_floodfill.cpp git reset --hard HEAD HEAD is now at 818e536b10 Merge pull request #7922 from rouault/fix_7921 git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\gdal_revision.txt type E:\buildsystem\release-1916-x64\doc\gdal_revision.txt 818e536b1053a0e029a2dacede7c38a162410a8a cd E:\buildsystem set PATH=E:\buildsystem\release-1916-x64\bin;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)\Windows Kits\10\bin\10.0.19041.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:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\Git\cmd;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\7-Zip;C:\php;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;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 git config --global core.autocrlf false if not exist src\mapcache-vc15x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc15x64 cd src\mapcache-vc15x64 git reset --hard HEAD HEAD is now at 0cb6c00 change Migration Guide to markdown (#305) git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git log --pretty=format:%H -n 1 > E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt 0cb6c00d19708cab7fbb1719eac62a738aa5405d cd E:\buildsystem