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 8f488add2 Merge pull request #7052 from rouault/coverity_fixes git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git reset --hard HEAD HEAD is now at 8f488add2 Merge pull request #7052 from rouault/coverity_fixes 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 8f488add2cf42c121b833d68e89c267076b5e647 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 9f18fd121b GTIFF: fix ambiguous wording in eror message relatet to 64bit data and predictor=2 (#9496) git fetch git checkout master Your branch is behind 'origin/master' by 40 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 9f18fd121b..67c871c7ca Fast-forward .clang-format | 4 +- .git-blame-ignore-revs | 3 +- alg/contour.cpp | 2 + alg/gdal_alg.h | 1 + alg/gdal_alg_priv.h | 9 + alg/gdal_simplesurf.cpp | 5 + alg/gdaldither.cpp | 2 + alg/gdalgeoloc.cpp | 2 + alg/gdalgeoloc.h | 1 + alg/gdalgeoloc_carray_accessor.h | 2 + alg/gdalgeoloc_dataset_accessor.h | 1 + alg/gdallinearsystem.h | 9 + alg/gdalmediancut.cpp | 3 + alg/gdalpansharpen.h | 1 + alg/gdaltransformer.cpp | 44 ++- alg/gdalwarper.h | 2 + alg/gdalwarpkernel.cpp | 1 + alg/gdalwarpkernel_opencl.h | 4 + alg/gdalwarpoperation.cpp | 31 +- alg/marching_squares/contour_generator.h | 2 + alg/marching_squares/level_generator.h | 8 + alg/marching_squares/point.h | 3 + alg/marching_squares/polygon_ring_appender.h | 1 + alg/marching_squares/segment_merger.h | 1 + alg/marching_squares/square.h | 3 + alg/polygonize_polygonizer.h | 1 + alg/thinplatespline.cpp | 1 + apps/commonutils.cpp | 33 +- apps/commonutils.h | 5 +- apps/gdal_contour.cpp | 3 +- apps/gdal_create.cpp | 1 + apps/gdal_footprint_bin.cpp | 1 + apps/gdal_footprint_lib.cpp | 3 +- apps/gdal_grid_bin.cpp | 1 + apps/gdal_grid_lib.cpp | 1 + apps/gdal_rasterize_bin.cpp | 1 + apps/gdal_rasterize_lib.cpp | 30 +- apps/gdal_translate_bin.cpp | 1 + apps/gdal_viewshed.cpp | 1 + apps/gdaladdo.cpp | 2 + apps/gdalbuildvrt_bin.cpp | 1 + apps/gdaldem_bin.cpp | 2 + apps/gdaldem_lib.cpp | 1 + apps/gdalenhance.cpp | 1 + apps/gdalinfo_bin.cpp | 1 + apps/gdalinfo_lib.cpp | 64 ++- apps/gdallocationinfo.cpp | 1 + apps/gdalmanage.cpp | 1 + apps/gdalmdiminfo_bin.cpp | 1 + apps/gdalmdimtranslate_bin.cpp | 1 + apps/gdalsrsinfo.cpp | 1 + apps/gdaltindex_bin.cpp | 1 + apps/gdaltindex_lib.cpp | 4 +- apps/gdaltransform.cpp | 1 + apps/gdalwarp_bin.cpp | 1 + apps/gdalwarp_lib.cpp | 18 +- apps/gnmanalyse.cpp | 1 + apps/gnmmanage.cpp | 1 + apps/nearblack_bin.cpp | 2 + apps/ogr2ogr_bin.cpp | 1 + apps/ogr2ogr_lib.cpp | 222 ++++++----- apps/ogrdissolve.cpp | 2 + apps/ogrinfo_bin.cpp | 1 + apps/ogrinfo_lib.cpp | 54 +-- apps/ogrlineref.cpp | 2 + apps/ogrtindex.cpp | 13 +- apps/sozip.cpp | 23 +- apps/test_ogrsf.cpp | 30 +- autotest/cpp/test_cpl.cpp | 237 ++++++++---- autotest/cpp/test_gdal.cpp | 6 + autotest/cpp/test_gdal_aaigrid.cpp | 2 + autotest/cpp/test_gdal_dted.cpp | 2 + autotest/cpp/test_gdal_gtiff.cpp | 2 + autotest/cpp/test_gdal_pixelfn.cpp | 1 + autotest/cpp/test_marching_squares_contour.cpp | 5 + autotest/cpp/test_marching_squares_polygon.cpp | 3 + autotest/cpp/test_marching_squares_tile.cpp | 3 + autotest/cpp/test_osr_ct.cpp | 1 + autotest/cpp/testblockcache.cpp | 3 + autotest/cpp/testblockcachewrite.cpp | 1 + autotest/cpp/testcopywords.cpp | 1 + autotest/gcore/vsigs.py | 25 +- autotest/gcore/vsioss.py | 7 +- autotest/gcore/vsis3.py | 2 +- autotest/gdrivers/bag.py | 15 +- .../data/jpeg/byte_with_xmp_before_soc.jpg | Bin 0 -> 4105 bytes autotest/gdrivers/s102.py | 15 +- autotest/gdrivers/xmp.py | 1 + autotest/gdrivers/zmap.py | 23 ++ autotest/pyscripts/test_gdalbuildvrtofvrt.py | 100 +++++ autotest/utilities/test_ogr2ogr.py | 20 + doc/source/programs/gdal_rasterize.rst | 6 +- frmts/aaigrid/aaigriddataset.h | 1 + frmts/adrg/srpdataset.cpp | 1 + frmts/aigrid/aigccitt.c | 6 + frmts/aigrid/aigopen.c | 1 + frmts/aigrid/gridlib.c | 1 + frmts/blx/blx.c | 1 + frmts/bsb/bsb_read.c | 1 + frmts/cals/calsdataset.cpp | 1 + frmts/ceos2/ceos.h | 3 + frmts/coasp/coasp_dataset.cpp | 7 + frmts/ctg/ctgdataset.cpp | 2 + frmts/daas/daasdataset.cpp | 5 + frmts/dds/ddsdataset.cpp | 2 + frmts/derived/deriveddataset.cpp | 1 + frmts/dimap/dimapdataset.cpp | 2 + frmts/dted/dted_api.c | 1 + frmts/dted/dteddataset.cpp | 1 + frmts/ecw/ecwcreatecopy.cpp | 3 + frmts/ecw/ecwdataset.cpp | 2 + frmts/ecw/gdal_ecw.h | 5 + frmts/eeda/eedadataset.cpp | 6 + frmts/eeda/eedaidataset.cpp | 3 + frmts/envisat/EnvisatFile.c | 1 + frmts/envisat/timedelta.hpp | 1 + frmts/esric/esric_dataset.cpp | 8 + frmts/exr/exrdataset.cpp | 10 + frmts/fits/fitsdataset.cpp | 3 + frmts/georaster/georaster_priv.h | 9 + frmts/georaster/georaster_rasterband.cpp | 1 + frmts/georaster/oci_wrapper.h | 11 + frmts/grib/gribcreatecopy.cpp | 1 + frmts/grib/gribdataset.h | 4 + frmts/gsg/gs7bgdataset.cpp | 1 + frmts/gsg/gsbgdataset.cpp | 1 + frmts/gtiff/gt_citation.h | 1 + frmts/gtiff/gtiffdataset_read.cpp | 4 +- frmts/gtiff/gtiffdataset_write.cpp | 7 +- frmts/gtiff/gtiffjpegoverviewds.cpp | 2 + frmts/gtiff/gtiffoddbitsband.h | 1 + frmts/gtiff/gtiffrasterband_read.cpp | 2 + frmts/gtiff/gtiffrgbaband.h | 1 + frmts/gtiff/gtiffsplitband.h | 1 + frmts/gtiff/tif_jxl.c | 1 + frmts/hdf4/hdf4imagedataset.cpp | 1 + frmts/hdf4/hdf4multidim.cpp | 10 + frmts/hdf5/bagdataset.cpp | 60 ++- frmts/hdf5/hdf5dataset.h | 1 + frmts/hdf5/hdf5eosparser.cpp | 1 + frmts/hdf5/hdf5eosparser.h | 1 + frmts/hdf5/hdf5imagedataset.cpp | 4 + frmts/hdf5/hdf5multidim.cpp | 1 + frmts/hdf5/s102dataset.cpp | 20 +- frmts/hfa/hfa_p.h | 10 + frmts/hfa/hfadataset.cpp | 2 + frmts/ilwis/ilwisdataset.cpp | 3 + frmts/ilwis/ilwisdataset.h | 8 + frmts/iso8211/iso8211.h | 23 ++ frmts/jp2kak/jp2kakdataset.cpp | 3 + frmts/jp2kak/vsil_target.h | 1 + frmts/jp2lura/jp2luracallbacks.h | 1 + frmts/jp2lura/jp2luradataset.cpp | 3 + frmts/jpeg/jpgdataset.cpp | 17 +- frmts/jpeg/jpgdataset.h | 5 + frmts/jpipkak/jpipkakdataset.h | 21 + frmts/kea/keaband.cpp | 1 + frmts/kea/keaband.h | 1 + frmts/kea/keacopy.cpp | 1 + frmts/kea/keadataset.h | 1 + frmts/kmlsuperoverlay/kmlsuperoverlaydataset.h | 1 + frmts/l1b/l1bdataset.cpp | 9 + frmts/leveller/levellerdataset.cpp | 2 + frmts/map/mapdataset.cpp | 1 + frmts/mbtiles/mbtilesdataset.cpp | 13 + frmts/mem/memdataset.cpp | 1 + frmts/mem/memmultidim.h | 2 + frmts/mrf/BitMask2D.h | 2 + frmts/mrf/LERCV1/Lerc1Image.cpp | 1 + frmts/mrf/LERCV1/Lerc1Image.h | 15 + frmts/mrf/Packer.h | 3 + frmts/mrf/Packer_RLE.h | 2 + frmts/mrf/marfa.h | 36 ++ frmts/mrf/mrf_util.cpp | 1 + frmts/mrf/mrfdrivercore.cpp | 1 + frmts/mrsid/mrsiddataset.cpp | 17 + frmts/msgn/msg_basic_types.h | 1 + frmts/msgn/msg_reader_core.h | 16 + frmts/msgn/msgndataset.cpp | 1 + frmts/netcdf/netcdf_sentinel3_sral_mwr.cpp | 3 + frmts/netcdf/netcdfdataset.cpp | 1 + frmts/netcdf/netcdfdataset.h | 7 + frmts/netcdf/netcdfmultidim.cpp | 14 + frmts/netcdf/netcdfsg.cpp | 1 + frmts/netcdf/netcdfsg.h | 6 + frmts/netcdf/netcdfsgwriterutil.h | 39 ++ frmts/netcdf/netcdfvirtual.h | 17 + frmts/ngsgeoid/ngsgeoiddataset.cpp | 1 + frmts/nitf/nitfdataset.h | 1 + frmts/nitf/nitfdes.c | 1 + frmts/nitf/nitffile.c | 1 + frmts/nitf/nitfimage.c | 1 + frmts/nitf/rpftocdataset.cpp | 1 + frmts/northwood/grddataset.cpp | 1 + frmts/null/nulldataset.cpp | 3 + frmts/ogcapi/gdalogcapidataset.cpp | 14 + frmts/openjpeg/opjdatasetbase.h | 4 + frmts/opjlike/jp2opjlikedataset.cpp | 1 + frmts/opjlike/jp2opjlikedataset.h | 1 + frmts/pcidsk/gdal_edb.cpp | 1 + frmts/pcidsk/pcidskdataset2.h | 2 + frmts/pcraster/pcrasterdataset.h | 1 + frmts/pcraster/pcrasterrasterband.h | 1 + frmts/pdf/gdal_pdf.h | 5 + frmts/pdf/pdfcreatecopy.h | 4 + frmts/pdf/pdfcreatefromcomposition.h | 5 + frmts/pdf/pdfdataset.cpp | 10 + frmts/pdf/pdfobject.cpp | 6 + frmts/pdf/pdfobject.h | 29 ++ frmts/pds/isis3dataset.cpp | 5 + frmts/pds/json_utils.h | 1 + frmts/pds/pds4dataset.h | 23 ++ frmts/pds/pdsdataset.cpp | 1 + frmts/pds/vicardataset.cpp | 5 + frmts/pds/vicardataset.h | 2 + frmts/pds/vicarkeywordhandler.h | 1 + frmts/plmosaic/plmosaicdataset.cpp | 1 + frmts/png/pngdataset.h | 2 + frmts/postgisraster/postgisraster.h | 2 + frmts/postgisraster/postgisrasterdataset.cpp | 2 + .../postgisraster/postgisrastertilerasterband.cpp | 1 + frmts/r/rdataset.h | 1 + frmts/rasterlite/rasterlitedataset.cpp | 1 + frmts/raw/ace2dataset.cpp | 1 + frmts/raw/btdataset.cpp | 2 + frmts/raw/cpgdataset.cpp | 5 + frmts/raw/doq1dataset.cpp | 1 + frmts/raw/doq2dataset.cpp | 1 + frmts/raw/ehdrdataset.h | 1 + frmts/raw/envidataset.h | 1 + frmts/raw/fastdataset.cpp | 2 + frmts/raw/genbindataset.cpp | 1 + frmts/raw/gtxdataset.cpp | 1 + frmts/raw/hkvdataset.cpp | 6 + frmts/raw/iscedataset.cpp | 1 + frmts/raw/loslasdataset.cpp | 1 + frmts/raw/mffdataset.cpp | 4 + frmts/raw/ndfdataset.cpp | 2 + frmts/raw/noaabdataset.cpp | 2 + frmts/raw/nsidcbindataset.cpp | 1 + frmts/raw/pauxdataset.cpp | 3 + frmts/raw/roipacdataset.cpp | 3 + frmts/raw/rrasterdataset.cpp | 2 + frmts/raw/snodasdataset.cpp | 2 + frmts/rdb/rdbdataset.cpp | 8 + frmts/rdb/rdbdataset.hpp | 2 + frmts/safe/safedataset.cpp | 2 + frmts/sdts/sdts_al.h | 5 + frmts/sdts/sdtsdataset.cpp | 1 + frmts/sentinel2/sentinel2dataset.cpp | 1 + frmts/stacta/stactadataset.cpp | 2 + frmts/stacta/stactadataset.h | 8 + frmts/terragen/terragendataset.cpp | 3 + frmts/tga/tgadataset.cpp | 1 + frmts/til/tildataset.cpp | 1 + frmts/tiledb/tiledbheaders.h | 17 + frmts/tiledb/tiledbmultidim.h | 14 + frmts/vrt/gdaltileindexdataset.cpp | 2 + frmts/vrt/pixelfunctions.cpp | 2 + frmts/vrt/vrtdataset.cpp | 3 + frmts/vrt/vrtdataset.h | 31 ++ frmts/vrt/vrtrasterband.cpp | 1 + frmts/vrt/vrtsources.cpp | 1 + frmts/wcs/wcsdataset.h | 1 + frmts/wms/gdalhttp.h | 1 + frmts/wms/minidriver.cpp | 1 + frmts/wms/minidriver_mrf.h | 3 + frmts/wms/wmsdriver.h | 7 + frmts/wmts/wmtsdataset.cpp | 14 +- frmts/xpm/xpmdataset.cpp | 1 + frmts/zarr/zarr.h | 13 + frmts/zarr/zarr_array.cpp | 1 + frmts/zarr/zarr_v2_array.cpp | 2 + frmts/zarr/zarr_v2_group.cpp | 1 + frmts/zarr/zarr_v3_array.cpp | 1 + frmts/zmap/zmapdataset.cpp | 428 +++++++++++---------- gcore/gdal.h | 1 + gcore/gdal_pam.h | 7 + gcore/gdal_priv.h | 94 ++++- gcore/gdal_priv_templates.hpp | 1 + gcore/gdal_rat.h | 1 + gcore/gdalarraybandblockcache.cpp | 1 + gcore/gdalcachedpixelaccessor.h | 10 + gcore/gdaldataset.cpp | 55 +-- gcore/gdaldllmain.cpp | 1 + gcore/gdaldriver.cpp | 72 ++-- gcore/gdaldrivermanager.cpp | 4 + gcore/gdalgeorefpamdataset.cpp | 1 + gcore/gdaljp2abstractdataset.cpp | 41 +- gcore/gdaljp2abstractdataset.h | 2 + gcore/gdaljp2box.cpp | 1 + gcore/gdaljp2metadata.h | 4 + gcore/gdaljp2metadatagenerator.cpp | 3 + gcore/gdalmultidim.cpp | 43 ++- gcore/gdalmultidomainmetadata.cpp | 131 +++---- gcore/gdalnodatamaskband.cpp | 1 + gcore/gdalnodatavaluesmaskband.cpp | 1 + gcore/gdalorienteddataset.h | 1 + gcore/gdalpamdataset.cpp | 18 +- gcore/gdalpamrasterband.cpp | 3 + gcore/gdalpython.cpp | 67 ++-- gcore/gdalpython.h | 4 + gcore/gdalpythondriverloader.cpp | 1 + gcore/gdalrasterband.cpp | 6 + gcore/gdalrasterblock.cpp | 2 + gcore/gdalrelationship.cpp | 70 +--- gcore/gdalrescaledalphaband.cpp | 1 + gcore/gdalsse_priv.h | 4 + gcore/gdalsubdatasetinfo.h | 1 + gcore/gdalvirtualmem.cpp | 1 + gcore/overview.cpp | 4 + gcore/rasterio.cpp | 2 + gcore/rawdataset.h | 5 + gcore/tilematrixset.hpp | 6 + gnm/gnmgenericnetwork.cpp | 1 + gnm/gnmgraph.cpp | 1 + gnm/gnmlayer.cpp | 1 + gnm/gnmrule.cpp | 1 + ogr/ogr_api.cpp | 12 + ogr/ogr_core.h | 1 + ogr/ogr_expat.h | 1 + ogr/ogr_feature.h | 96 +++++ ogr/ogr_featurestyle.h | 94 +++++ ogr/ogr_geometry.h | 138 +++++++ ogr/ogr_proj_p.cpp | 2 + ogr/ogr_proj_p.h | 2 + ogr/ogr_recordbatch.h | 1 + ogr/ogr_spatialref.h | 11 + ogr/ogr_srs_panorama.cpp | 2 + ogr/ogr_swq.h | 1 + ogr/ogr_xerces.cpp | 2 + ogr/ograpispy.cpp | 13 + ogr/ogrcircularstring.cpp | 2 + ogr/ogrcompoundcurve.cpp | 2 + ogr/ogrct.cpp | 15 + ogr/ogrcurve.cpp | 1 + ogr/ogrcurvepolygon.cpp | 1 + ogr/ogrfeature.cpp | 6 + ogr/ogrfeaturedefn.cpp | 2 + ogr/ogrfeaturestyle.cpp | 13 + ogr/ogrfielddefn.cpp | 1 + ogr/ogrgeometry.cpp | 23 ++ ogr/ogrgeometrycollection.cpp | 3 + ogr/ogrgeomfielddefn.cpp | 1 + ogr/ogrlinearring.cpp | 2 + ogr/ogrlinestring.cpp | 2 + ogr/ogrmulticurve.cpp | 1 + ogr/ogrmultipolygon.cpp | 2 + ogr/ogrpgeogeometry.cpp | 1 + ogr/ogrpolygon.cpp | 3 + ogr/ogrpolyhedralsurface.cpp | 7 + ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h | 15 + ogr/ogrsf_frmts/arrow/ogr_feather.h | 2 + ogr/ogrsf_frmts/arrow_common/ogr_arrow.h | 14 + ogr/ogrsf_frmts/arrow_common/ograrrowlayer.hpp | 5 + .../arrow_common/ograrrowrandomaccessfile.h | 6 + .../arrow_common/ograrrowwriterlayer.hpp | 2 + ogr/ogrsf_frmts/avc/avc.h | 2 + ogr/ogrsf_frmts/avc/ogr_avc.h | 4 + ogr/ogrsf_frmts/cad/gdalcaddataset.cpp | 1 + ogr/ogrsf_frmts/cad/ogr_cad.h | 5 + ogr/ogrsf_frmts/carto/ogr_carto.h | 17 + ogr/ogrsf_frmts/csv/ogr_csv.h | 11 + ogr/ogrsf_frmts/csv/ogrcsvdatasource.cpp | 1 + ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp | 1 + ogr/ogrsf_frmts/csw/ogrcswdataset.cpp | 8 + ogr/ogrsf_frmts/dgn/ogr_dgn.h | 5 + ogr/ogrsf_frmts/dwg/ogr_dgnv8.h | 3 + ogr/ogrsf_frmts/dwg/ogr_dwg.h | 7 + ogr/ogrsf_frmts/dwg/ogrdgnv8layer.cpp | 1 + ogr/ogrsf_frmts/dwg/ogrdwgdatasource.cpp | 1 + ogr/ogrsf_frmts/dwg/ogrdwglayer.cpp | 1 + ogr/ogrsf_frmts/dxf/ogr_dxf.h | 31 ++ ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp | 1 + ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp | 1 + ogr/ogrsf_frmts/dxf/ogrdxfwriterds.cpp | 1 + ogr/ogrsf_frmts/edigeo/ogr_edigeo.h | 1 + ogr/ogrsf_frmts/elastic/ogr_elastic.h | 12 + ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp | 3 + ogr/ogrsf_frmts/filegdb/FGdbDriver.cpp | 1 + ogr/ogrsf_frmts/filegdb/ogr_fgdb.h | 14 + ogr/ogrsf_frmts/flatgeobuf/feature_generated.h | 30 ++ ogr/ogrsf_frmts/flatgeobuf/geometryreader.h | 3 + ogr/ogrsf_frmts/flatgeobuf/geometrywriter.h | 3 + ogr/ogrsf_frmts/flatgeobuf/header_generated.h | 74 ++++ ogr/ogrsf_frmts/flatgeobuf/ogr_flatgeobuf.h | 8 + .../flatgeobuf/ogrflatgeobufeditablelayer.cpp | 1 + ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp | 2 + ogr/ogrsf_frmts/flatgeobuf/packedrtree.h | 5 + ogr/ogrsf_frmts/generic/ogr_gensql.h | 3 + ogr/ogrsf_frmts/generic/ogrdatasource.cpp | 1 + ogr/ogrsf_frmts/generic/ogreditablelayer.cpp | 1 + ogr/ogrsf_frmts/generic/ogreditablelayer.h | 1 + ogr/ogrsf_frmts/generic/ogremulatedtransaction.cpp | 2 + ogr/ogrsf_frmts/generic/ogrlayer.cpp | 5 + ogr/ogrsf_frmts/generic/ogrlayer_private.h | 1 + ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp | 30 ++ ogr/ogrsf_frmts/generic/ogrlayerpool.cpp | 1 + ogr/ogrsf_frmts/generic/ogrlayerpool.h | 1 + ogr/ogrsf_frmts/generic/ogrmutexeddatasource.cpp | 1 + ogr/ogrsf_frmts/generic/ogrmutexedlayer.cpp | 1 + ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp | 1 + ogr/ogrsf_frmts/generic/ogrunionlayer.h | 2 + .../geoconcept/ogrgeoconceptdatasource.h | 2 + ogr/ogrsf_frmts/geoconcept/ogrgeoconceptlayer.h | 4 + ogr/ogrsf_frmts/geojson/directedacyclicgraph.hpp | 2 + ogr/ogrsf_frmts/geojson/ogr_geojson.h | 12 + ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp | 1 + ogr/ogrsf_frmts/geojson/ogrgeojsondatasource.cpp | 1 + ogr/ogrsf_frmts/geojson/ogrgeojsondriver.cpp | 4 + ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp | 1 + ogr/ogrsf_frmts/geojson/ogrgeojsonreader.h | 2 + ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp | 4 + ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.h | 1 + .../geojson/ogrjsoncollectionstreamingparser.h | 5 + ogr/ogrsf_frmts/georss/ogr_georss.h | 4 + ogr/ogrsf_frmts/gml/gfstemplate.cpp | 6 + ogr/ogrsf_frmts/gml/gmlreader.h | 36 ++ ogr/ogrsf_frmts/gml/gmlreaderp.h | 13 + ogr/ogrsf_frmts/gml/gmlregistry.h | 1 + ogr/ogrsf_frmts/gml/hugefileresolver.cpp | 1 + ogr/ogrsf_frmts/gml/ogr_gml.h | 15 + ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp | 4 + ogr/ogrsf_frmts/gmlas/ogr_gmlas.h | 99 +++++ ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp | 2 + ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp | 2 + ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp | 23 +- ogr/ogrsf_frmts/gmt/ogr_gmt.h | 3 + ogr/ogrsf_frmts/gpkg/gpkgmbtilescommon.h | 2 + ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 53 +++ ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 10 +- ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 9 +- ogr/ogrsf_frmts/gpsbabel/ogr_gpsbabel.h | 3 + ogr/ogrsf_frmts/gpx/ogr_gpx.h | 5 + ogr/ogrsf_frmts/gtfs/ogrgtfsdriver.cpp | 4 + ogr/ogrsf_frmts/hana/ogr_hana.h | 13 + ogr/ogrsf_frmts/hana/ogrhanadrivercore.cpp | 2 + ogr/ogrsf_frmts/idb/ogr_idb.h | 3 + ogr/ogrsf_frmts/idb/ogridbdatasource.cpp | 1 + ogr/ogrsf_frmts/idrisi/ogr_idrisi.h | 2 + ogr/ogrsf_frmts/ili/imdreader.cpp | 12 + ogr/ogrsf_frmts/ili/imdreader.h | 8 + ogr/ogrsf_frmts/ili/ogr_ili1.h | 3 + ogr/ogrsf_frmts/ili/ogr_ili2.h | 3 + ogr/ogrsf_frmts/ili/ogrili1layer.cpp | 1 + ogr/ogrsf_frmts/ili/ogrili2layer.cpp | 1 + ogr/ogrsf_frmts/jml/ogr_jml.h | 3 + ogr/ogrsf_frmts/jsonfg/ogr_jsonfg.h | 4 + .../jsonfg/ogrjsonfgstreamingparser.cpp | 1 + ogr/ogrsf_frmts/kml/ogr_kml.h | 9 + ogr/ogrsf_frmts/libkml/ogr_libkml.h | 15 + ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp | 34 +- ogr/ogrsf_frmts/mapml/ogrmapmldataset.cpp | 6 + ogr/ogrsf_frmts/mem/ogr_mem.h | 5 + ogr/ogrsf_frmts/mitab/mitab.h | 76 ++++ ogr/ogrsf_frmts/mitab/mitab_geometry.cpp | 1 + ogr/ogrsf_frmts/mitab/mitab_ogr_driver.h | 1 + ogr/ogrsf_frmts/mitab/mitab_priv.h | 44 +++ ogr/ogrsf_frmts/mongodbv3/ogrmongodbv3driver.cpp | 10 + ogr/ogrsf_frmts/mssqlspatial/ogr_mssqlspatial.h | 18 + .../mssqlspatial/ogrmssqlspatialdatasource.cpp | 1 + .../mssqlspatial/ogrmssqlspatialtablelayer.cpp | 61 +-- ogr/ogrsf_frmts/mvt/mvt_tile.h | 36 ++ ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp | 11 + ogr/ogrsf_frmts/mysql/ogr_mysql.h | 7 + ogr/ogrsf_frmts/mysql/ogrmysqllayer.cpp | 1 + ogr/ogrsf_frmts/nas/nasreaderp.h | 7 + ogr/ogrsf_frmts/nas/ogr_nas.h | 3 + ogr/ogrsf_frmts/ngw/gdalngwdataset.cpp | 1 + ogr/ogrsf_frmts/ngw/ogr_ngw.h | 11 + ogr/ogrsf_frmts/ntf/ntf.h | 30 ++ ogr/ogrsf_frmts/oci/ogr_oci.h | 13 + ogr/ogrsf_frmts/odbc/ogr_odbc.h | 4 + ogr/ogrsf_frmts/ods/ods_formula.h | 1 + ogr/ogrsf_frmts/ods/ods_formula_parser.cpp | 2 + ogr/ogrsf_frmts/ods/ods_formula_parser.hpp | 1 + ogr/ogrsf_frmts/ods/ogr_ods.h | 5 + ogr/ogrsf_frmts/ogdi/ogrogdi.h | 7 + ogr/ogrsf_frmts/ogrsf_frmts.h | 7 + ogr/ogrsf_frmts/openfilegdb/filegdbindex.cpp | 12 + ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp | 1 + ogr/ogrsf_frmts/openfilegdb/filegdbtable.h | 46 +++ ogr/ogrsf_frmts/openfilegdb/ogr_openfilegdb.h | 16 + .../openfilegdb/ogropenfilegdbdatasource.cpp | 7 + .../openfilegdb/ogropenfilegdblayer.cpp | 1 + ogr/ogrsf_frmts/osm/ogr_osm.h | 19 + ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp | 5 + ogr/ogrsf_frmts/osm/osm_parser.cpp | 2 + ogr/ogrsf_frmts/osm/osm_parser.h | 1 + ogr/ogrsf_frmts/parquet/ogr_parquet.h | 11 +- ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp | 56 ++- ogr/ogrsf_frmts/parquet/ogrparquetlayer.cpp | 2 +- ogr/ogrsf_frmts/pds/ogr_pds.h | 1 + ogr/ogrsf_frmts/pg/ogr_pg.h | 16 + ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp | 4 + ogr/ogrsf_frmts/pg/ogrpglayer.cpp | 2 + ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp | 6 + ogr/ogrsf_frmts/pgdump/ogr_pgdump.h | 15 + ogr/ogrsf_frmts/pgeo/ogr_pgeo.h | 5 + ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp | 3 + ogr/ogrsf_frmts/plscenes/ogr_plscenes.h | 6 + ogr/ogrsf_frmts/pmtiles/ogr_pmtiles.h | 8 + ogr/ogrsf_frmts/pmtiles/ogrpmtilesfrommbtiles.cpp | 2 + ogr/ogrsf_frmts/s57/ogr_s57.h | 5 + ogr/ogrsf_frmts/s57/s57.h | 9 + ogr/ogrsf_frmts/sdts/ogr_sdts.h | 2 + ogr/ogrsf_frmts/selafin/io_selafin.h | 3 +- ogr/ogrsf_frmts/selafin/ogr_selafin.h | 15 + ogr/ogrsf_frmts/shape/ogrshape.h | 17 + ogr/ogrsf_frmts/shape/sbnsearch.c | 1 + ogr/ogrsf_frmts/sosi/ogr_sosi.h | 6 + ogr/ogrsf_frmts/sosi/ogrsosidatatypes.cpp | 6 + ogr/ogrsf_frmts/sosi/ogrsosilayer.cpp | 19 +- ogr/ogrsf_frmts/sqlite/ogr_sqlite.h | 39 ++ ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h | 5 + .../sqlite/ogrsqlitesqlfunctionscommon.cpp | 1 + ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h | 2 + ogr/ogrsf_frmts/sqlite/ogrsqlitevfs.cpp | 2 + ogr/ogrsf_frmts/svg/ogr_svg.h | 2 + ogr/ogrsf_frmts/sxf/ogr_sxf.h | 5 + ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp | 4 + ogr/ogrsf_frmts/sxf/org_sxf_defs.h | 2 + ogr/ogrsf_frmts/tiger/ogr_tiger.h | 7 + ogr/ogrsf_frmts/vdv/ogr_vdv.h | 5 + ogr/ogrsf_frmts/vdv/ogrvdvdatasource.cpp | 3 + ogr/ogrsf_frmts/vfk/ogr_vfk.h | 1 + ogr/ogrsf_frmts/vfk/vfkreader.h | 15 + ogr/ogrsf_frmts/vfk/vfkreaderp.h | 9 + ogr/ogrsf_frmts/vrt/ogr_vrt.h | 6 + ogr/ogrsf_frmts/wasp/ogrwasp.h | 5 + ogr/ogrsf_frmts/wfs/ogr_wfs.h | 25 ++ ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp | 5 + ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp | 7 + ogr/ogrsf_frmts/wfs/ogrwfsfilter.cpp | 1 + ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp | 3 + ogr/ogrsf_frmts/xls/ogr_xls.h | 2 + ogr/ogrsf_frmts/xlsx/ogr_xlsx.h | 6 + ogr/ogrspatialreference.cpp | 2 + ogr/ogrsurface.cpp | 1 + ogr/ogrtriangle.cpp | 2 + ogr/ogrtriangulatedsurface.cpp | 4 + ogr/swq.cpp | 1 + ogr/swq_op_registrar.cpp | 1 + ogr/swq_parser.cpp | 2 + ogr/swq_parser.hpp | 1 + port/cpl_alibaba_oss.h | 4 + port/cpl_auto_close.h | 1 + port/cpl_aws.cpp | 6 +- port/cpl_aws.h | 11 + port/cpl_azure.cpp | 2 + port/cpl_compressor.cpp | 13 + port/cpl_conv.cpp | 2 + port/cpl_conv.h | 1 + port/cpl_cpu_features.cpp | 2 + port/cpl_cpu_features.h | 5 + port/cpl_csv.cpp | 1 + port/cpl_error.h | 1 + port/cpl_error_internal.h | 1 + port/cpl_google_cloud.cpp | 1 + port/cpl_google_cloud.h | 1 + port/cpl_http.cpp | 1 + port/cpl_json.cpp | 3 + port/cpl_json.h | 10 + port/cpl_json_streaming_parser.cpp | 1 + port/cpl_json_streaming_parser.h | 10 + port/cpl_json_streaming_writer.h | 14 + port/cpl_mem_cache.h | 19 + port/cpl_minixml.h | 2 + port/cpl_minizip_unzip.h | 2 + port/cpl_minizip_zip.h | 1 + port/cpl_multiproc.cpp | 4 + port/cpl_multiproc.h | 2 + port/cpl_odbc.cpp | 19 + port/cpl_odbc.h | 5 + port/cpl_port.h | 12 + port/cpl_safemaths.hpp | 4 + port/cpl_sha256.h | 1 + port/cpl_string.h | 246 ++++++++++++ port/cpl_vsi.h | 1 + port/cpl_vsi_mem.cpp | 2 + port/cpl_vsi_virtual.h | 27 ++ port/cpl_vsil.cpp | 1 + port/cpl_vsil_adls.cpp | 2 + port/cpl_vsil_az.cpp | 2 + port/cpl_vsil_cache.cpp | 3 + port/cpl_vsil_curl.cpp | 3 + port/cpl_vsil_curl_class.h | 24 ++ port/cpl_vsil_curl_streaming.cpp | 15 + port/cpl_vsil_gs.cpp | 3 + port/cpl_vsil_gzip.cpp | 23 ++ port/cpl_vsil_libarchive.cpp | 13 + port/cpl_vsil_plugin.cpp | 4 + port/cpl_vsil_s3.cpp | 8 + port/cpl_vsil_sparsefile.cpp | 2 + port/cpl_vsil_stdin.cpp | 3 + port/cpl_vsil_swift.cpp | 1 + port/cpl_vsil_tar.cpp | 5 + port/cpl_vsil_unix_stdio_64.cpp | 3 + port/cpl_vsil_webhdfs.cpp | 2 + port/cpl_vsil_win32.cpp | 4 + port/cpl_vsisimple.cpp | 1 + port/cpl_worker_thread_pool.cpp | 1 + port/cplkeywordparser.h | 1 + port/cplstringlist.cpp | 144 +++++++ .../osgeo_utils/samples/gdalbuildvrtofvrt.py | 242 ++++++++++++ 605 files changed, 5253 insertions(+), 980 deletions(-) create mode 100644 autotest/gdrivers/data/jpeg/byte_with_xmp_before_soc.jpg create mode 100755 autotest/pyscripts/test_gdalbuildvrtofvrt.py create mode 100755 swig/python/gdal-utils/osgeo_utils/samples/gdalbuildvrtofvrt.py git reset --hard HEAD HEAD is now at 67c871c7ca .git-blame-ignore-revs: add commit c39127b8dca9228e728a56dd93fc8ebf7c212060 [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 67c871c7ca203ecd8da16624e56c9870dd0d7998 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 7104eca Update cache_disk.c (#330) 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 7104eca2140bb4657d3e9dcadd5ba14d46a5a371 cd E:\buildsystem