found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1928\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29333\bin\HostX86\x86;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\\MSBuild\Current\Bin;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2019\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\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe if not exist src\mapserver-7-6 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-7-6 cd src\mapserver-7-6 git reset --hard HEAD HEAD is now at dfdda8a1 update for 7.6.2 release git fetch git checkout main Your branch is behind 'origin/main' by 12 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 2bc7f625..82427cd0 Fast-forward .gitignore | 2 + mapgml.c | 111 +++++++++++---------- maplabel.c | 2 +- mapproject.c | 16 ++- msautotest/gdal/expected/nonsquare.png | Bin 5309 -> 5083 bytes msautotest/gdal/expected/rot_out.png | Bin 12931 -> 12854 bytes msautotest/misc/expected/attrbind_test001.png | Bin 4791 -> 4767 bytes msautotest/misc/expected/autostyle_quoted.png | Bin 7691 -> 7709 bytes msautotest/misc/expected/listexpression.png | Bin 6321 -> 6221 bytes msautotest/misc/expected/quoting.png | Bin 22088 -> 23097 bytes msautotest/misc/expected/rfc14.png | Bin 10656 -> 10541 bytes msautotest/misc/expected/shp2img-size.png | Bin 3159 -> 3135 bytes msautotest/pytest.ini | 2 +- msautotest/query/expected/text_test001.png | Bin 18912 -> 18900 bytes msautotest/query/expected/text_test002.png | Bin 19079 -> 19024 bytes msautotest/query/expected/text_test003.png | Bin 19803 -> 19756 bytes msautotest/query/expected/text_test004.png | Bin 19553 -> 19528 bytes msautotest/query/expected/text_test005.png | Bin 20072 -> 20014 bytes msautotest/query/expected/text_test006.png | Bin 20336 -> 20289 bytes msautotest/query/expected/text_test007.png | Bin 19098 -> 19057 bytes .../renderers/expected/baseline_text.cairo.png | Bin 1710 -> 1161 bytes msautotest/renderers/expected/baseline_text.pdf | Bin 2988 -> 2251 bytes msautotest/renderers/expected/baseline_text.png | Bin 1713 -> 1169 bytes msautotest/renderers/expected/baseline_text.svg | 3 +- .../renderers/expected/embed_sb_rgb.cairo.png | Bin 1305 -> 1283 bytes msautotest/renderers/expected/embed_sb_rgb.png | Bin 1300 -> 1288 bytes .../renderers/expected/embed_sb_rgb_tr.cairo.png | Bin 1336 -> 1300 bytes msautotest/renderers/expected/embed_sb_rgb_tr.png | Bin 1318 -> 1310 bytes .../renderers/expected/embed_sb_rgba.cairo.png | Bin 1394 -> 1368 bytes msautotest/renderers/expected/embed_sb_rgba.png | Bin 1371 -> 1369 bytes .../expected/embed_sb_rgba_offset.cairo.png | Bin 1394 -> 1369 bytes .../renderers/expected/embed_sb_rgba_offset.png | Bin 1373 -> 1372 bytes .../renderers/expected/embed_sb_rgba_tr.cairo.png | Bin 1021 -> 1013 bytes msautotest/renderers/expected/embed_sb_rgba_tr.png | Bin 1028 -> 1012 bytes .../expected/entity_encoded_follow_text.cairo.png | Bin 27197 -> 27199 bytes .../expected/entity_encoded_follow_text.pdf | Bin 59458 -> 59511 bytes .../expected/entity_encoded_follow_text.png | Bin 27949 -> 27900 bytes .../expected/entity_encoded_follow_text.svg | 4 +- msautotest/renderers/expected/grid.cairo.png | Bin 24216 -> 24236 bytes msautotest/renderers/expected/grid.pdf | Bin 18666 -> 18664 bytes msautotest/renderers/expected/grid.png | Bin 24440 -> 24456 bytes msautotest/renderers/expected/grid.svg | 52 +++++----- .../expected/label-align-center.cairo.png | Bin 2361 -> 2380 bytes .../renderers/expected/label-align-center.png | Bin 2406 -> 2382 bytes .../expected/label-align-default.cairo.png | Bin 2402 -> 2376 bytes .../renderers/expected/label-align-default.png | Bin 2432 -> 2426 bytes .../renderers/expected/label-align-left.cairo.png | Bin 2394 -> 2364 bytes msautotest/renderers/expected/label-align-left.png | Bin 2414 -> 2414 bytes .../renderers/expected/label-align-right.cairo.png | Bin 2403 -> 2377 bytes .../renderers/expected/label-align-right.png | Bin 2435 -> 2427 bytes .../renderers/expected/label-multifont.cairo.png | Bin 4810 -> 4757 bytes msautotest/renderers/expected/label-multifont.pdf | Bin 13471 -> 13520 bytes msautotest/renderers/expected/label-multifont.png | Bin 4878 -> 4813 bytes msautotest/renderers/expected/label-multifont.svg | 4 +- .../renderers/expected/label_align_attribute.png | Bin 14396 -> 14443 bytes .../expected/label_ar-align-center.cairo.png | Bin 1320 -> 1309 bytes .../renderers/expected/label_ar-align-center.png | Bin 1357 -> 1346 bytes .../expected/label_ar-align-default.cairo.png | Bin 1347 -> 1333 bytes .../renderers/expected/label_ar-align-default.png | Bin 1355 -> 1369 bytes .../expected/label_ar-align-left.cairo.png | Bin 1329 -> 1324 bytes .../renderers/expected/label_ar-align-left.png | Bin 1344 -> 1353 bytes .../expected/label_ar-align-right.cairo.png | Bin 1347 -> 1333 bytes .../renderers/expected/label_ar-align-right.png | Bin 1355 -> 1369 bytes .../expected/label_latin_align_center.png | Bin 2379 -> 2339 bytes .../expected/label_latin_align_default.png | Bin 2374 -> 2356 bytes .../renderers/expected/label_latin_align_left.png | Bin 2374 -> 2356 bytes .../renderers/expected/label_latin_align_right.png | Bin 2361 -> 2338 bytes .../renderers/expected/label_offset_attribute.png | Bin 14368 -> 14427 bytes .../renderers/expected/labelcacheoff.cairo.png | Bin 11298 -> 11289 bytes msautotest/renderers/expected/labelcacheoff.pdf | Bin 9261 -> 9258 bytes msautotest/renderers/expected/labelcacheoff.png | Bin 11395 -> 11437 bytes msautotest/renderers/expected/labelcacheoff.svg | 2 +- msautotest/renderers/expected/labelpnt.cairo.png | Bin 5113 -> 5128 bytes msautotest/renderers/expected/labelpnt.pdf | Bin 9674 -> 9686 bytes msautotest/renderers/expected/labelpnt.png | Bin 5157 -> 5086 bytes msautotest/renderers/expected/labelpnt.svg | 8 +- msautotest/renderers/expected/labelrot.cairo.png | Bin 13772 -> 13879 bytes msautotest/renderers/expected/labelrot.pdf | Bin 23538 -> 23473 bytes msautotest/renderers/expected/labelrot.png | Bin 13550 -> 13582 bytes msautotest/renderers/expected/labelrot.svg | 8 +- .../renderers/expected/labels-anno.cairo.png | Bin 14138 -> 14163 bytes msautotest/renderers/expected/labels-anno.pdf | Bin 38771 -> 38719 bytes msautotest/renderers/expected/labels-anno.png | Bin 13894 -> 13863 bytes msautotest/renderers/expected/labels-anno.svg | 36 +++---- .../renderers/expected/labels-bitmap-multiline.png | Bin 4676 -> 4592 bytes msautotest/renderers/expected/labels-bitmap.png | Bin 2927 -> 2880 bytes .../renderers/expected/labels-leader.cairo.png | Bin 11844 -> 11879 bytes msautotest/renderers/expected/labels-leader.pdf | Bin 35646 -> 35639 bytes msautotest/renderers/expected/labels-leader.png | Bin 11932 -> 11951 bytes msautotest/renderers/expected/labels-leader.svg | 18 ++-- .../expected/labels-min-distance.cairo.png | Bin 37084 -> 37174 bytes .../renderers/expected/labels-min-distance.pdf | Bin 30496 -> 30493 bytes .../renderers/expected/labels-min-distance.png | Bin 37826 -> 37799 bytes .../renderers/expected/labels-min-distance.svg | 20 ++-- msautotest/renderers/expected/labels-wrap.png | Bin 16210 -> 16108 bytes msautotest/renderers/expected/labels.cairo.png | Bin 12481 -> 12541 bytes msautotest/renderers/expected/labels.pdf | Bin 34582 -> 34578 bytes msautotest/renderers/expected/labels.png | Bin 12273 -> 12279 bytes msautotest/renderers/expected/labels.svg | 32 +++--- .../renderers/expected/lots_of_text.cairo.png | Bin 115894 -> 116695 bytes msautotest/renderers/expected/lots_of_text.png | Bin 113073 -> 110149 bytes .../renderers/expected/multilabel-leader.cairo.png | Bin 41968 -> 41855 bytes .../renderers/expected/multilabel-leader.pdf | Bin 46341 -> 46313 bytes .../renderers/expected/multilabel-leader.png | Bin 41979 -> 41849 bytes .../renderers/expected/multilabel-leader.svg | 100 +++++++++---------- msautotest/renderers/expected/multilabel.cairo.png | Bin 5560 -> 5414 bytes msautotest/renderers/expected/multilabel.pdf | Bin 16546 -> 16524 bytes msautotest/renderers/expected/multilabel.png | Bin 5620 -> 5506 bytes msautotest/renderers/expected/multilabel.svg | 16 +-- .../poly-label-multiline-pos-auto.cairo.png | Bin 8482 -> 8493 bytes .../expected/poly-label-multiline-pos-auto.pdf | Bin 22433 -> 22363 bytes .../expected/poly-label-multiline-pos-auto.png | Bin 8545 -> 8522 bytes .../expected/poly-label-multiline-pos-auto.svg | 14 +-- .../expected/poly-label-pos-auto.cairo.png | Bin 4261 -> 4234 bytes .../renderers/expected/poly-label-pos-auto.pdf | Bin 8049 -> 8085 bytes .../renderers/expected/poly-label-pos-auto.png | Bin 4064 -> 4055 bytes .../renderers/expected/poly-label-pos-auto.svg | 14 +-- .../renderers/expected/polygon-simple.cairo.png | Bin 4350 -> 4325 bytes msautotest/renderers/expected/polygon-simple.pdf | Bin 8665 -> 8598 bytes msautotest/renderers/expected/polygon-simple.png | Bin 4373 -> 4327 bytes msautotest/renderers/expected/polygon-simple.svg | 4 +- .../renderers/expected/resolution_text_1.png | Bin 476 -> 444 bytes .../renderers/expected/resolution_text_2.png | Bin 943 -> 929 bytes .../renderers/expected/resolution_text_4.png | Bin 1947 -> 1968 bytes .../renderers/expected/text_shaping_1.cairo.png | Bin 4987 -> 4974 bytes msautotest/renderers/expected/text_shaping_1.pdf | Bin 13287 -> 13289 bytes msautotest/renderers/expected/text_shaping_1.png | Bin 5037 -> 5056 bytes msautotest/renderers/expected/text_shaping_1.svg | 2 +- msautotest/sld/expected/map_label.png | Bin 71382 -> 71422 bytes msautotest/sld/expected/map_style_text.png | Bin 7762 -> 7664 bytes msautotest/sld/expected/sld_label_function.png | Bin 80455 -> 80287 bytes msautotest/sld/expected/sld_label_literal.png | Bin 88070 -> 88139 bytes msautotest/sld/expected/sld_label_mixed.png | Bin 100922 -> 100755 bytes msautotest/sld/expected/sld_label_property.png | Bin 87574 -> 87503 bytes msautotest/sld/expected/sld_label_raw.png | Bin 88070 -> 88139 bytes .../expected/wfs_postgis_10f_precision_gml2.xml | 50 ++++++++++ .../expected/wfs_postgis_10f_precision_gml3.xml | 51 ++++++++++ .../expected/wfs_postgis_precision_web_4f_gml2.xml | 50 ++++++++++ .../expected/wfs_postgis_precision_web_4f_gml3.xml | 51 ++++++++++ ...wfs_postgis_precision_web_4f_layer_10f_gml3.xml | 51 ++++++++++ msautotest/wxs/expected/wms_filter_getmap130.png | Bin 33679 -> 32893 bytes .../wxs/expected/wms_filter_getmap130_dwithin2.png | Bin 5925 -> 6091 bytes .../expected/wms_filter_getmap130_emptyfilter.png | Bin 12637 -> 12665 bytes .../wms_filter_getmap130_group_and_layer.png | Bin 26558 -> 25602 bytes .../expected/wms_filter_getmap130_one_group.png | Bin 24653 -> 23867 bytes .../wms_filter_getmap130_propertyequalto.png | Bin 2915 -> 2938 bytes ...s_get_map_multi_layers_one_sld_on_one_layer.png | Bin 20558 -> 19644 bytes ...p_multi_layers_one_sld_on_one_layer_postgis.png | Bin 20558 -> 19644 bytes ...j_to_3857_non_square_pixels_beyond_validity.png | Bin 26525 -> 26655 bytes ...eproj_to_3857_square_pixels_beyond_validity.png | Bin 26412 -> 26616 bytes ...eproj_to_3857_square_pixels_within_validity.png | Bin 36465 -> 36760 bytes msautotest/wxs/expected/wms_inspire_map_all.png | Bin 11101 -> 11118 bytes .../wxs/expected/wms_inspire_map_all_style1.png | Bin 11101 -> 11118 bytes .../wxs/expected/wms_inspire_map_all_style2.png | Bin 11101 -> 11118 bytes .../wms_inspire_map_commontransportelements.png | Bin 7733 -> 7709 bytes .../wms_inspire_map_railtransportnetwork.png | Bin 5200 -> 5160 bytes .../wxs/expected/wms_inspire_map_railwayarea.png | Bin 4028 -> 3944 bytes .../wxs/expected/wms_inspire_map_railwaylink.png | Bin 4365 -> 4287 bytes .../wms_inspire_map_railwaystationarea.png | Bin 2879 -> 2878 bytes .../expected/wms_inspire_map_railwayyardarea.png | Bin 2704 -> 2693 bytes .../wxs/expected/wms_inspire_map_roadarea.png | Bin 6101 -> 6103 bytes .../wxs/expected/wms_inspire_map_roadlink.png | Bin 5880 -> 5866 bytes .../expected/wms_inspire_map_roadservicearea.png | Bin 2599 -> 2588 bytes .../wms_inspire_map_roadtransportnetwork.png | Bin 7657 -> 7656 bytes .../wxs/expected/wms_inspire_map_transportarea.png | Bin 7299 -> 7264 bytes .../wms_inspire_map_transportarea_style1.png | Bin 7645 -> 7578 bytes .../wms_inspire_map_transportarea_style2.png | Bin 7299 -> 7264 bytes .../wxs/expected/wms_inspire_map_transportlink.png | Bin 7622 -> 7548 bytes .../wxs/expected/wms_inspire_map_transportnode.png | Bin 3381 -> 3372 bytes .../wms_inspire_map_vehicletrafficarea.png | Bin 4874 -> 4893 bytes .../wxs/expected/wms_layer_groups_map_all.png | Bin 2278 -> 2303 bytes .../wxs/expected/wms_layer_groups_map_g1.png | Bin 1372 -> 1381 bytes .../wxs/expected/wms_layer_groups_map_g2sg3l1.png | Bin 1139 -> 1150 bytes .../wxs/expected/wms_layer_groups_map_g3.png | Bin 1567 -> 1568 bytes .../wxs/expected/wms_layer_groups_map_sg1.png | Bin 1220 -> 1229 bytes .../wxs/expected/wms_layer_groups_map_sg2.png | Bin 1101 -> 1101 bytes msautotest/wxs/expected/wms_ogr_native.png | Bin 2530 -> 2552 bytes .../wxs/expected/wms_ogr_native_sql_data.png | Bin 2530 -> 2552 bytes msautotest/wxs/wfs_postgis_10f_precision.map | 70 +++++++++++++ msautotest/wxs/wfs_postgis_4f_precision.map | 99 ++++++++++++++++++ 180 files changed, 667 insertions(+), 225 deletions(-) create mode 100644 msautotest/wxs/expected/wfs_postgis_10f_precision_gml2.xml create mode 100644 msautotest/wxs/expected/wfs_postgis_10f_precision_gml3.xml create mode 100644 msautotest/wxs/expected/wfs_postgis_precision_web_4f_gml2.xml create mode 100644 msautotest/wxs/expected/wfs_postgis_precision_web_4f_gml3.xml create mode 100644 msautotest/wxs/expected/wfs_postgis_precision_web_4f_layer_10f_gml3.xml create mode 100644 msautotest/wxs/wfs_postgis_10f_precision.map create mode 100644 msautotest/wxs/wfs_postgis_4f_precision.map git reset --hard HEAD HEAD is now at 82427cd0 Merge pull request #6209 from Orbit-GT-Belgium/wfs_geometry_precision git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928\doc\ms_revision.txt type E:\buildsystem\release-1928\doc\ms_revision.txt 82427cd030aeb15fc77eba8284d9d85fd402404f cd E:\buildsystem if not exist src\gdal-vc16 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc16 cd src\gdal-vc16 git reset --hard HEAD HEAD is now at c171912aba Merge pull request #3384 from rouault/configfile git fetch git checkout master Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating c171912aba..f6689b6533 Fast-forward .github/workflows/{conda.yml.dis => conda.yml} | 0 autotest/gdrivers/daas.py | 370 ++++----- autotest/gdrivers/daas_real_instance.py | 58 ++ .../data/dimap2/vhr2020_ms_fs/MS-FS/DIM_MS-FS.XML | 925 +++++++++++++++++++++ .../dimap2/vhr2020_ms_fs/MS-FS/IMG_NED_R1C1.TIF | Bin 0 -> 20902 bytes .../dimap2/vhr2020_ms_fs/MS-FS/IMG_RGB_R1C1.TIF | Bin 0 -> 20898 bytes .../data/dimap2/vhr2020_ms_fs/VOL_PNEO.XML | 57 ++ autotest/gdrivers/dimap.py | 12 + autotest/gdrivers/mrf.py | 38 +- autotest/gdrivers/wms.py | 70 +- gdal/doc/source/drivers/raster/daas.rst | 8 +- gdal/doc/source/drivers/raster/dimap.rst | 4 +- gdal/frmts/daas/daasdataset.cpp | 59 +- gdal/frmts/dimap/dimapdataset.cpp | 232 ++++-- gdal/frmts/mrf/LERC_band.cpp | 7 +- gdal/frmts/mrf/marfa.h | 1 + gdal/frmts/mrf/mrf_util.cpp | 11 +- gdal/frmts/wms/gdalwmsdataset.cpp | 30 +- gdal/frmts/wms/minidriver_tiled_wms.cpp | 10 +- gdal/frmts/wms/wmsdriver.h | 5 + gdal/port/cpl_multiproc.cpp | 84 +- 21 files changed, 1573 insertions(+), 408 deletions(-) rename .github/workflows/{conda.yml.dis => conda.yml} (100%) create mode 100755 autotest/gdrivers/daas_real_instance.py create mode 100644 autotest/gdrivers/data/dimap2/vhr2020_ms_fs/MS-FS/DIM_MS-FS.XML create mode 100644 autotest/gdrivers/data/dimap2/vhr2020_ms_fs/MS-FS/IMG_NED_R1C1.TIF create mode 100644 autotest/gdrivers/data/dimap2/vhr2020_ms_fs/MS-FS/IMG_RGB_R1C1.TIF create mode 100644 autotest/gdrivers/data/dimap2/vhr2020_ms_fs/VOL_PNEO.XML git reset --hard HEAD HEAD is now at f6689b6533 Make creation of global hCOAMutex thread-safer on Windows (#3399) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928\doc\gdal_revision.txt type E:\buildsystem\release-1928\doc\gdal_revision.txt f6689b653338502de4150f491864553894c37410 cd E:\buildsystem set PATH=E:\buildsystem\release-1928\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\\Extensions\Microsoft\IntelliCode\CLI;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.28.29333\bin\HostX86\x86;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\bin\Roslyn;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.0\x86;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\\MSBuild\Current\Bin;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio\2019\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\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe if not exist src\mapcache-main git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-main cd src\mapcache-main git reset --hard HEAD HEAD is now at d8d7173 Merge pull request #241 from jmckenna/main 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-1928\doc\mapcache_revision.txt type E:\buildsystem\release-1928\doc\mapcache_revision.txt d8d71730e4f03e0b56d1562e484ae0e35f37f96c cd E:\buildsystem