found 7zip in C:\Program Files\7-Zip\7z.exe set PATH=E:\buildsystem\release-1928-x64\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\HostX64\x64;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\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\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 (x86)\Microsoft Visual Studio\2019\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\2019\Community\\MSBuild\Current\Bin;C:\WINDOWS\Microsoft.NET\Framework64\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:\WINDOWS\system32\config\systemprofile\.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-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 59821b7c Merge pull request #6221 from MapServer-backport-bot/backport-6220-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 6043b99b Merge pull request #6227 from rouault/refresh_pr_4989 git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928-x64\doc\ms_revision.txt type E:\buildsystem\release-1928-x64\doc\ms_revision.txt 6043b99b88c449ce6d3a11443e2e97cb3be25281 cd E:\buildsystem if not exist src\gdal-vc16x64 git clone -b master https://github.com/OSGeo/gdal.git src\gdal-vc16x64 cd src\gdal-vc16x64 git reset --hard HEAD HEAD is now at 3a65330296 CI: Fix ShellCheck errors on ubuntu-20.04 (#3436) (#3438) git fetch git checkout master Your branch is behind 'origin/master' by 45 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 3a65330296..c31ea2ec27 Fast-forward CITATION | 4 +- autotest/alg/fillnodata.py | 132 +---- autotest/alg/warp.py | 186 +++--- autotest/cpp/test_cpl.cpp | 4 +- autotest/gcore/basic_test.py | 5 +- autotest/gcore/rfc30.py | 38 +- autotest/gcore/testnonboundtoswig.py | 18 +- autotest/gcore/tiff_read.py | 32 +- autotest/gcore/tiff_write.py | 7 +- autotest/gcore/vsicurl.py | 10 +- .../data/grib/one_value_and_nodata_points.grb2 | Bin 0 -> 253 bytes autotest/gdrivers/data/jpeg/flir/FLIR.jpg | Bin 0 -> 7338 bytes ..._l_emission_d_un_radiateur_a_travers_un_mur.jpg | Bin 0 -> 80825 bytes autotest/gdrivers/data/jpeg/flir/README.txt | 6 + autotest/gdrivers/ecw.py | 9 +- autotest/gdrivers/grib.py | 121 +++- autotest/gdrivers/jpeg.py | 101 ++++ autotest/gdrivers/memmultidim.py | 93 +-- autotest/gdrivers/tiff_profile.py | 11 +- autotest/gdrivers/wcs.py | 15 +- autotest/gdrivers/wms.py | 6 +- autotest/ogr/data/lvbag/vbo2.xml | 73 +++ autotest/ogr/data/lvbag/vbo3.xml | 77 +++ autotest/ogr/data/lvbag/vbo4.xml | 73 +++ autotest/ogr/ogr_basic_test.py | 7 +- autotest/ogr/ogr_csv.py | 9 +- autotest/ogr/ogr_dxf.py | 40 +- autotest/ogr/ogr_feature.py | 17 +- autotest/ogr/ogr_flatgeobuf.py | 5 +- autotest/ogr/ogr_geom.py | 11 +- autotest/ogr/ogr_gml_read.py | 9 +- autotest/ogr/ogr_gmlas.py | 15 +- autotest/ogr/ogr_lvbag.py | 120 ++-- autotest/ogr/ogr_openfilegdb.py | 26 +- autotest/ogr/ogr_pgdump.py | 13 +- autotest/ogr/ogr_rfc30.py | 39 +- autotest/ogr/ogr_s57.py | 6 +- autotest/ogr/ogr_shape.py | 15 +- autotest/ogr/ogr_sql_sqlite.py | 6 +- autotest/ogr/ogr_sql_test.py | 40 -- autotest/ogr/ogr_wfs.py | 6 +- autotest/pymod/gdaltest.py | 144 ++++- autotest/pymod/gdaltest_python2.py | 220 ------- autotest/pymod/gdaltest_python3.py | 199 ------- autotest/pymod/webserver.py | 34 +- autotest/pyscripts/test_gdal2tiles.py | 83 +-- autotest/pyscripts/test_gdal_edit.py | 5 +- autotest/pyscripts/test_gdal_ls_py.py | 14 +- autotest/utilities/test_gdaldem.py | 6 +- autotest/utilities/test_gdaldem_lib.py | 6 +- autotest/utilities/test_ogr2ogr_lib.py | 8 +- gdal/configure | 217 +++++-- gdal/configure.ac | 6 +- gdal/doc/source/drivers/raster/jpeg.rst | 21 + gdal/doc/source/drivers/raster/wms.rst | 6 +- gdal/doc/source/user/configoptions.rst | 3 + gdal/frmts/grib/gribcreatecopy.cpp | 14 +- gdal/frmts/gtiff/tif_lerc.c | 4 + gdal/frmts/jpeg/jpgdataset.cpp | 655 ++++++++++++++++++++- gdal/frmts/jpeg/jpgdataset.h | 15 +- gdal/frmts/mrf/BitMask2D.h | 8 +- gdal/frmts/wms/minidriver_virtualearth.cpp | 6 +- gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp | 18 +- gdal/ogr/ogrsf_frmts/lvbag/ogr_lvbag.h | 10 +- gdal/ogr/ogrsf_frmts/lvbag/ogrlvbaglayer.cpp | 108 +++- gdal/port/cpl_azure.cpp | 11 + gdal/port/cpl_azure.h | 2 + gdal/port/cpl_conv.cpp | 29 +- gdal/port/cpl_conv.h | 2 +- gdal/port/cpl_port.h | 20 +- gdal/port/cpl_vsil_az.cpp | 1 + gdal/port/cpl_vsil_curl.cpp | 4 +- gdal/port/cpl_vsil_curl_class.h | 1 + .../python/osgeo/utils/auxiliary/color_palette.py | 12 - .../python/osgeo/utils/auxiliary/color_table.py | 4 +- .../python/osgeo/utils/auxiliary/extent_util.py | 2 +- .../python/osgeo/utils/auxiliary/numpy_util.py | 2 +- gdal/swig/python/osgeo/utils/auxiliary/util.py | 14 +- 78 files changed, 1925 insertions(+), 1394 deletions(-) create mode 100644 autotest/gdrivers/data/grib/one_value_and_nodata_points.grb2 create mode 100644 autotest/gdrivers/data/jpeg/flir/FLIR.jpg create mode 100644 autotest/gdrivers/data/jpeg/flir/Image_thermique_de_l_emission_d_un_radiateur_a_travers_un_mur.jpg create mode 100644 autotest/gdrivers/data/jpeg/flir/README.txt create mode 100644 autotest/ogr/data/lvbag/vbo2.xml create mode 100644 autotest/ogr/data/lvbag/vbo3.xml create mode 100644 autotest/ogr/data/lvbag/vbo4.xml delete mode 100755 autotest/pymod/gdaltest_python2.py delete mode 100755 autotest/pymod/gdaltest_python3.py git reset --hard HEAD HEAD is now at c31ea2ec27 Merge pull request #3404 from talos-gis/utils_aux_fixes git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928-x64\doc\gdal_revision.txt type E:\buildsystem\release-1928-x64\doc\gdal_revision.txt c31ea2ec27d5954b6bb6720487f095c042a869b6 cd E:\buildsystem set PATH=E:\buildsystem\release-1928-x64\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\HostX64\x64;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\x64;C:\Program Files (x86)\Microsoft Visual Studio\2019\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 (x86)\Microsoft Visual Studio\2019\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\2019\Community\\MSBuild\Current\Bin;C:\WINDOWS\Microsoft.NET\Framework64\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:\WINDOWS\system32\config\systemprofile\.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-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-1928-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1928-x64\doc\mapcache_revision.txt d8d71730e4f03e0b56d1562e484ae0e35f37f96c cd E:\buildsystem