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:\ActiveTcl\bin;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:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;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 071e1a31a Merge pull request #7001 from rouault/ci_concurrency_permissions 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 071e1a31a..70d49c5b6 Fast-forward .github/dependabot.yml | 6 + .github/workflows/backport.yml | 4 +- .github/workflows/codeql.yml | 112 +++++++++++++++++ msautotest/etc/mapserv.conf | 2 +- .../expected/ows_context_with_layer_list_caps.xml | 136 +++++++++++++++++++++ msautotest/wxs/ows_context.map | 1 + msautotest/wxs/ows_context_with_layer_list.xml | 23 ++++ src/interpolation.c | 11 +- src/kerneldensity.c | 4 +- src/mapcairo.c | 12 +- src/mapcontext.c | 27 ++-- src/mapcopy.c | 4 +- src/mapdrawgdal.c | 9 +- src/mapimageio.c | 10 +- src/maplegend.c | 4 +- src/mappostgis.cpp | 4 +- src/maprasterquery.c | 7 +- src/maputfgrid.cpp | 2 +- src/maputil.c | 10 +- 19 files changed, 338 insertions(+), 50 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/codeql.yml create mode 100644 msautotest/wxs/expected/ows_context_with_layer_list_caps.xml create mode 100644 msautotest/wxs/ows_context_with_layer_list.xml git reset --hard HEAD HEAD is now at 70d49c5b6 Merge pull request #7004 from rouault/backport_permissions 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 70d49c5b6dee9f14b43a4b9eb5525d80b52c827e 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 15751e3b42 fuzzers/build.sh: fix curl build git fetch git checkout master Your branch is behind 'origin/master' by 154 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 15751e3b42..4daa319886 Fast-forward .github/workflows/cmake_builds.yml | 2 +- .github/workflows/codeql.yml | 149 +++++++ CITATION | 4 +- CITATION.cff | 4 +- README.md | 1 + alg/gdal_crs.cpp | 3 +- alg/gdal_rpc.cpp | 2 +- alg/gdal_simplesurf.cpp | 13 +- alg/gdaldither.cpp | 5 +- alg/gdallinearsystem.h | 6 +- alg/gdalmediancut.cpp | 7 +- alg/gdalpansharpen.cpp | 5 +- alg/gdalproximity.cpp | 3 +- alg/gdalwarpoperation.cpp | 5 +- apps/commonutils.cpp | 134 +----- apps/gdal_translate_lib.cpp | 7 +- apps/gdalbuildvrt_lib.cpp | 11 +- apps/gdaldem_lib.cpp | 2 +- apps/gdalenhance.cpp | 4 +- apps/gdalwarp_lib.cpp | 11 +- apps/nearblack_lib.cpp | 2 +- apps/nearblack_lib_floodfill.cpp | 11 +- autotest/cpp/test_gdal.cpp | 48 ++- autotest/cpp/testblockcache.cpp | 3 +- autotest/cpp/testvirtualmem.cpp | 4 +- autotest/gcore/numpy_rw_multidim.py | 10 +- autotest/gcore/rasterio.py | 105 +++++ autotest/gcore/test_driver_metadata.py | 3 +- autotest/gcore/tiff_write.py | 9 +- .../MD_test_s102_v2.2_with_QualityOfSurvey.xml | 1 + autotest/gdrivers/data/s102/generate_test.py | 55 ++- .../s102/test_s102_v2.2_with_QualityOfSurvey.h5 | Bin 0 -> 17096 bytes autotest/gdrivers/data/s104/MD_test_s104_v1.1.xml | 1 + autotest/gdrivers/data/s104/generate_test.py | 139 ++++++ autotest/gdrivers/data/s104/test_s104_v1.1.h5 | Bin 0 -> 14472 bytes autotest/gdrivers/data/s111/MD_test_s111_v1.2.xml | 1 + autotest/gdrivers/data/s111/generate_test.py | 148 +++++++ autotest/gdrivers/data/s111/test_s111_v1.2.h5 | Bin 0 -> 14480 bytes autotest/gdrivers/gdalhttp.py | 4 +- autotest/gdrivers/s102.py | 94 ++++ autotest/gdrivers/s104.py | 191 +++++++++ autotest/gdrivers/s111.py | 173 ++++++++ autotest/ogr/ogr_csv.py | 4 +- autotest/ogr/ogr_dgn.py | 22 +- autotest/ogr/ogr_mem.py | 48 +++ doc/source/drivers/raster/index.rst | 2 + doc/source/drivers/raster/s102.rst | 14 + doc/source/drivers/raster/s104.rst | 58 +++ doc/source/drivers/raster/s111.rst | 62 +++ doc/source/programs/gdal_grid.rst | 12 +- doc/source/sponsors/index.rst | 7 + doc/source/tutorials/wktproblems.rst | 6 +- frmts/aaigrid/aaigriddataset.cpp | 6 +- frmts/aigrid/aigopen.c | 3 +- frmts/aigrid/gridlib.c | 6 +- frmts/blx/blx.c | 8 +- frmts/bmp/bmpdataset.cpp | 19 +- frmts/bsb/bsb_read.c | 2 +- frmts/ceos2/sar_ceosdataset.cpp | 12 +- frmts/cosar/cosar_dataset.cpp | 4 +- frmts/ctg/ctgdataset.cpp | 33 +- frmts/daas/daasdataset.cpp | 2 +- frmts/drivers.ini | 2 + frmts/dted/dted_ptstream.c | 4 +- frmts/eeda/eedaidataset.cpp | 2 +- frmts/envisat/envisatdataset.cpp | 7 +- frmts/ers/ersdataset.cpp | 12 +- frmts/exr/exrdataset.cpp | 9 +- frmts/fit/fitdataset.cpp | 3 +- frmts/gdalallregister.cpp | 2 + frmts/gif/gifdataset.cpp | 2 +- frmts/grib/degrib/g2clib/aecunpack.c | 4 +- frmts/grib/degrib/g2clib/misspack.c | 2 +- frmts/grib/degrib/g2clib/pngunpack.c | 2 +- frmts/grib/degrib/g2clib/simpack.c | 6 +- frmts/grib/gribcreatecopy.cpp | 3 +- frmts/grib/gribdataset.cpp | 5 +- frmts/gsg/gsbgdataset.cpp | 5 +- frmts/gtiff/fetchbufferdirectio.h | 3 +- frmts/gtiff/gtiffdataset.cpp | 6 +- frmts/gtiff/gtiffdataset_read.cpp | 16 +- frmts/gtiff/gtiffdataset_write.cpp | 15 +- frmts/gtiff/gtiffrasterband_read.cpp | 2 +- frmts/gtiff/libgeotiff/geo_simpletags.c | 10 +- frmts/hdf5/CMakeLists.txt | 3 + frmts/hdf5/bagdataset.cpp | 142 ++----- frmts/hdf5/hdf5dataset.cpp | 30 ++ frmts/hdf5/hdf5dataset.h | 4 +- frmts/hdf5/hdf5drivercore.cpp | 145 ++++++- frmts/hdf5/hdf5drivercore.h | 12 + frmts/hdf5/hdf5imagedataset.cpp | 24 +- frmts/hdf5/hdf5multidim.cpp | 257 +++++++++-- frmts/hdf5/rat.cpp | 110 +++++ frmts/hdf5/rat.h | 41 ++ frmts/hdf5/s100.cpp | 352 +++++++++++++-- frmts/hdf5/s100.h | 38 ++ frmts/hdf5/s102dataset.cpp | 446 ++++++++++--------- frmts/hdf5/s104dataset.cpp | 436 +++++++++++++++++++ frmts/hdf5/s111dataset.cpp | 473 +++++++++++++++++++++ frmts/hf2/hf2dataset.cpp | 4 +- frmts/hfa/hfaband.cpp | 8 +- frmts/idrisi/IdrisiDataset.cpp | 4 +- frmts/ilwis/ilwisdataset.cpp | 11 +- frmts/iris/irisdataset.cpp | 5 +- frmts/jpeg/jpgdataset.cpp | 18 +- frmts/jpeg/libjpeg/jdmainct.c | 2 +- frmts/kmlsuperoverlay/kmlsuperoverlaydataset.cpp | 6 +- frmts/l1b/l1bdataset.cpp | 8 +- frmts/mem/memdataset.cpp | 6 +- frmts/mrf/BitMask2D.h | 3 +- frmts/mrf/JPEG_band.cpp | 4 +- frmts/mrf/Tif_band.cpp | 3 +- frmts/mrf/marfa_dataset.cpp | 15 +- frmts/mrf/mrf_band.cpp | 2 +- frmts/msgn/msgndataset.cpp | 14 +- frmts/netcdf/netcdfdataset.cpp | 18 +- frmts/nitf/nitfaridpcm.cpp | 4 +- frmts/nitf/nitfdataset.cpp | 17 +- frmts/nitf/nitfimage.c | 11 +- frmts/nitf/nitfrasterband.cpp | 4 +- frmts/nitf/nitfwritejpeg.cpp | 5 +- frmts/nitf/rpftocfile.cpp | 3 +- frmts/northwood/northwood.cpp | 11 +- frmts/pcidsk/sdk/channel/cexternalchannel.cpp | 20 +- .../sdk/channel/cpixelinterleavedchannel.cpp | 4 +- frmts/pcidsk/sdk/channel/ctiledchannel.cpp | 10 +- frmts/pcidsk/sdk/core/cpcidskfile.cpp | 4 +- frmts/pcidsk/sdk/core/pcidskcreate.cpp | 2 +- frmts/pdf/pdfcreatecopy.cpp | 6 +- frmts/pdf/pdfdataset.cpp | 60 +-- frmts/pds/isis3dataset.cpp | 12 +- frmts/pds/pds4dataset.cpp | 7 +- frmts/plmosaic/plmosaicdataset.cpp | 4 +- frmts/png/pngdataset.cpp | 26 +- frmts/postgisraster/postgisrasterrasterband.cpp | 3 +- frmts/r/rdataset.cpp | 8 +- frmts/rasterlite/rasterlitecreatecopy.cpp | 4 +- frmts/rasterlite/rasterlitedataset.cpp | 24 +- frmts/rasterlite/rasterliteoverviews.cpp | 9 +- frmts/raw/btdataset.cpp | 15 +- frmts/raw/iscedataset.cpp | 2 +- frmts/raw/lcpdataset.cpp | 9 +- frmts/raw/mffdataset.cpp | 2 +- frmts/raw/ntv2dataset.cpp | 2 +- frmts/raw/pauxdataset.cpp | 3 +- frmts/raw/roipacdataset.cpp | 2 +- frmts/rik/rikdataset.cpp | 6 +- frmts/rmf/rmfdataset.cpp | 44 +- frmts/rs2/rs2dataset.cpp | 12 +- frmts/safe/safedataset.cpp | 20 +- frmts/sdts/sdtsrasterreader.cpp | 3 +- frmts/srtmhgt/srtmhgtdataset.cpp | 11 +- frmts/stacta/stactadataset.cpp | 20 +- frmts/tga/tgadataset.cpp | 18 +- frmts/tsx/tsxdataset.cpp | 4 +- frmts/vrt/vrtderivedrasterband.cpp | 42 +- frmts/vrt/vrtfilters.cpp | 3 +- frmts/vrt/vrtpansharpened.cpp | 25 +- frmts/vrt/vrtsourcedrasterband.cpp | 8 +- frmts/vrt/vrtsources.cpp | 4 +- frmts/webp/webpdataset.cpp | 18 +- frmts/wms/gdalwmsrasterband.cpp | 3 +- frmts/xyz/xyzdataset.cpp | 6 +- frmts/zlib/contrib/infback9/minified_zutil.c | 2 +- gcore/gdal.h | 10 + gcore/gdal_frmts.h | 2 + gcore/gdalarraybandblockcache.cpp | 9 +- gcore/gdaldataset.cpp | 73 +++- gcore/gdaldriver.cpp | 164 ++++++- gcore/gdalexif.cpp | 4 +- gcore/gdaljp2structure.cpp | 2 +- gcore/gdalmultidim.cpp | 6 +- gcore/gdalnodatamaskband.cpp | 7 +- gcore/gdalnodatavaluesmaskband.cpp | 4 +- gcore/gdalrasterband.cpp | 16 +- gcore/gdalvirtualmem.cpp | 26 +- gcore/overview.cpp | 2 +- gcore/rasterio.cpp | 92 ++-- gcore/rawdataset.cpp | 26 +- ogr/ogr_geocoding.cpp | 21 +- ogr/ogr_wkb.cpp | 2 +- ogr/ogrlinestring.cpp | 3 +- ogr/ogrsf_frmts/avc/avc_bin.cpp | 12 +- ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp | 5 +- ogr/ogrsf_frmts/dgn/ogrdgndriver.cpp | 28 +- ogr/ogrsf_frmts/gml/gmlreader.cpp | 2 + ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp | 2 + ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp | 5 + ogr/ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp | 22 +- ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 5 +- ogr/ogrsf_frmts/ili/ili2reader.cpp | 2 + ogr/ogrsf_frmts/mitab/mitab_indfile.cpp | 8 +- ogr/ogrsf_frmts/nas/nasreader.cpp | 2 + ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp | 2 +- ogr/ogrsf_frmts/ntf/ntf_raster.cpp | 10 +- ogr/ogrsf_frmts/openfilegdb/filegdbindex_write.cpp | 4 +- .../openfilegdb/filegdbtable_freelist.cpp | 12 +- ogr/ogrsf_frmts/selafin/io_selafin.cpp | 3 +- ogr/ogrsf_frmts/selafin/ogrselafinlayer.cpp | 15 +- ogr/ogrsf_frmts/tiger/tigeraltname.cpp | 9 +- ogr/ogrsf_frmts/tiger/tigercompletechain.cpp | 63 +-- ogr/ogrsf_frmts/tiger/tigerfilebase.cpp | 13 +- ogr/ogrsf_frmts/tiger/tigerpoint.cpp | 14 +- ogr/ogrsf_frmts/tiger/tigerpolygon.cpp | 28 +- port/cpl_config.h.in | 172 -------- port/cpl_config.h.vc.begin | 2 - port/cpl_config.h.vc.common | 70 --- port/cpl_config.h.vc.end | 1 - port/cpl_config.h.vc.no_dll | 1 - port/cpl_odbc.cpp | 27 +- port/cpl_port.h | 18 + port/cpl_recode_iconv.cpp | 17 +- port/cpl_vsil_curl.cpp | 9 +- port/cpl_vsil_webhdfs.cpp | 3 +- swig/include/Operations.i | 2 +- swig/include/java/gdal_java.i | 2 +- swig/include/ogr.i | 41 ++ swig/include/python/gdal_python.i | 2 +- swig/include/python/ogr_python.i | 84 ++++ 219 files changed, 4812 insertions(+), 1392 deletions(-) create mode 100644 .github/workflows/codeql.yml create mode 100644 autotest/gdrivers/data/s102/MD_test_s102_v2.2_with_QualityOfSurvey.xml create mode 100644 autotest/gdrivers/data/s102/test_s102_v2.2_with_QualityOfSurvey.h5 create mode 100644 autotest/gdrivers/data/s104/MD_test_s104_v1.1.xml create mode 100755 autotest/gdrivers/data/s104/generate_test.py create mode 100644 autotest/gdrivers/data/s104/test_s104_v1.1.h5 create mode 100644 autotest/gdrivers/data/s111/MD_test_s111_v1.2.xml create mode 100755 autotest/gdrivers/data/s111/generate_test.py create mode 100644 autotest/gdrivers/data/s111/test_s111_v1.2.h5 create mode 100755 autotest/gdrivers/s104.py create mode 100755 autotest/gdrivers/s111.py create mode 100644 doc/source/drivers/raster/s104.rst create mode 100644 doc/source/drivers/raster/s111.rst create mode 100644 frmts/hdf5/rat.cpp create mode 100644 frmts/hdf5/rat.h create mode 100644 frmts/hdf5/s104dataset.cpp create mode 100644 frmts/hdf5/s111dataset.cpp delete mode 100644 port/cpl_config.h.in delete mode 100644 port/cpl_config.h.vc.begin delete mode 100644 port/cpl_config.h.vc.common delete mode 100644 port/cpl_config.h.vc.end delete mode 100644 port/cpl_config.h.vc.no_dll git reset --hard HEAD HEAD is now at 4daa319886 Refresh CITATION and CITATION.cff [ci skip] 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 4daa3198862100f27a9180a7400e294c8c01fcdc 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:\ActiveTcl\bin;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:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;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 2ac1a61 LMDB: minimize transaction duration (#323) 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 2ac1a6105da3c60d304a55bb85a1d96c2a943a4b cd E:\buildsystem