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:\Users\szekeres\.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 git clone -b master https://github.com/mapserver/mapserver.git src\mapserver cd src\mapserver git reset --hard HEAD HEAD is now at 20b7671f Document imageObj and hashTableObj (#6168) git fetch git checkout master Your branch is up to date with 'origin/master'. git pull origin master Already up to date. git reset --hard HEAD HEAD is now at 20b7671f Document imageObj and hashTableObj (#6168) git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928\doc\ms_revision.txt type E:\buildsystem\release-1928\doc\ms_revision.txt 20b7671f788952c6097ae154b667dd564cf70764 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 d0b70c2fdb Merge pull request #3369 from pciphelippeneveu/pcidsk_fuzzer_fixes git fetch git checkout master Your branch is behind 'origin/master' by 13 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating d0b70c2fdb..28306791ed Fast-forward autotest/gcore/tiff_read.py | 8 +- .../gdrivers/data/dimap2/{ => bundle}/DIM_foo.XML | 0 autotest/gdrivers/data/dimap2/bundle/DIM_foo2.XML | 241 ++++++++++++++ .../gdrivers/data/dimap2/bundle/IMG_foo2_R1C1.TIF | Bin 0 -> 1506 bytes .../gdrivers/data/dimap2/bundle/IMG_foo2_R2C1.TIF | Bin 0 -> 1306 bytes .../data/dimap2/{ => bundle}/IMG_foo_R1C1.TIF | Bin .../data/dimap2/{ => bundle}/IMG_foo_R2C1.TIF | Bin .../gdrivers/data/dimap2/{ => bundle}/RPC_foo.XML | 0 .../data/dimap2/{ => bundle}/STRIP_foo_DIM.XML | 0 autotest/gdrivers/data/dimap2/bundle/VOL_PHR.XML | 28 ++ .../data/dimap2/single_component/DIM_foo.XML | 319 ++++++++++++++++++ .../data/dimap2/single_component/IMG_foo_R1C1.TIF | Bin 0 -> 1986 bytes .../data/dimap2/single_component/IMG_foo_R2C1.TIF | Bin 0 -> 1186 bytes .../data/dimap2/single_component/RPC_foo.XML | 119 +++++++ .../data/dimap2/single_component/STRIP_foo_DIM.XML | 28 ++ .../data/dimap2/{ => single_component}/VOL_PHR.XML | 0 autotest/gdrivers/dimap.py | 38 ++- .../pyscripts/{test_rgb2pct.py => test_pct.py} | 57 +++- gdal/doc/source/drivers/raster/dimap.rst | 6 +- gdal/doc/source/drivers/raster/wms.rst | 1 + gdal/doc/source/programs/gdal_calc.rst | 5 + gdal/doc/source/programs/gdalattachpct.rst | 47 +++ gdal/doc/source/programs/index.rst | 2 + gdal/doc/source/programs/rgb2pct.rst | 11 +- gdal/frmts/dimap/dimapdataset.cpp | 71 +++- gdal/frmts/ogcapi/gdalogcapidataset.cpp | 66 +++- gdal/frmts/wms/gdalhttp.cpp | 6 + gdal/frmts/wms/gdalwmsdataset.cpp | 7 + gdal/frmts/wms/gdalwmsrasterband.cpp | 35 +- gdal/frmts/wms/minidriver_ogcapicoverage.cpp | 4 + gdal/frmts/wms/wmsdriver.h | 3 +- .../python/osgeo/utils/auxiliary/color_palette.py | 364 +++++++++++++++++++++ .../python/osgeo/utils/auxiliary/color_table.py | 114 +++++++ gdal/swig/python/osgeo/utils/auxiliary/util.py | 3 +- gdal/swig/python/osgeo/utils/gdal_calc.py | 8 +- .../attachpct.py => osgeo/utils/gdalattachpct.py} | 67 +++- gdal/swig/python/osgeo/utils/pct2rgb.py | 45 ++- gdal/swig/python/osgeo/utils/rgb2pct.py | 35 +- gdal/swig/python/samples/README.md | 4 - gdal/swig/python/scripts/gdalattachpct.py | 11 + 40 files changed, 1628 insertions(+), 125 deletions(-) rename autotest/gdrivers/data/dimap2/{ => bundle}/DIM_foo.XML (100%) create mode 100644 autotest/gdrivers/data/dimap2/bundle/DIM_foo2.XML create mode 100644 autotest/gdrivers/data/dimap2/bundle/IMG_foo2_R1C1.TIF create mode 100644 autotest/gdrivers/data/dimap2/bundle/IMG_foo2_R2C1.TIF rename autotest/gdrivers/data/dimap2/{ => bundle}/IMG_foo_R1C1.TIF (100%) rename autotest/gdrivers/data/dimap2/{ => bundle}/IMG_foo_R2C1.TIF (100%) rename autotest/gdrivers/data/dimap2/{ => bundle}/RPC_foo.XML (100%) rename autotest/gdrivers/data/dimap2/{ => bundle}/STRIP_foo_DIM.XML (100%) create mode 100644 autotest/gdrivers/data/dimap2/bundle/VOL_PHR.XML create mode 100644 autotest/gdrivers/data/dimap2/single_component/DIM_foo.XML create mode 100644 autotest/gdrivers/data/dimap2/single_component/IMG_foo_R1C1.TIF create mode 100644 autotest/gdrivers/data/dimap2/single_component/IMG_foo_R2C1.TIF create mode 100644 autotest/gdrivers/data/dimap2/single_component/RPC_foo.XML create mode 100644 autotest/gdrivers/data/dimap2/single_component/STRIP_foo_DIM.XML rename autotest/gdrivers/data/dimap2/{ => single_component}/VOL_PHR.XML (100%) rename autotest/pyscripts/{test_rgb2pct.py => test_pct.py} (75%) create mode 100644 gdal/doc/source/programs/gdalattachpct.rst create mode 100644 gdal/swig/python/osgeo/utils/auxiliary/color_palette.py create mode 100644 gdal/swig/python/osgeo/utils/auxiliary/color_table.py rename gdal/swig/python/{samples/attachpct.py => osgeo/utils/gdalattachpct.py} (66%) mode change 100755 => 100644 create mode 100644 gdal/swig/python/scripts/gdalattachpct.py git reset --hard HEAD HEAD is now at 28306791ed Merge pull request #3131 from talos-gis/branch_color_extent git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928\doc\gdal_revision.txt type E:\buildsystem\release-1928\doc\gdal_revision.txt 28306791ede238f0076ae83c919d245a92907d6f 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:\Users\szekeres\.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 git clone -b master https://github.com/MapServer/mapcache.git src\mapcache cd src\mapcache git reset --hard HEAD HEAD is now at d8d7173 Merge pull request #241 from jmckenna/main git fetch git checkout master Your branch is up to date with 'origin/master'. git pull origin master 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