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)\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 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 c862b04cf Merge pull request #6330 from rouault/coverity_scan_fixes git fetch git checkout main Your branch is behind 'origin/main' by 119 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating c862b04cf..18d3a67d2 Fast-forward .travis.yml | 2 +- apache/mod_mapserver.c | 1 - cgiutil.c | 19 +- cgiutil.h | 16 +- fontcache.c | 16 +- mapagg.cpp | 12 +- mapcluster.c | 3 +- mapcopy.c | 13 +- mapcrypto.c | 3 + mapdraw.c | 35 +- mapdrawgdal.c | 40 +- maperror.c | 2 +- maperror.h | 18 + mapfile.c | 96 +- mapgml.c | 2 + mapkmlrenderer.h | 88 +- maplayer.c | 2 +- maplegend.c | 10 +- maplexer.c | 3855 ++++++++++---------- maplexer.l | 4 - mapmvt.c | 4 +- mapogcfiltercommon.cpp | 2 +- mapogcsld.c | 1 - mapogcsos.c | 2 +- mapogr.cpp | 56 +- mapoutput.c | 68 +- mapows.c | 14 +- mappostgis.cpp | 124 +- mapprimitive.c | 5 +- mapquantization.c | 8 +- mapquery.c | 10 +- maprendering.c | 10 - mapscale.c | 8 +- mapscript/java/examples/DrawMap.java | 4 +- mapscript/php/mapscript_i.c | 7 +- mapscript/php/style.c | 157 +- mapscript/php/web.c | 22 +- mapscript/python/examples/wxs.py | 2 +- mapscript/python/mapscript/__init__.py | 3 + mapscript/python/pyextend.i | 24 +- mapscript/python/tests/cases/clone_test.py | 9 +- mapscript/python/tests/cases/image_test.py | 17 - mapscript/python/tests/cases/layer_test.py | 12 +- mapscript/python/tests/cases/map_test.py | 62 - mapscript/python/tests/cases/ows_test.py | 32 + mapscript/python/tests/cases/style_test.py | 9 +- mapscript/python/tests/cases/symbolset_test.py | 3 +- mapscript/python/tests/runtests.py | 8 +- mapscript/swiginc/class.i | 32 - mapscript/swiginc/image.i | 2 +- mapscript/swiginc/label.i | 2 +- mapscript/swiginc/layer.i | 96 +- mapscript/swiginc/legend.i | 2 +- mapscript/swiginc/map.i | 48 +- mapscript/swiginc/outputformat.i | 6 +- mapscript/swiginc/owsrequest.i | 28 +- mapscript/swiginc/querymap.i | 2 +- mapscript/swiginc/referencemap.i | 2 +- mapscript/swiginc/symbol.i | 2 +- mapserv.c | 2 +- mapserv.h | 1 - mapserver.h | 152 +- mapservutil.c | 57 +- mapshape.c | 2 +- maptemplate.c | 42 +- maptree.c | 26 +- maputil.c | 1 - mapuvraster.c | 2 + mapwcs.cpp | 4 +- mapwcs20.cpp | 3 +- mapwfs.cpp | 2 +- mapwfs11.cpp | 12 +- mapwfs20.c | 4 +- mapwms.cpp | 8 +- msautotest/create_postgis_test_data.sh | 14 + msautotest/gdal/class16_range.map | 8 +- msautotest/gdal/class8_range.map | 2 +- msautotest/gdal/expected/class16_range.png | Bin 857 -> 857 bytes msautotest/gdal/expected/class8_range.png | Bin 2030 -> 1977 bytes msautotest/gdal/gd_png_tr_256.map | 1 - msautotest/gdal/gd_png_tr_256_res.map | 2 +- msautotest/gdal/trlay1.map | 4 +- msautotest/gdal/trlay2.map | 4 +- msautotest/gdal/trlay3.map | 4 +- msautotest/misc/ogr_wkt.map | 2 - msautotest/misc/rfc36.map | 2 - msautotest/misc/rfc36_ogr.map | 2 - msautotest/mspython/test_postgis.py | 35 + msautotest/renderers/chartlayer_bar.map | 5 +- msautotest/renderers/chartlayer_vbar.map | 5 +- msautotest/renderers/embed_legend_rgba.map | 10 +- msautotest/renderers/embed_legend_rgba_tr.map | 10 +- msautotest/renderers/embed_sb_rgb.map | 2 - msautotest/renderers/embed_sb_rgb_tr.map | 1 - msautotest/renderers/embed_sb_rgba.map | 12 +- msautotest/renderers/embed_sb_rgba_offset.map | 12 +- msautotest/renderers/embed_sb_rgba_tr.map | 12 +- .../renderers/expected/font-fail-missing-glyph.png | Bin 0 -> 2307 bytes msautotest/renderers/font-fail.map | 18 + msautotest/renderers/labelrot.map | 2 - msautotest/renderers/plb_embed_legend_rgba.map | 10 +- msautotest/renderers/plb_embed_legend_rgba_tr.map | 14 +- msautotest/renderers/polyline_no_clip.map | 4 +- .../wxs/expected/ows_all_wms_capabilities.xml | 1 + .../wxs/expected/ows_all_wms_capabilities_post.xml | 1 + .../expected/ows_metadata_wms_capabilities111.xml | 1 + .../expected/ows_metadata_wms_capabilities130.xml | 1 + msautotest/wxs/expected/ows_wms_capabilities.xml | 1 + .../ows_wms_rootlayer_name_capabilities.xml | 1 + .../ows_wms_rootlayer_name_empty_capabilities.xml | 1 + ...tfeature_resourceid_filter_invalid_typename.xml | 4 +- .../wfs_filter_intersects_empty_multipolygon.xml | 16 + msautotest/wxs/expected/wfs_postgis_issue_6181.xml | 35 + .../wfs_postgis_issue_6181_startindex_1.xml | 35 + .../wxs/expected/wms111_test_xml_escaping.xml | 1 + .../wxs/expected/wms130_test_xml_escaping.xml | 1 + msautotest/wxs/expected/wms_dimension_cap.xml | 1 + msautotest/wxs/expected/wms_dimension_cap130.xml | 1 + msautotest/wxs/expected/wms_empty_cap111.xml | 1 + msautotest/wxs/expected/wms_empty_cap130.xml | 1 + .../wxs/expected/wms_empty_cap_latestversion.xml | 1 + .../wms_get_capabilities_tileindexmixedsrs.xml | 1 + msautotest/wxs/expected/wms_inspire_cap.xml | 1 + msautotest/wxs/expected/wms_inspire_cap_111.xml | 1 + .../wxs/expected/wms_inspire_cap_111_eng.xml | 1 + .../wxs/expected/wms_inspire_cap_111_ger.xml | 1 + msautotest/wxs/expected/wms_inspire_cap_eng.xml | 1 + msautotest/wxs/expected/wms_inspire_cap_ger.xml | 1 + .../wxs/expected/wms_inspire_scenario1_cap130.xml | 1 + .../expected/wms_inspire_scenario1_cap130_eng.xml | 1 + .../expected/wms_inspire_scenario1_cap130_ger.xml | 1 + .../wxs/expected/wms_inspire_scenario2_cap111.xml | 1 + .../expected/wms_inspire_scenario2_cap111_eng.xml | 1 + .../expected/wms_inspire_scenario2_cap111_ger.xml | 1 + .../wxs/expected/wms_inspire_scenario2_cap130.xml | 1 + .../expected/wms_inspire_scenario2_cap130_eng.xml | 1 + .../expected/wms_inspire_scenario2_cap130_ger.xml | 1 + .../wxs/expected/wms_layer_groups_caps111.xml | 1 + msautotest/wxs/expected/wms_mvt.mvt | Bin 8454 -> 8466 bytes msautotest/wxs/expected/wms_mvt_xprotobuf.mvt | Bin 0 -> 8454 bytes .../wxs/expected/wms_north_polar_stereo_extent.xml | 1 + msautotest/wxs/expected/wms_nosld_cap.xml | 1 + msautotest/wxs/expected/wms_nosld_cap_postgis.xml | 1 + msautotest/wxs/ows_sos.map | 1 - msautotest/wxs/ows_wcs.map | 2 +- msautotest/wxs/sos.map | 1 - msautotest/wxs/wcs_grib_input_output.map | 1 - msautotest/wxs/wcs_grib_output.map | 1 - msautotest/wxs/wcs_inspire_scenario1.map | 1 - msautotest/wxs/wcs_inspire_scenario2.map | 1 - msautotest/wxs/wcs_mask.map | 1 - msautotest/wxs/wcs_multiple_metadatalink.map | 1 - msautotest/wxs/wcs_post.map | 1 - msautotest/wxs/wcs_simple.map | 1 - .../wxs/wcs_simple_layer_specific_option.map | 1 - msautotest/wxs/wfs_filter.map | 4 + msautotest/wxs/wfs_postgis_paging.map | 62 + msautotest/wxs/wms_mvt.map | 4 +- msautotest/wxs/wms_time1.map | 4 +- msautotest/wxs/wms_time1_postgis.map | 4 +- msautotest/wxs/wms_time2.map | 4 +- msautotest/wxs/wms_time2_postgis.map | 4 +- msautotest/wxs/wms_time_pattern.map | 4 +- msautotest/wxs/wms_time_pattern_12_13_test.map | 4 +- .../wxs/wms_time_pattern_12_13_test_postgis.map | 4 +- msautotest/wxs/wms_time_pattern_fail.map | 4 +- msautotest/wxs/wms_time_pattern_postgis.map | 4 +- renderers/agg/include/agg_arc.h | 4 +- renderers/agg/include/agg_basics.h | 4 +- renderers/agg/include/agg_color_rgba.h | 10 +- renderers/agg/include/agg_conv_adaptor_vcgen.h | 6 +- renderers/agg/include/agg_curves.h | 138 +- renderers/agg/include/agg_dda_line.h | 12 +- renderers/agg/include/agg_font_cache_manager.h | 4 +- renderers/agg/include/agg_image_accessors.h | 12 +- renderers/agg/include/agg_line_aa_basics.h | 12 +- renderers/agg/include/agg_path_storage.h | 6 + renderers/agg/include/agg_path_storage_integer.h | 4 +- renderers/agg/include/agg_rasterizer_outline_aa.h | 11 +- renderers/agg/include/agg_rasterizer_scanline_aa.h | 2 +- renderers/agg/include/agg_renderer_outline_image.h | 2 +- renderers/agg/include/agg_scanline_bin.h | 2 +- renderers/agg/include/agg_scanline_p.h | 2 +- renderers/agg/include/agg_scanline_storage_aa.h | 10 +- renderers/agg/include/agg_scanline_storage_bin.h | 10 +- renderers/agg/include/agg_scanline_u.h | 2 +- renderers/agg/include/agg_vcgen_contour.h | 2 +- renderers/agg/include/agg_vcgen_dash.h | 6 +- renderers/agg/include/agg_vcgen_stroke.h | 2 +- renderers/agg/include/agg_vertex_sequence.h | 11 +- renderers/agg/include/clipper.hpp | 6 +- renderers/agg/src/agg_font_freetype.cpp | 12 +- renderers/agg/src/clipper.cpp | 18 +- shp2img.c | 11 +- shptreetst.c | 5 + textlayout.c | 13 +- xmlmapfile/mapfile.xsl | 2 - 197 files changed, 3134 insertions(+), 3107 deletions(-) create mode 100644 msautotest/renderers/expected/font-fail-missing-glyph.png create mode 100644 msautotest/wxs/expected/wfs_filter_intersects_empty_multipolygon.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_mvt_xprotobuf.mvt create mode 100644 msautotest/wxs/wfs_postgis_paging.map git reset --hard HEAD HEAD is now at 18d3a67d2 Merge pull request #6351 from jmckenna/irc 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 18d3a67d22fd596920d51fc1f827a4ffa4be126b cd E:\buildsystem 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 5059f2e6dd Docker: alpine-normal: add lzma support [ci skip] git fetch git checkout master Your branch is behind 'origin/master' by 262 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 5059f2e6dd..a7d5db1b7c Fast-forward .github/workflows/fedora_rawhide/start.sh | 2 +- .github/workflows/ubuntu_18.04/before_install.sh | 2 +- .github/workflows/ubuntu_18.04/install.sh | 5 + .github/workflows/ubuntu_18.04_32bit/start.sh | 7 +- .github/workflows/ubuntu_20.04.yml | 11 +- .github/workflows/ubuntu_20.04/build-deps.sh | 11 + .github/workflows/ubuntu_20.04/build.sh | 15 +- .github/workflows/windows_build.yml | 6 +- CONTRIBUTING.md | 2 +- README.md | 3 + .../alg/data/geoloc/latitude_including_pole.tif | Bin 0 -> 26188 bytes .../alg/data/geoloc/longitude_including_pole.tif | Bin 0 -> 80869 bytes autotest/alg/data/utmsmall_ds_rms.vrt | 2 +- autotest/alg/data/utmsmall_rms.vrt | 2 +- autotest/alg/data/utmsmall_rms_float.vrt | 2 +- autotest/alg/transformgeoloc.py | 14 +- autotest/alg/warp.py | 10 +- autotest/cpp/test_gdal.cpp | 75 +++ autotest/cpp/test_osr_ct.cpp | 38 ++ autotest/gcore/cog.py | 8 + autotest/gcore/geoloc.py | 66 +- autotest/gcore/misc.py | 16 +- autotest/gcore/numpy_rw.py | 25 +- autotest/gcore/pam.py | 23 +- autotest/gcore/rasterio.py | 99 ++- autotest/gcore/test_driver_metadata.py | 13 +- autotest/gcore/tiff_ovr.py | 29 + autotest/gcore/tiff_write.py | 27 + autotest/gcore/vrtmisc.py | 16 + autotest/gcore/vsifile.py | 16 +- autotest/gcore/vsigs.py | 349 +++++++---- autotest/gcore/vsis3.py | 111 ++-- autotest/gcore/vsiswift.py | 122 ++++ autotest/gdrivers/data/netcdf/fake_ISO_METADATA.nc | Bin 0 -> 7390 bytes autotest/gdrivers/ecw.py | 12 +- autotest/gdrivers/gpkg.py | 26 + autotest/gdrivers/jp2openjpeg.py | 52 +- autotest/gdrivers/memmultidim.py | 7 + autotest/gdrivers/netcdf.py | 51 ++ autotest/gdrivers/nitf.py | 267 ++++++--- autotest/gdrivers/vrtwarp.py | 5 +- autotest/gdrivers/wcs.py | 2 +- autotest/ogr/data/dxf/additional-entities.dxf | 4 + autotest/ogr/data/dxf/leader-mleader.dxf | 2 +- .../test_ogr_flatgeobuf_coordinate_epoch.fgb | Bin 0 -> 544 bytes autotest/ogr/data/mitab/all_geoms.mif.golden.csv | 6 +- autotest/ogr/ogr_csv.py | 14 +- autotest/ogr/ogr_dxf.py | 3 +- autotest/ogr/ogr_flatgeobuf.py | 76 +++ autotest/ogr/ogr_gpkg.py | 145 ++++- autotest/ogr/ogr_mem.py | 21 +- autotest/ogr/ogr_plscenes.py | 9 +- autotest/ogr/ogr_shape.py | 47 +- autotest/ogr/ogr_sql_rfc28.py | 120 +++- autotest/ogr/ogr_sqlite.py | 7 + autotest/ogr/ogr_wfs.py | 32 +- autotest/osr/osr_basic.py | 66 ++ autotest/osr/osr_ct.py | 43 ++ autotest/osr/osr_epsg.py | 12 + autotest/pyscripts/test_gdal_utils.py | 80 ++- autotest/requirements.txt | 2 +- .../data/color_paletted_red_green_0-255.qml | 303 ++++++++++ .../data/color_paletted_red_green_0-255.txt | 256 ++++++++ .../data/colro_pseudocolor_spectral_0-100.qml | 78 +++ .../data/colro_pseudocolor_spectral_0-100.txt | 5 + autotest/utilities/test_gdalinfo_lib.py | 11 + autotest/utilities/test_gdalwarp_lib.py | 55 ++ autotest/utilities/test_ogr2ogr_lib.py | 62 +- gdal/alg/GNUmakefile | 2 +- gdal/alg/gdal_alg_priv.h | 49 ++ gdal/alg/gdalgeoloc.cpp | 469 ++++++--------- gdal/alg/gdaltransformer.cpp | 185 ++++-- gdal/alg/gdalwarper.cpp | 2 +- gdal/alg/gdalwarpkernel.cpp | 90 ++- gdal/alg/makefile.vc | 2 +- gdal/apps/GNUmakefile | 1 - gdal/apps/gdal_translate_bin.cpp | 3 +- gdal/apps/gdal_translate_lib.cpp | 29 +- gdal/apps/gdalasyncread.cpp | 2 +- gdal/apps/gdalinfo_lib.cpp | 21 + gdal/apps/gdalmdiminfo_lib.cpp | 117 +++- gdal/apps/gdalwarp_bin.cpp | 1 + gdal/apps/gdalwarp_lib.cpp | 30 + gdal/apps/makefile.vc | 2 +- gdal/apps/ogr2ogr_bin.cpp | 1 + gdal/apps/ogr2ogr_lib.cpp | 19 + gdal/apps/ogrinfo.cpp | 19 +- gdal/apps/test_ogrsf.cpp | 8 + gdal/apps/testreprojmulti.cpp | 4 +- gdal/ci/travis/graviton2/install.sh | 2 +- gdal/ci/travis/s390x/install.sh | 2 +- gdal/configure | 4 +- gdal/configure.ac | 4 +- gdal/data/gdalvrt.xsd | 3 +- gdal/data/plscenesconf.json | 169 +++++- gdal/doc/generate-sponsor-logos.sh | 1 + gdal/doc/images/sponsors/logo-FrontierSI.svg | 21 + gdal/doc/images/sponsors/logo-frontiersi.png | Bin 0 -> 1991 bytes gdal/doc/source/api/index.rst | 7 + gdal/doc/source/contributing/rst_style.rst | 19 + gdal/doc/source/development/rfc/index.rst | 3 +- .../rfc/rfc80_numfocus_relationship.rst | 13 +- .../development/rfc/rfc81_coordinate_epoch.rst | 93 +++ .../rfc/rfc83_use_of_project_sponsorship.rst | 235 ++++++++ .../doc/source/development/rfc/rfc9_maintainer.rst | 2 +- gdal/doc/source/drivers/raster/Idrisi.rst | 2 +- gdal/doc/source/drivers/raster/cog.rst | 11 +- gdal/doc/source/drivers/raster/db2.rst | 14 +- gdal/doc/source/drivers/raster/gpkg.rst | 14 +- gdal/doc/source/drivers/raster/jp2openjpeg.rst | 7 +- gdal/doc/source/drivers/raster/netcdf.rst | 44 +- gdal/doc/source/drivers/raster/nitf.rst | 55 +- gdal/doc/source/drivers/raster/pdf.rst | 6 + gdal/doc/source/drivers/raster/vrt.rst | 121 ++-- gdal/doc/source/drivers/vector/flatgeobuf.rst | 4 +- gdal/doc/source/drivers/vector/gpkg.rst | 12 +- gdal/doc/source/drivers/vector/pg.rst | 8 +- gdal/doc/source/drivers/vector/pgdump.rst | 4 +- gdal/doc/source/drivers/vector/plscenes.rst | 2 +- .../doc/source/drivers/vector/plscenes_data_v1.rst | 2 +- gdal/doc/source/drivers/vector/shapefile.rst | 8 +- gdal/doc/source/faq.rst | 2 + gdal/doc/source/programs/gdal_calc.rst | 2 +- gdal/doc/source/programs/gdal_merge.rst | 4 +- gdal/doc/source/programs/gdal_translate.rst | 10 +- gdal/doc/source/programs/gdalbuildvrt.rst | 10 - gdal/doc/source/programs/gdallocationinfo.rst | 2 +- gdal/doc/source/programs/gdaltindex.rst | 14 +- gdal/doc/source/programs/gdalwarp.rst | 23 + gdal/doc/source/programs/index.rst | 2 +- gdal/doc/source/programs/ogr2ogr.rst | 31 + gdal/doc/source/programs/ogrlineref.rst | 2 +- gdal/doc/source/programs/ogrtindex.rst | 2 +- gdal/doc/source/programs/rgb2pct.rst | 4 +- .../Sustainable GDAL Sponsorship Prospectus.pdf | Bin 207680 -> 211275 bytes gdal/doc/source/sponsors/faq.rst | 9 +- gdal/doc/source/sponsors/index.rst | 24 +- gdal/doc/source/tutorials/osr_api_tut.rst | 8 + gdal/doc/source/user/coordinate_epoch.rst | 195 ++++++ gdal/doc/source/user/index.rst | 1 + gdal/doc/source/user/sql_sqlite_dialect.rst | 23 +- gdal/doc/source/user/virtual_file_systems.rst | 30 +- gdal/docker/README.md | 4 +- gdal/docker/alpine-normal/Dockerfile | 7 +- gdal/docker/alpine-small/Dockerfile | 2 +- gdal/docker/alpine-ultrasmall/Dockerfile | 2 +- gdal/docker/ubuntu-full/Dockerfile | 12 +- gdal/frmts/ecw/ecwcreatecopy.cpp | 49 +- gdal/frmts/ecw/ecwdataset.cpp | 111 +++- gdal/frmts/ecw/ecwsdk_headers.h | 1 + gdal/frmts/ecw/gdal_ecw.h | 7 +- gdal/frmts/grib/degrib/degrib/degrib1.cpp | 18 +- gdal/frmts/grib/degrib/degrib/degrib1.h | 1 + gdal/frmts/grib/degrib/degrib/grib1tab.cpp | 310 +++++++++- gdal/frmts/gtiff/cogdriver.cpp | 19 +- gdal/frmts/gtiff/geotiff.cpp | 203 ++----- gdal/frmts/gtiff/gt_citation.cpp | 2 +- gdal/frmts/gtiff/gt_citation.h | 2 +- gdal/frmts/gtiff/gt_wkt_srs.cpp | 125 ++-- gdal/frmts/gtiff/gt_wkt_srs.h | 2 +- gdal/frmts/gtiff/gt_wkt_srs_for_gdal.h | 5 +- gdal/frmts/gtiff/libgeotiff/geokeys.inc | 4 +- gdal/frmts/gtiff/libgeotiff/geotiff.h | 2 +- gdal/frmts/gtiff/libtiff/tif_dirwrite.c | 18 +- gdal/frmts/gtiff/libtiff/tif_jpeg.c | 91 ++- gdal/frmts/gtiff/libtiff/tif_lzw.c | 69 +-- gdal/frmts/gtiff/libtiff/tif_print.c | 24 +- gdal/frmts/gtiff/libtiff/tif_zstd.c | 32 +- gdal/frmts/jp2kak/jp2kakdataset.cpp | 4 +- gdal/frmts/jp2lura/jp2luradataset.cpp | 10 +- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 9 +- gdal/frmts/jpipkak/jpipkakdataset.cpp | 25 +- gdal/frmts/jpipkak/jpipkakdataset.h | 12 +- gdal/frmts/mem/memdataset.cpp | 21 +- gdal/frmts/mem/memdataset.h | 12 +- gdal/frmts/mrsid/mrsiddataset.cpp | 24 +- gdal/frmts/netcdf/netcdfdataset.cpp | 148 ++++- gdal/frmts/netcdf/netcdfdataset.h | 11 + gdal/frmts/netcdf/netcdfmultidim.cpp | 59 +- gdal/frmts/nitf/nitfdataset.cpp | 473 ++++++++++++--- gdal/frmts/nitf/nitfdataset.h | 1 + gdal/frmts/nitf/nitffile.c | 12 + gdal/frmts/nitf/nitflib.h | 5 + gdal/frmts/openjpeg/openjpegdataset.cpp | 122 ++-- gdal/frmts/pdf/pdfdataset.cpp | 9 +- gdal/frmts/png/GNUmakefile | 3 +- gdal/frmts/vrt/vrtdataset.cpp | 19 +- gdal/frmts/vrt/vrtdriver.cpp | 1 + gdal/gcore/gdal.h | 21 +- gdal/gcore/gdal_avx2_emulation.hpp | 103 +++- gdal/gcore/gdal_mdreader.cpp | 5 + gdal/gcore/gdal_misc.cpp | 2 + gdal/gcore/gdal_priv.h | 37 +- gdal/gcore/gdal_priv_templates.hpp | 3 +- gdal/gcore/gdaldataset.cpp | 12 +- gdal/gcore/gdaldriver.cpp | 22 +- gdal/gcore/gdalgeorefpamdataset.cpp | 49 +- gdal/gcore/gdalgeorefpamdataset.h | 18 +- gdal/gcore/gdaljp2abstractdataset.cpp | 5 +- gdal/gcore/gdaljp2metadata.cpp | 147 +++-- gdal/gcore/gdaljp2metadata.h | 4 +- gdal/gcore/gdalmultidim.cpp | 36 +- gdal/gcore/gdalpamdataset.cpp | 18 + gdal/gcore/gdalrasterband.cpp | 442 +++++++------- gdal/gcore/overview.cpp | 316 +++++++--- gdal/gcore/rasterio.cpp | 217 ++++++- gdal/gcore/rawdataset.cpp | 4 +- gdal/gcore/statistics.txt | 14 +- gdal/makefile.vc | 11 +- gdal/nmake.opt | 2 +- gdal/ogr/ogr_geometry.h | 2 +- gdal/ogr/ogr_spatialref.h | 4 + gdal/ogr/ogr_srs_api.h | 9 +- gdal/ogr/ogr_srsnode.cpp | 4 + gdal/ogr/ogr_swq.h | 3 +- gdal/ogr/ogrct.cpp | 138 ++++- gdal/ogr/ogrfeature.cpp | 19 +- gdal/ogr/ogrgeometryfactory.cpp | 7 +- gdal/ogr/ogrsf_frmts/db2/ogrdb2datasource.cpp | 24 +- gdal/ogr/ogrsf_frmts/dxf/ogrdxf_leader.cpp | 4 +- gdal/ogr/ogrsf_frmts/dxf/ogrdxfdatasource.cpp | 2 +- gdal/ogr/ogrsf_frmts/dxf/ogrdxflayer.cpp | 2 +- gdal/ogr/ogrsf_frmts/dxf/ogrdxfreader.cpp | 70 ++- .../ogr/ogrsf_frmts/flatgeobuf/feature_generated.h | 2 - gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/base.h | 63 +- .../flatgeobuf/flatbuffers/code_generators.h | 10 +- .../flatgeobuf/flatbuffers/flatbuffers.h | 229 ++++++- .../flatgeobuf/flatbuffers/flexbuffers.h | 33 +- gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/grpc.h | 5 +- gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/idl.h | 125 +++- .../flatgeobuf/flatbuffers/minireflect.h | 25 +- .../flatgeobuf/flatbuffers/pch/flatc_pch.h | 39 ++ .../ogrsf_frmts/flatgeobuf/flatbuffers/pch/pch.h | 38 ++ .../flatgeobuf/flatbuffers/reflection.h | 31 +- .../flatgeobuf/flatbuffers/reflection_generated.h | 100 +++- .../flatgeobuf/flatbuffers/stl_emulation.h | 384 +++++++++++- gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/util.h | 15 + gdal/ogr/ogrsf_frmts/flatgeobuf/header_generated.h | 83 ++- .../flatgeobuf/ogrflatgeobufdataset.cpp | 2 + .../ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp | 60 +- gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonwriter.cpp | 6 +- .../ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp | 26 +- gdal/ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 15 +- .../ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 666 +++++++++++---------- .../ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 248 ++++---- gdal/ogr/ogrsf_frmts/mem/ogrmemdriver.cpp | 2 + gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp | 122 ++-- .../plscenes/ogrplscenesdatav1dataset.cpp | 6 +- gdal/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp | 46 +- gdal/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h | 10 +- .../ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp | 74 ++- gdal/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp | 12 +- .../ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp | 26 +- gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.cpp | 116 ++-- gdal/ogr/ogrsf_frmts/sqlite/ogrsqliteutility.h | 30 +- .../ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp | 5 +- gdal/ogr/ogrspatialreference.cpp | 253 +++++++- gdal/ogr/swq.cpp | 62 ++ gdal/ogr/swq_op_general.cpp | 26 + gdal/ogr/swq_parser.cpp | 362 +++++------ gdal/ogr/swq_parser.y | 42 +- gdal/perftests/computestatistics.py | 28 + gdal/port/cpl_aws.h | 2 + gdal/port/cpl_google_cloud.cpp | 63 +- gdal/port/cpl_google_cloud.h | 7 +- gdal/port/cpl_odbc.cpp | 2 + gdal/port/cpl_swift.cpp | 191 ++++-- gdal/port/cpl_swift.h | 11 +- gdal/port/cpl_vsi.h | 71 +-- gdal/port/cpl_vsi_virtual.h | 2 + gdal/port/cpl_vsil.cpp | 57 +- gdal/port/cpl_vsil_az.cpp | 2 + gdal/port/cpl_vsil_curl.cpp | 35 +- gdal/port/cpl_vsil_curl_class.h | 5 + gdal/port/cpl_vsil_gs.cpp | 453 +++++++++++++- gdal/port/cpl_vsil_s3.cpp | 247 +++++++- gdal/port/cpl_vsil_swift.cpp | 20 +- gdal/swig/include/MultiDimensional.i | 44 ++ gdal/swig/include/cpl.i | 3 + gdal/swig/include/gdalconst.i | 2 + gdal/swig/include/osr.i | 20 +- gdal/swig/include/python/gdal_python.i | 2 +- gdal/swig/include/python/typemaps_python.i | 27 +- gdal/swig/python/GNUmakefile | 21 +- gdal/swig/python/extensions/gdal_array_wrap.cpp | 1 + gdal/swig/python/extensions/gdal_wrap.cpp | 441 ++++++++++++-- gdal/swig/python/extensions/gdalconst_wrap.c | 2 + gdal/swig/python/extensions/gnm_wrap.cpp | 1 + gdal/swig/python/extensions/ogr_wrap.cpp | 19 +- gdal/swig/python/extensions/osr_wrap.cpp | 147 ++++- gdal/swig/python/gdal-utils/.gitignore | 2 + .../gdal-utils/osgeo_utils/auxiliary/base.py | 17 +- .../osgeo_utils/auxiliary/batch_creator.py | 2 +- .../osgeo_utils/auxiliary/color_palette.py | 185 +++--- .../osgeo_utils/auxiliary/color_table.py | 42 +- .../gdal-utils/osgeo_utils/auxiliary/util.py | 3 +- .../python/gdal-utils/osgeo_utils/gdal_calc.py | 4 +- .../osgeo_utils/samples/validate_gpkg.py | 10 + gdal/swig/python/osgeo/__init__.py | 5 +- gdal/swig/python/osgeo/gdal.py | 23 +- gdal/swig/python/osgeo/gdalconst.py | 1 + gdal/swig/python/osgeo/osr.py | 15 + 302 files changed, 11238 insertions(+), 3628 deletions(-) create mode 100644 autotest/alg/data/geoloc/latitude_including_pole.tif create mode 100644 autotest/alg/data/geoloc/longitude_including_pole.tif create mode 100644 autotest/gdrivers/data/netcdf/fake_ISO_METADATA.nc create mode 100644 autotest/ogr/data/flatgeobuf/test_ogr_flatgeobuf_coordinate_epoch.fgb create mode 100644 autotest/utilities/data/color_paletted_red_green_0-255.qml create mode 100644 autotest/utilities/data/color_paletted_red_green_0-255.txt create mode 100644 autotest/utilities/data/colro_pseudocolor_spectral_0-100.qml create mode 100644 autotest/utilities/data/colro_pseudocolor_spectral_0-100.txt create mode 100644 gdal/doc/images/sponsors/logo-FrontierSI.svg create mode 100644 gdal/doc/images/sponsors/logo-frontiersi.png create mode 100644 gdal/doc/source/development/rfc/rfc81_coordinate_epoch.rst create mode 100644 gdal/doc/source/development/rfc/rfc83_use_of_project_sponsorship.rst create mode 100644 gdal/doc/source/user/coordinate_epoch.rst create mode 100644 gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/flatc_pch.h create mode 100644 gdal/ogr/ogrsf_frmts/flatgeobuf/flatbuffers/pch/pch.h create mode 100644 gdal/perftests/computestatistics.py git reset --hard HEAD HEAD is now at a7d5db1b7c Merge pull request #4020 from rouault/update_plscenesconf 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 a7d5db1b7ce6e325fa29037728ddad24f7c6b83b 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)\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 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 447c0c6 Merge pull request #249 from constantinius/fix-issue-246 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 447c0c6848fd101c11e6d54e451037e571117ef1 cd E:\buildsystem