found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;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\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;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\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\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\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapserver-vc17x64 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc17x64 cd src\mapserver-vc17x64 git reset --hard HEAD HEAD is now at fde64a5ec Merge pull request #7049 from rouault/ci_more_parallel git fetch git checkout main Your branch is behind 'origin/main' by 2 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating fde64a5ec..d37504020 Fast-forward etc/mapserver-sample.conf | 9 + msautotest/config/6968.conf | 6 + msautotest/config/6968.map | 6 + msautotest/config/expected/6968_test001.txt | 7 + msautotest/config/expected/6968_test002.txt | 5 + msautotest/misc/ogrpen.map | 2 + msautotest/query/6907_01.conf | 6 + msautotest/query/6907_01.map | 32 ++ msautotest/query/6907_02.map | 30 ++ msautotest/query/expected/6907_01_test001.txt | 4 + msautotest/query/expected/6907_01_test002.txt | 4 + msautotest/query/expected/6907_01_test003.txt | 5 + msautotest/query/expected/6907_02_test001.txt | 4 + msautotest/query/expected/6907_02_test002.txt | 5 + msautotest/query/template/6907.tmpl | 3 + msautotest/sld/data/green.sld | 18 + msautotest/sld/data/mixed_styles.csv | 5 + msautotest/sld/data/multi_namedstyles.sld | 37 ++ msautotest/sld/data/raster.xml | 191 ++++++++ msautotest/sld/data/twostyles.sld | 34 ++ .../sld/expected/sld_styleitem_attribute.png | Bin 0 -> 1291 bytes msautotest/sld/expected/sld_styleitem_file.png | Bin 0 -> 4343 bytes .../sld/expected/sld_styleitem_file_blue.png | Bin 0 -> 3923 bytes .../sld/expected/sld_styleitem_file_getstyle.xml | 20 + .../sld_styleitem_file_getstyle_twostyles.xml | 37 ++ ...sld_styleitem_file_getstyle_twostyles_green.xml | 37 ++ .../sld/expected/sld_styleitem_file_green.png | Bin 0 -> 4343 bytes .../sld/expected/sld_styleitem_file_legend.png | Bin 0 -> 1287 bytes .../sld/expected/sld_styleitem_file_missing.png | Bin 0 -> 4570 bytes .../sld_styleitem_file_namedstyle_default.png | Bin 0 -> 3923 bytes .../sld_styleitem_file_namedstyle_first.png | Bin 0 -> 4343 bytes .../sld/expected/sld_styleitem_file_override.png | Bin 0 -> 4286 bytes .../sld/expected/sld_styleitem_file_raster.png | Bin 0 -> 7650 bytes .../sld_styleitem_file_twostyles_legend_blue.png | Bin 0 -> 881 bytes .../sld_styleitem_file_twostyles_legend_green.png | Bin 0 -> 1052 bytes msautotest/sld/sld_styleitem_attribute.map | 27 ++ msautotest/sld/sld_styleitem_file.map | 96 ++++ .../wms_get_map_mark_symbol_sld_legend.png | Bin 0 -> 1330 bytes msautotest/wxs/wms_sld.map | 1 + src/mapdraw.c | 5 +- src/mapfile.c | 32 +- src/maplayer.c | 14 +- src/mapogcsld.cpp | 487 ++++++++++++--------- src/mapogcsld.h | 1 + src/mapquery.c | 21 +- src/mapservutil.c | 80 ++-- src/maptemplate.c | 4 +- src/maptemplate.h | 4 +- 48 files changed, 1022 insertions(+), 257 deletions(-) create mode 100644 msautotest/config/6968.conf create mode 100644 msautotest/config/6968.map create mode 100644 msautotest/config/expected/6968_test001.txt create mode 100644 msautotest/config/expected/6968_test002.txt create mode 100644 msautotest/query/6907_01.conf create mode 100644 msautotest/query/6907_01.map create mode 100644 msautotest/query/6907_02.map create mode 100644 msautotest/query/expected/6907_01_test001.txt create mode 100644 msautotest/query/expected/6907_01_test002.txt create mode 100644 msautotest/query/expected/6907_01_test003.txt create mode 100644 msautotest/query/expected/6907_02_test001.txt create mode 100644 msautotest/query/expected/6907_02_test002.txt create mode 100644 msautotest/query/template/6907.tmpl create mode 100644 msautotest/sld/data/green.sld create mode 100644 msautotest/sld/data/mixed_styles.csv create mode 100644 msautotest/sld/data/multi_namedstyles.sld create mode 100644 msautotest/sld/data/raster.xml create mode 100644 msautotest/sld/data/twostyles.sld create mode 100644 msautotest/sld/expected/sld_styleitem_attribute.png create mode 100644 msautotest/sld/expected/sld_styleitem_file.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_blue.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_getstyle.xml create mode 100644 msautotest/sld/expected/sld_styleitem_file_getstyle_twostyles.xml create mode 100644 msautotest/sld/expected/sld_styleitem_file_getstyle_twostyles_green.xml create mode 100644 msautotest/sld/expected/sld_styleitem_file_green.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_legend.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_missing.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_namedstyle_default.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_namedstyle_first.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_override.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_raster.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_twostyles_legend_blue.png create mode 100644 msautotest/sld/expected/sld_styleitem_file_twostyles_legend_green.png create mode 100644 msautotest/sld/sld_styleitem_attribute.map create mode 100644 msautotest/sld/sld_styleitem_file.map create mode 100644 msautotest/wxs/expected/wms_get_map_mark_symbol_sld_legend.png git reset --hard HEAD HEAD is now at d37504020 Issues 6907 and 6968 (#7025) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\ms_revision.txt type E:\buildsystem\release-1930-x64\doc\ms_revision.txt d37504020f42d58b2e0387d00188743f72862253 cd E:\buildsystem git config --global core.autocrlf false if not exist src\gdal-vc17x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc17x64 cd src\gdal-vc17x64 git reset --hard HEAD HEAD is now at c24b95cc39 swq_select::expand_wildcard(): avoid unsigned integer overflow, and coverity warning about loop taken once git fetch git checkout master Your branch is behind 'origin/master' by 12 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating c24b95cc39..543cd3fd32 Fast-forward .github/workflows/asan/build.sh | 5 +- .github/workflows/asan/test.sh | 7 +- .github/workflows/linux_build.yml | 16 ++- .github/workflows/ubuntu_22.04/Dockerfile.ci | 1 + autotest/gcore/tiff_write.py | 3 + autotest/lsan_suppressions.txt | 1 + autotest/osr/osr_basic.py | 6 + autotest/pyscripts/test_gdal_calc.py | 7 ++ autotest/pyscripts/test_gdal_edit.py | 4 + autotest/pyscripts/test_gdal_pansharpen.py | 4 + autotest/pyscripts/test_ogrmerge.py | 4 + autotest/requirements.txt | 2 + frmts/ogcapi/gdalogcapidataset.cpp | 1 + gcore/overview.cpp | 8 +- ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp | 62 ++++++---- ogr/ogrsf_frmts/openfilegdb/CMakeLists.txt | 21 ++++ .../openfilegdb/ogropenfilegdb_generate_uuid.cpp | 134 +++++++++++++++++++++ .../openfilegdb/ogropenfilegdbdatasource_write.cpp | 104 ---------------- 18 files changed, 251 insertions(+), 139 deletions(-) create mode 100644 ogr/ogrsf_frmts/openfilegdb/ogropenfilegdb_generate_uuid.cpp git reset --hard HEAD HEAD is now at 543cd3fd32 Merge pull request #9454 from rouault/ci_asan git log --pretty=format:%H -n 1 > E:\buildsystem\release-1930-x64\doc\gdal_revision.txt type E:\buildsystem\release-1930-x64\doc\gdal_revision.txt 543cd3fd32ba917785e92f024ea7971cb4fcd26d cd E:\buildsystem set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.36.32532\bin\HostX64\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\VCPackages;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer;C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\bin\Roslyn;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools\x64;C:\Program Files\Microsoft Visual Studio\2022\Community\Team Tools\Performance Tools;C:\Program Files (x86)\Microsoft Visual Studio\Shared\Common\VSPerfCollectionTools\vs2019\\x64;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\x64\;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\Tools;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\Microsoft Visual Studio\2022\Community\\MSBuild\Current\Bin\amd64;C:\Windows\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\;C:\Program Files\Microsoft Visual Studio\2022\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\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\VC\Linux\bin\ConnectionManagerExe git config --global core.autocrlf false if not exist src\mapcache-vc17x64 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc17x64 cd src\mapcache-vc17x64 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-1930-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1930-x64\doc\mapcache_revision.txt 7104eca2140bb4657d3e9dcadd5ba14d46a5a371 cd E:\buildsystem