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 8675932fd Merge pull request #7022 from MapServer/dependabot/github_actions/pre-commit/action-3.0.1 git fetch git checkout main Your branch is behind 'origin/main' by 3 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin main Updating 8675932fd..6e71c5686 Fast-forward .github/workflows/codeql.yml | 1 + msautotest/query/expected/template_test003.html | 12 + msautotest/query/expected/template_test004.json | 5 + msautotest/query/expected/template_test005.html | 8 + msautotest/query/template.map | 27 ++ msautotest/query/template/feature_includes.tmpl | 7 + msautotest/query/template/feature_json.tmpl | 4 + .../query/template/feature_missing_include.tmpl | 8 + msautotest/query/template/item.tmpl | 8 + msautotest/query/template/item_json.tmpl | 2 + msautotest/sld/expected/map_linemark.png | Bin 41005 -> 48289 bytes msautotest/sld/expected/sld_linemark.png | Bin 41005 -> 48289 bytes msautotest/sld/expected/sld_url_linemark.png | Bin 41005 -> 48289 bytes src/mapcairo.c | 10 +- src/maptemplate.c | 277 +++++++++++---------- 15 files changed, 234 insertions(+), 135 deletions(-) create mode 100644 msautotest/query/expected/template_test003.html create mode 100644 msautotest/query/expected/template_test004.json create mode 100644 msautotest/query/expected/template_test005.html create mode 100644 msautotest/query/template/feature_includes.tmpl create mode 100644 msautotest/query/template/feature_json.tmpl create mode 100644 msautotest/query/template/feature_missing_include.tmpl create mode 100644 msautotest/query/template/item.tmpl create mode 100644 msautotest/query/template/item_json.tmpl git reset --hard HEAD HEAD is now at 6e71c5686 Allow includes in feature templates (#7020) 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 6e71c5686bea28c83cd9abe2eb2b14065252ff92 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 0cd5199652 Merge pull request #9250 from rouault/fix_9225 git fetch git checkout master Your branch is behind 'origin/master' by 21 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 0cd5199652..216ab6a45c Fast-forward .../layer_with_same_name_on_different_pages.pdf | Bin 0 -> 100215 bytes autotest/gdrivers/ecw.py | 60 +++++ autotest/gdrivers/jp2kak.py | 59 ++++- autotest/gdrivers/jp2openjpeg.py | 59 +++++ autotest/gdrivers/pdf.py | 42 ++++ autotest/osr/osr_xml.py | 56 +++++ doc/source/programs/gdal_grid.rst | 3 + doc/source/programs/gdal_translate.rst | 3 +- doc/source/programs/gdaltransform.rst | 4 +- frmts/ecw/ecwcreatecopy.cpp | 25 +- frmts/jp2kak/jp2kakdataset.cpp | 46 +++- frmts/jp2lura/jp2luradataset.cpp | 15 +- frmts/opjlike/jp2opjlikedataset.cpp | 16 +- frmts/pdf/gdal_pdf.h | 33 ++- frmts/pdf/pdfdataset.cpp | 261 ++++++++++++++++++--- frmts/vrt/vrtdataset.cpp | 28 +-- frmts/vrt/vrtdataset.h | 42 ++-- frmts/vrt/vrtderivedrasterband.cpp | 42 ++-- frmts/vrt/vrtdriver.cpp | 2 +- frmts/vrt/vrtfilters.cpp | 4 +- frmts/vrt/vrtmultidim.cpp | 6 +- frmts/vrt/vrtpansharpened.cpp | 15 +- frmts/vrt/vrtrasterband.cpp | 19 +- frmts/vrt/vrtrawrasterband.cpp | 2 +- frmts/vrt/vrtsourcedrasterband.cpp | 4 +- frmts/vrt/vrtsources.cpp | 30 ++- frmts/vrt/vrtwarped.cpp | 12 +- gcore/gdal_misc.cpp | 6 +- gcore/gdal_pam.h | 4 +- gcore/gdal_priv.h | 2 +- gcore/gdaljp2metadata.cpp | 68 +++--- gcore/gdaljp2metadata.h | 2 + gcore/gdalpamdataset.cpp | 48 ++-- gcore/gdalpamrasterband.cpp | 43 ++-- ogr/ogr_srs_xml.cpp | 7 +- 35 files changed, 819 insertions(+), 249 deletions(-) create mode 100644 autotest/gdrivers/data/pdf/layer_with_same_name_on_different_pages.pdf git reset --hard HEAD HEAD is now at 216ab6a45c Merge pull request #9333 from jidanni/patch-28 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 216ab6a45c1f009ca4a1404a1cbf5be92c34afca 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