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 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-x64\doc\ms_revision.txt type E:\buildsystem\release-1928-x64\doc\ms_revision.txt 20b7671f788952c6097ae154b667dd564cf70764 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 53960d2a40 Merge pull request #3354 from msterk/fix-gdaledit-error-handling 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 53960d2a40..4cdb36c427 Fast-forward .github/workflows/code_checks.yml | 2 +- .github/workflows/windows_build.yml | 1 + autotest/alg/warp.py | 9 +- autotest/gcore/gdal_stats.py | 2 +- autotest/gcore/numpy_rw.py | 101 +-- autotest/gcore/numpy_rw_multidim.py | 16 +- autotest/gcore/pixfun.py | 54 +- autotest/gcore/rasterio.py | 69 +- autotest/gcore/thread_test.py | 10 +- autotest/gcore/tiff_write.py | 49 +- autotest/gcore/virtualmem.py | 61 +- autotest/gcore/vrt_read.py | 6 +- autotest/gdrivers/data/f32nan_data.tif | Bin 0 -> 20194 bytes autotest/gdrivers/data/pcidsk/tile_v1.1.pix | Bin 0 -> 49664 bytes autotest/gdrivers/data/pcidsk/tile_v2.pix | Bin 0 -> 49664 bytes autotest/gdrivers/mrf.py | 146 +--- autotest/gdrivers/netcdf.py | 18 + autotest/gdrivers/pcidsk.py | 74 ++ autotest/gdrivers/pds4.py | 4 +- autotest/gdrivers/vrtpansharpen.py | 8 +- autotest/ogr/ogr_flatgeobuf.py | 18 +- autotest/pyscripts/test_gdal_calc.py | 51 +- autotest/pyscripts/test_gdal_edit.py | 14 +- autotest/pyscripts/test_gdal_merge.py | 8 +- autotest/pyscripts/test_gdal_retile.py | 2 - autotest/pyscripts/test_rgb2pct.py | 10 +- autotest/requirements.txt | 2 +- autotest/utilities/test_gdal_rasterize.py | 19 +- gdal/doc/source/programs/gdal_calc.rst | 12 +- gdal/frmts/mrf/LERCV1/Lerc1Image.cpp | 83 +- gdal/frmts/mrf/LERCV1/Lerc1Image.h | 6 +- gdal/frmts/netcdf/GNUmakefile | 4 + gdal/frmts/netcdf/makefile.vc | 3 + gdal/frmts/netcdf/netcdfdataset.cpp | 64 +- gdal/frmts/netcdf/netcdfdataset.h | 1 + gdal/frmts/pcidsk/GNUmakefile | 32 +- gdal/frmts/pcidsk/makefile.vc | 23 +- gdal/frmts/pcidsk/pcidskdataset2.cpp | 8 + gdal/frmts/pcidsk/sdk/Makefile | 40 +- gdal/frmts/pcidsk/sdk/Makefile.vc | 81 +- gdal/frmts/pcidsk/sdk/blockdir/Makefile | 8 + gdal/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp | 973 +++++++++++++++++++++ gdal/frmts/pcidsk/sdk/blockdir/asciitiledir.h | 100 +++ gdal/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp | 221 +++++ gdal/frmts/pcidsk/sdk/blockdir/asciitilelayer.h | 66 ++ gdal/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp | 683 +++++++++++++++ gdal/frmts/pcidsk/sdk/blockdir/binarytiledir.h | 95 ++ gdal/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp | 127 +++ gdal/frmts/pcidsk/sdk/blockdir/binarytilelayer.h | 66 ++ gdal/frmts/pcidsk/sdk/blockdir/blockdir.cpp | 576 ++++++++++++ gdal/frmts/pcidsk/sdk/blockdir/blockdir.h | 173 ++++ gdal/frmts/pcidsk/sdk/blockdir/blockfile.cpp | 41 + gdal/frmts/pcidsk/sdk/blockdir/blockfile.h | 81 ++ gdal/frmts/pcidsk/sdk/blockdir/blocklayer.cpp | 534 +++++++++++ gdal/frmts/pcidsk/sdk/blockdir/blocklayer.h | 149 ++++ gdal/frmts/pcidsk/sdk/blockdir/blocktiledir.cpp | 178 ++++ gdal/frmts/pcidsk/sdk/blockdir/blocktiledir.h | 109 +++ gdal/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp | 772 ++++++++++++++++ gdal/frmts/pcidsk/sdk/blockdir/blocktilelayer.h | 277 ++++++ gdal/frmts/pcidsk/sdk/building.dox | 71 ++ .../pcidsk/sdk/channel/cbandinterleavedchannel.cpp | 58 +- gdal/frmts/pcidsk/sdk/channel/cexternalchannel.cpp | 247 +++--- gdal/frmts/pcidsk/sdk/channel/cexternalchannel.h | 5 + gdal/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp | 35 +- gdal/frmts/pcidsk/sdk/channel/cpcidskchannel.h | 9 +- .../sdk/channel/cpixelinterleavedchannel.cpp | 74 +- gdal/frmts/pcidsk/sdk/channel/ctiledchannel.cpp | 728 ++++++--------- gdal/frmts/pcidsk/sdk/channel/ctiledchannel.h | 29 +- gdal/frmts/pcidsk/sdk/core/clinksegment.cpp | 29 +- gdal/frmts/pcidsk/sdk/core/cpcidskblockfile.cpp | 252 ++++++ gdal/frmts/pcidsk/sdk/core/cpcidskblockfile.h | 94 ++ gdal/frmts/pcidsk/sdk/core/cpcidskfile.cpp | 725 +++++++++++---- gdal/frmts/pcidsk/sdk/core/cpcidskfile.h | 18 +- gdal/frmts/pcidsk/sdk/core/libjpeg_io.cpp | 11 +- gdal/frmts/pcidsk/sdk/core/metadataset_p.cpp | 11 +- gdal/frmts/pcidsk/sdk/core/mutexholder.h | 9 + gdal/frmts/pcidsk/sdk/core/pcidsk_pubutils.cpp | 75 +- gdal/frmts/pcidsk/sdk/core/pcidsk_raster.cpp | 118 +++ gdal/frmts/pcidsk/sdk/core/pcidsk_raster.h | 41 + gdal/frmts/pcidsk/sdk/core/pcidsk_scanint.cpp | 393 +++++++++ gdal/frmts/pcidsk/sdk/core/pcidsk_scanint.h | 319 +++++++ gdal/frmts/pcidsk/sdk/core/pcidsk_utils.cpp | 174 ++-- gdal/frmts/pcidsk/sdk/core/pcidsk_utils.h | 25 +- gdal/frmts/pcidsk/sdk/core/pcidskbuffer.cpp | 21 +- gdal/frmts/pcidsk/sdk/core/pcidskcreate.cpp | 677 ++++++++------ gdal/frmts/pcidsk/sdk/core/pcidskexception.cpp | 17 +- gdal/frmts/pcidsk/sdk/core/pcidskinterfaces.cpp | 3 +- gdal/frmts/pcidsk/sdk/core/sysvirtualfile.cpp | 598 ------------- gdal/frmts/pcidsk/sdk/core/sysvirtualfile.h | 113 --- gdal/frmts/pcidsk/sdk/index.dox | 32 + gdal/frmts/pcidsk/sdk/pcidsk_airphoto.h | 162 ---- gdal/frmts/pcidsk/sdk/pcidsk_blut.h | 68 ++ gdal/frmts/pcidsk/sdk/pcidsk_bpct.h | 85 ++ gdal/frmts/pcidsk/sdk/pcidsk_buffer.h | 1 + gdal/frmts/pcidsk/sdk/pcidsk_config.h | 36 +- gdal/frmts/pcidsk/sdk/pcidsk_exception.h | 6 +- gdal/frmts/pcidsk/sdk/pcidsk_file.h | 47 +- gdal/frmts/pcidsk/sdk/pcidsk_gcp.h | 16 + gdal/frmts/pcidsk/sdk/pcidsk_interfaces.h | 4 + gdal/frmts/pcidsk/sdk/pcidsk_lut.h | 66 ++ gdal/frmts/pcidsk/sdk/pcidsk_rpc.h | 4 +- gdal/frmts/pcidsk/sdk/pcidsk_segment.h | 5 +- gdal/frmts/pcidsk/sdk/pcidsk_shape.h | 2 +- gdal/frmts/pcidsk/sdk/pcidsk_types.h | 44 +- gdal/frmts/pcidsk/sdk/pcidsk_vectorsegment.h | 2 + gdal/frmts/pcidsk/sdk/pcidskchannel.dox | 330 +++++++ gdal/frmts/pcidsk/sdk/pcidskfile.dox | 383 ++++++++ gdal/frmts/pcidsk/sdk/pcidskmutex.dox | 67 ++ gdal/frmts/pcidsk/sdk/pcidsksegment.dox | 244 ++++++ gdal/frmts/pcidsk/sdk/port/io_stdio.cpp | 12 +- gdal/frmts/pcidsk/sdk/port/io_win32.cpp | 89 +- .../sdk/{pcidsk_ads40.h => raster/rasterconfig.h} | 34 +- gdal/frmts/pcidsk/sdk/raster/rastertypes.hh | 95 ++ gdal/frmts/pcidsk/sdk/segment/cpcidsk_array.cpp | 9 +- .../frmts/pcidsk/sdk/segment/cpcidskads40model.cpp | 159 ---- gdal/frmts/pcidsk/sdk/segment/cpcidskapmodel.cpp | 528 ----------- gdal/frmts/pcidsk/sdk/segment/cpcidskapmodel.h | 80 -- gdal/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp | 2 - gdal/frmts/pcidsk/sdk/segment/cpcidskblut.cpp | 125 +++ .../segment/{cpcidskads40model.h => cpcidskblut.h} | 53 +- gdal/frmts/pcidsk/sdk/segment/cpcidskbpct.cpp | 135 +++ gdal/frmts/pcidsk/sdk/segment/cpcidskbpct.h | 57 ++ .../pcidsk/sdk/segment/cpcidskephemerissegment.cpp | 43 +- .../pcidsk/sdk/segment/cpcidskephemerissegment.h | 4 + .../pcidsk/sdk/segment/cpcidskgcp2segment.cpp | 30 +- gdal/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp | 40 +- gdal/frmts/pcidsk/sdk/segment/cpcidsklut.cpp | 100 +++ gdal/frmts/pcidsk/sdk/segment/cpcidsklut.h | 59 ++ gdal/frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp | 318 +++++++ gdal/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.cpp | 102 ++- gdal/frmts/pcidsk/sdk/segment/cpcidskrpcmodel.h | 12 +- gdal/frmts/pcidsk/sdk/segment/cpcidsksegment.cpp | 53 +- gdal/frmts/pcidsk/sdk/segment/cpcidsksegment.h | 7 +- .../pcidsk/sdk/segment/cpcidsktoutinmodel.cpp | 950 ++++++++++++++------ .../pcidsk/sdk/segment/cpcidskvectorsegment.cpp | 138 ++- .../pcidsk/sdk/segment/cpcidskvectorsegment.h | 5 +- .../cpcidskvectorsegment_consistencycheck.cpp | 11 +- gdal/frmts/pcidsk/sdk/segment/metadatasegment.h | 4 +- .../frmts/pcidsk/sdk/segment/metadatasegment_p.cpp | 30 +- gdal/frmts/pcidsk/sdk/segment/orbitstructures.h | 81 +- gdal/frmts/pcidsk/sdk/segment/sysblockmap.cpp | 563 ------------ gdal/frmts/pcidsk/sdk/segment/sysblockmap.h | 97 -- gdal/frmts/pcidsk/sdk/segment/systiledir.cpp | 160 ++++ gdal/frmts/pcidsk/sdk/segment/systiledir.h | 74 ++ gdal/frmts/pcidsk/sdk/segment/vecsegdataindex.cpp | 6 +- gdal/frmts/pcidsk/sdk/segment/vecsegheader.cpp | 12 +- gdal/frmts/pcidsk/sdk/tutorial.dox | 140 +++ gdal/frmts/pds/pds4dataset.cpp | 4 +- gdal/nmake.opt | 3 + gdal/ogr/ogrsf_frmts/flatgeobuf/geometrywriter.cpp | 30 +- gdal/swig/include/python/gdal_python.i | 48 +- gdal/swig/python/README.rst | 142 ++- gdal/swig/python/osgeo/auxiliary/base.py | 122 --- gdal/swig/python/osgeo/gdal.py | 48 +- gdal/swig/python/osgeo/gdalnumeric.py | 5 + .../python/osgeo/{ => utils}/auxiliary/__init__.py | 0 gdal/swig/python/osgeo/utils/auxiliary/base.py | 85 ++ .../python/osgeo/utils/auxiliary/extent_util.py | 123 +++ .../python/osgeo/utils/auxiliary/numpy_util.py | 49 ++ .../swig/python/osgeo/utils/auxiliary/rectangle.py | 288 ++++++ gdal/swig/python/osgeo/utils/auxiliary/util.py | 157 ++++ gdal/swig/python/osgeo/utils/gdal2xyz.py | 96 +- gdal/swig/python/osgeo/utils/gdal_calc.py | 159 ++-- gdal/swig/python/osgeo/utils/gdal_merge.py | 24 +- gdal/swig/python/osgeo/utils/gdal_pansharpen.py | 2 +- gdal/swig/python/osgeo/utils/gdal_polygonize.py | 2 +- gdal/swig/python/osgeo/utils/gdal_proximity.py | 2 +- gdal/swig/python/osgeo/utils/gdal_sieve.py | 2 +- gdal/swig/python/osgeo/utils/ogrmerge.py | 2 +- gdal/swig/python/osgeo/utils/pct2rgb.py | 19 +- gdal/swig/python/osgeo/utils/rgb2pct.py | 2 +- gdal/swig/python/samples/classify.py | 25 +- gdal/swig/python/samples/gdal_lut.py | 16 +- gdal/swig/python/samples/magphase.py | 18 +- gdal/swig/python/samples/rel.py | 22 +- .../swig/python/samples/tile_extent_from_raster.py | 2 +- gdal/swig/python/samples/val_repl.py | 7 +- gdal/swig/python/scripts/gdal2tiles.py | 7 +- gdal/swig/python/setup.py | 2 +- 179 files changed, 13824 insertions(+), 5029 deletions(-) create mode 100644 autotest/gdrivers/data/f32nan_data.tif create mode 100644 autotest/gdrivers/data/pcidsk/tile_v1.1.pix create mode 100644 autotest/gdrivers/data/pcidsk/tile_v2.pix create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/Makefile create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/asciitiledir.cpp create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/asciitiledir.h create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/asciitilelayer.cpp create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/asciitilelayer.h create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/binarytiledir.cpp create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/binarytiledir.h create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/binarytilelayer.cpp create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/binarytilelayer.h create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blockdir.cpp create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blockdir.h create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blockfile.cpp create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blockfile.h create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blocklayer.cpp create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blocklayer.h create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blocktiledir.cpp create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blocktiledir.h create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blocktilelayer.cpp create mode 100644 gdal/frmts/pcidsk/sdk/blockdir/blocktilelayer.h create mode 100644 gdal/frmts/pcidsk/sdk/building.dox create mode 100644 gdal/frmts/pcidsk/sdk/core/cpcidskblockfile.cpp create mode 100644 gdal/frmts/pcidsk/sdk/core/cpcidskblockfile.h create mode 100644 gdal/frmts/pcidsk/sdk/core/pcidsk_raster.cpp create mode 100644 gdal/frmts/pcidsk/sdk/core/pcidsk_raster.h create mode 100644 gdal/frmts/pcidsk/sdk/core/pcidsk_scanint.cpp create mode 100644 gdal/frmts/pcidsk/sdk/core/pcidsk_scanint.h delete mode 100644 gdal/frmts/pcidsk/sdk/core/sysvirtualfile.cpp delete mode 100644 gdal/frmts/pcidsk/sdk/core/sysvirtualfile.h create mode 100644 gdal/frmts/pcidsk/sdk/index.dox delete mode 100644 gdal/frmts/pcidsk/sdk/pcidsk_airphoto.h create mode 100644 gdal/frmts/pcidsk/sdk/pcidsk_blut.h create mode 100644 gdal/frmts/pcidsk/sdk/pcidsk_bpct.h create mode 100644 gdal/frmts/pcidsk/sdk/pcidsk_lut.h create mode 100644 gdal/frmts/pcidsk/sdk/pcidskchannel.dox create mode 100644 gdal/frmts/pcidsk/sdk/pcidskfile.dox create mode 100644 gdal/frmts/pcidsk/sdk/pcidskmutex.dox create mode 100644 gdal/frmts/pcidsk/sdk/pcidsksegment.dox rename gdal/frmts/pcidsk/sdk/{pcidsk_ads40.h => raster/rasterconfig.h} (71%) create mode 100644 gdal/frmts/pcidsk/sdk/raster/rastertypes.hh delete mode 100644 gdal/frmts/pcidsk/sdk/segment/cpcidskads40model.cpp delete mode 100644 gdal/frmts/pcidsk/sdk/segment/cpcidskapmodel.cpp delete mode 100644 gdal/frmts/pcidsk/sdk/segment/cpcidskapmodel.h create mode 100644 gdal/frmts/pcidsk/sdk/segment/cpcidskblut.cpp rename gdal/frmts/pcidsk/sdk/segment/{cpcidskads40model.h => cpcidskblut.h} (60%) create mode 100644 gdal/frmts/pcidsk/sdk/segment/cpcidskbpct.cpp create mode 100644 gdal/frmts/pcidsk/sdk/segment/cpcidskbpct.h create mode 100644 gdal/frmts/pcidsk/sdk/segment/cpcidsklut.cpp create mode 100644 gdal/frmts/pcidsk/sdk/segment/cpcidsklut.h create mode 100644 gdal/frmts/pcidsk/sdk/segment/cpcidskpolymodel.cpp delete mode 100644 gdal/frmts/pcidsk/sdk/segment/sysblockmap.cpp delete mode 100644 gdal/frmts/pcidsk/sdk/segment/sysblockmap.h create mode 100644 gdal/frmts/pcidsk/sdk/segment/systiledir.cpp create mode 100644 gdal/frmts/pcidsk/sdk/segment/systiledir.h create mode 100644 gdal/frmts/pcidsk/sdk/tutorial.dox delete mode 100644 gdal/swig/python/osgeo/auxiliary/base.py rename gdal/swig/python/osgeo/{ => utils}/auxiliary/__init__.py (100%) create mode 100644 gdal/swig/python/osgeo/utils/auxiliary/base.py create mode 100644 gdal/swig/python/osgeo/utils/auxiliary/extent_util.py create mode 100644 gdal/swig/python/osgeo/utils/auxiliary/numpy_util.py create mode 100644 gdal/swig/python/osgeo/utils/auxiliary/rectangle.py create mode 100644 gdal/swig/python/osgeo/utils/auxiliary/util.py git reset --hard HEAD HEAD is now at 4cdb36c427 Merge pull request #3363 from rouault/netcdf_vsimem 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 4cdb36c4273e4949a0912c207f0383975aaef313 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 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-x64\doc\mapcache_revision.txt type E:\buildsystem\release-1928-x64\doc\mapcache_revision.txt d8d71730e4f03e0b56d1562e484ae0e35f37f96c cd E:\buildsystem