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.39.33519\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 (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\Microsoft Visual Studio\2022\Community\Team Tools\DiagnosticsHub\Collector;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 5d7fbf726 update history git fetch git checkout main Your branch is behind 'origin/main' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 5d7fbf726..96e8df8cf Fast-forward CMakeLists.txt | 4 +- msautotest/renderers/data/temperature.tif | Bin 0 -> 2979 bytes msautotest/renderers/expected/rasterlabel.png | Bin 0 -> 14990 bytes msautotest/renderers/expected/uvraster.pdf | Bin 11506 -> 0 bytes msautotest/renderers/expected/uvraster.svg | 534 ------- msautotest/renderers/expected/uvraster_reproj.pdf | Bin 10588 -> 0 bytes msautotest/renderers/expected/uvraster_reproj.svg | 490 ------ msautotest/renderers/rasterlabel.map | 37 + msautotest/renderers/uvraster.map | 2 - msautotest/renderers/uvraster_reproj.map | 2 - msautotest/wxs/expected/wms_getstyles2.xml | 27 + msautotest/wxs/wms_styles.map | 15 + src/mapdraw.c | 11 + src/mapfile.c | 4 +- src/maplayer.c | 3 + src/maplexer.c | 1699 +++++++++++---------- src/maplexer.l | 1 + src/mapogcsld.cpp | 6 +- src/maprasterlabel.cpp | 1001 ++++++++++++ src/mapserver.h | 14 +- src/{mapuvraster.c => mapuvraster.cpp} | 129 +- 21 files changed, 2033 insertions(+), 1946 deletions(-) create mode 100644 msautotest/renderers/data/temperature.tif create mode 100644 msautotest/renderers/expected/rasterlabel.png delete mode 100644 msautotest/renderers/expected/uvraster.pdf delete mode 100644 msautotest/renderers/expected/uvraster.svg delete mode 100644 msautotest/renderers/expected/uvraster_reproj.pdf delete mode 100644 msautotest/renderers/expected/uvraster_reproj.svg create mode 100644 msautotest/renderers/rasterlabel.map create mode 100644 msautotest/wxs/expected/wms_getstyles2.xml create mode 100644 src/maprasterlabel.cpp rename src/{mapuvraster.c => mapuvraster.cpp} (93%) git reset --hard HEAD HEAD is now at 96e8df8cf Merge pull request #7135 from rouault/rasterlabel 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 96e8df8cf1ea1a26e13d5b1eeb69a111581c87ed 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 33dd00c631 Add support for cumulative viewshed (#10674) git fetch git checkout master Your branch is behind 'origin/master' by 4 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 33dd00c631..462285a9e8 Fast-forward apps/gdal_rasterize_bin.cpp | 81 +--- apps/gdal_rasterize_lib.cpp | 959 ++++++++++++++++++------------------- apps/gdal_utils_priv.h | 2 + frmts/gtiff/libtiff/tif_dir.h | 9 +- frmts/gtiff/libtiff/tif_dirwrite.c | 2 +- frmts/netcdf/CMakeLists.txt | 6 - frmts/netcdf/netcdfdrivercore.cpp | 43 +- 7 files changed, 522 insertions(+), 580 deletions(-) git reset --hard HEAD HEAD is now at 462285a9e8 Merge pull request #10742 from rouault/netcdf_identify_hdf4_hdf5 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 462285a9e8101e630bb52a0c7651ce7247d06de7 cd E:\buildsystem set PATH=E:\buildsystem\release-1930-x64\bin;C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Tools\MSVC\14.39.33519\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 (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\Microsoft Visual Studio\2022\Community\Team Tools\DiagnosticsHub\Collector;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 339008f handle CMake deprecation warning (#342) 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 339008f3d010364a4c0489bb4b8f0dc68039ca79 cd E:\buildsystem