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)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.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:\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\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja 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 035df09e Merge pull request #6207 from MapServer-backport-bot/backport-6206-to-branch-7-6 git fetch git checkout main Your branch is up to date with 'origin/main'. git pull origin main Already up to date. git reset --hard HEAD HEAD is now at 2ac5a255 Merge pull request #6206 from jmckenna/build-status 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 2ac5a255554fee9cf9241fa6f22234646f833e63 cd E:\buildsystem 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 4cdb36c427 Merge pull request #3363 from rouault/netcdf_vsimem git fetch git checkout master Your branch is behind 'origin/master' by 23 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 4cdb36c427..d7a1fea1c8 Fast-forward autotest/gcore/cog.py | 5 +- autotest/gcore/tiff_read.py | 8 +- autotest/gcore/tiff_write.py | 3 +- .../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 ++- autotest/gdrivers/gpkg.py | 5 +- autotest/gdrivers/jp2lura.py | 13 +- autotest/gdrivers/test_validate_jp2.py | 21 +- autotest/ogr/ogr_gpkg.py | 5 +- autotest/pymod/test_py_scripts.py | 27 +- autotest/pyscripts/test_gdal2tiles.py | 30 +- autotest/pyscripts/test_gdal_calc.py | 4 +- autotest/pyscripts/test_gdal_edit.py | 22 +- autotest/pyscripts/test_gdal_fillnodata.py | 7 +- autotest/pyscripts/test_gdal_ls_py.py | 10 +- autotest/pyscripts/test_gdal_merge.py | 2 +- autotest/pyscripts/test_gdal_pansharpen.py | 6 +- autotest/pyscripts/test_gdal_polygonize.py | 10 +- autotest/pyscripts/test_gdal_proximity.py | 15 +- autotest/pyscripts/test_gdal_retile.py | 8 +- autotest/pyscripts/test_gdal_sieve.py | 4 +- autotest/pyscripts/test_gdalinfo_py.py | 42 +-- autotest/pyscripts/test_gdalmove.py | 6 +- autotest/pyscripts/test_ogr2ogr_py.py | 110 +++---- autotest/pyscripts/test_ogrinfo_py.py | 22 +- autotest/pyscripts/test_ogrmerge.py | 38 +-- .../pyscripts/{test_rgb2pct.py => test_pct.py} | 69 +++- gdal/configure | 28 -- gdal/configure.ac | 14 - 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/gtiff/libtiff/tif_config.h | 29 +- gdal/frmts/gtiff/libtiff/tif_dir.c | 2 +- gdal/frmts/gtiff/libtiff/tif_dirread.c | 9 +- gdal/frmts/gtiff/libtiff/tif_ojpeg.c | 10 +- gdal/frmts/gtiff/libtiff/tif_pixarlog.c | 2 +- gdal/frmts/gtiff/libtiff/tif_predict.c | 2 +- gdal/frmts/gtiff/libtiff/tif_webp.c | 2 +- gdal/frmts/gtiff/libtiff/tif_zip.c | 2 +- gdal/frmts/ogcapi/gdalogcapidataset.cpp | 66 +++- gdal/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp | 10 + .../pcidsk/sdk/channel/cbandinterleavedchannel.cpp | 15 +- gdal/frmts/pcidsk/sdk/channel/ctiledchannel.cpp | 6 + gdal/frmts/pcidsk/sdk/core/cpcidskfile.cpp | 7 + 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 +- gdal/port/cpl_vsil_curl.cpp | 17 +- gdal/swig/python/README.rst | 2 +- .../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/samples/ogr2ogr.py | 2 +- gdal/swig/python/scripts/gdalattachpct.py | 11 + gdal/swig/python/setup.py | 12 +- 81 files changed, 1927 insertions(+), 424 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} (68%) 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 d7a1fea1c8 Merge pull request #3385 from rouault/libtiff_c99 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 d7a1fea1c83341e21077c18fd18fb79358ea05b2 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)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\FSharp\;C:\Program Files (x86)\Windows Kits\10\bin\10.0.17763.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:\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\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\CommonExtensions\Microsoft\CMake\Ninja 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-1916-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1916-x64\doc\mapcache_revision.txt d8d71730e4f03e0b56d1562e484ae0e35f37f96c cd E:\buildsystem