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 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.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\Microsoft\jdk-11.0.12.7-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;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 (x86)\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\nodejs\;C:\ProgramData\chocolatey\bin;C:\Program Files\7-Zip;C:\Users\szeke\AppData\Local\Microsoft\WindowsApps;C:\Users\szeke\.dotnet\tools;C:\Program Files\Azure Data Studio\bin;C:\Users\szeke\AppData\Roaming\npm;E:\MSVSCode\bin;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-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 9fbf79d3e Merge pull request #6706 from rouault/fix_ossfuzz_52283
git fetch
git checkout main
Your branch is behind 'origin/main' by 10 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
git pull origin main
Updating 9fbf79d3e..048455d9b
Fast-forward
mapfile.c | 9 ++++++-
maplexer.c | 81 ++++++++++++++++++++++++++++++-------------------------------
maplexer.l | 59 ++++++++++++++++++++++----------------------
mapogr.cpp | 1 +
mapsymbol.c | 4 +++
5 files changed, 82 insertions(+), 72 deletions(-)
git reset --hard HEAD
HEAD is now at 048455d9b Merge pull request #6723 from sdlime/fix-ossfuzz-52410
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
048455d9bfef8cc8d13227d513d4d8dbc4fb6322 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 2ff06295c7 Merge pull request #6497 from rouault/fix_6492
git fetch
git checkout master
Your branch is behind 'origin/master' by 47 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
git pull origin master
Updating 2ff06295c7..373237978d
Fast-forward
autotest/gcore/vsis3.py | 213 +++++-
autotest/gdrivers/data/paux/small16.aux | 2 +
.../gdrivers/data/pdf/esri_102422_as_epsg_code.pdf | Bin 0 -> 2032 bytes
autotest/gdrivers/gdalhttp.py | 20 +
autotest/gdrivers/mff2.py | 11 +
autotest/gdrivers/pdf.py | 45 +-
autotest/ogr/ogr_geojsonseq.py | 163 ++++-
autotest/ogr/ogr_gpkg.py | 16 +-
autotest/ogr/ogr_libkml.py | 28 +
autotest/pymod/gdaltest.py | 23 +-
autotest/pyscripts/test_ogr_layer_algebra.py | 499 +++++++++++++
doc/source/drivers/raster/cog.rst | 2 +-
doc/source/drivers/raster/gtiff.rst | 4 +-
doc/source/drivers/raster/stacit.rst | 20 +-
doc/source/drivers/vector/geojsonseq.rst | 2 +
doc/source/programs/gdal_retile.rst | 6 +-
doc/source/programs/index.rst | 2 +
doc/source/programs/ogr_layer_algebra.rst | 153 ++++
doc/source/programs/vector_common_options.rst | 2 +-
doc/source/user/virtual_file_systems.rst | 6 +
frmts/gtiff/libtiff/tif_aux.c | 17 +-
frmts/gtiff/libtiff/tif_dir.c | 144 ++--
frmts/gtiff/libtiff/tif_dir.h | 2 +
frmts/gtiff/libtiff/tif_dirinfo.c | 2 +-
frmts/gtiff/libtiff/tif_dirread.c | 39 +-
frmts/gtiff/libtiff/tif_dirwrite.c | 771 +--------------------
frmts/gtiff/libtiff/tif_getimage.c | 88 +--
frmts/gtiff/libtiff/tif_print.c | 4 +
frmts/gtiff/libtiff/tif_write.c | 16 -
frmts/gtiff/libtiff/tif_zip.c | 2 +
frmts/gtiff/libtiff/tif_zstd.c | 2 +-
frmts/map/mapdataset.cpp | 2 +-
frmts/pdf/pdfcreatecopy.cpp | 9 +-
frmts/pdf/pdfdataset.cpp | 65 +-
frmts/raw/ace2dataset.cpp | 21 +-
frmts/raw/btdataset.cpp | 87 ++-
frmts/raw/byndataset.cpp | 71 +-
frmts/raw/byndataset.h | 21 +-
frmts/raw/cpgdataset.cpp | 55 +-
frmts/raw/ctable2dataset.cpp | 21 +-
frmts/raw/dipxdataset.cpp | 26 +-
frmts/raw/doq1dataset.cpp | 50 +-
frmts/raw/doq2dataset.cpp | 47 +-
frmts/raw/ehdrdataset.cpp | 84 +--
frmts/raw/ehdrdataset.h | 14 +-
frmts/raw/fastdataset.cpp | 72 +-
frmts/raw/genbindataset.cpp | 45 +-
frmts/raw/gtxdataset.cpp | 24 +-
frmts/raw/hkvdataset.cpp | 146 ++--
frmts/raw/lcpdataset.cpp | 90 +--
frmts/raw/loslasdataset.cpp | 19 +-
frmts/raw/mffdataset.cpp | 160 ++---
frmts/raw/ndfdataset.cpp | 26 +-
frmts/raw/ntv2dataset.cpp | 20 +-
frmts/raw/pauxdataset.cpp | 76 +-
frmts/raw/roipacdataset.cpp | 66 +-
frmts/raw/snodasdataset.cpp | 19 +-
fuzzers/CMakeLists.txt | 1 +
fuzzers/build_seed_corpus.sh | 15 +
fuzzers/filename_fuzzer.cpp | 103 +++
ogr/ogrsf_frmts/dxf/intronurbs.cpp | 3 +
ogr/ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp | 368 +++++-----
ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp | 2 +-
ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 3 +
ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 50 ++
ogr/ogrsf_frmts/hana/ogrhanatablelayer.cpp | 41 +-
ogr/ogrsf_frmts/libkml/ogr_libkml.h | 8 +-
ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp | 61 +-
ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp | 48 ++
ogr/ogrsf_frmts/mem/ogr_mem.h | 2 +
ogr/ogrsf_frmts/mem/ogrmemlayer.cpp | 23 +-
ogr/ogrsf_frmts/mitab/mitab_datfile.cpp | 33 +
ogr/ogrsf_frmts/sxf/ogr_sxf.h | 11 +-
ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp | 118 ++--
ogr/ogrsf_frmts/sxf/org_sxf_defs.h | 51 +-
port/cpl_aws.cpp | 170 ++++-
port/cpl_aws.h | 13 +-
port/cpl_http.cpp | 38 +-
port/cpl_odbc.cpp | 2 +
port/cpl_odbc.h | 6 +
port/cpl_vsi_virtual.h | 1 +
port/cpl_vsil.cpp | 11 +-
port/cpl_vsil_curl.cpp | 17 +-
port/cpl_vsil_stdin.cpp | 2 +
port/cpl_vsil_stdout.cpp | 4 +
swig/include/python/docs/ogr_feature_docs.i | 27 +-
swig/include/python/ogr_python.i | 18 +
swig/python/extensions/ogr_wrap.cpp | 23 +-
.../osgeo_utils/{samples => }/ogr_layer_algebra.py | 2 +-
.../python/gdal-utils/scripts/ogr_layer_algebra.py | 12 +
swig/python/osgeo/ogr.py | 41 +-
91 files changed, 2686 insertions(+), 2282 deletions(-)
create mode 100644 autotest/gdrivers/data/pdf/esri_102422_as_epsg_code.pdf
create mode 100644 autotest/pyscripts/test_ogr_layer_algebra.py
create mode 100644 doc/source/programs/ogr_layer_algebra.rst
create mode 100644 fuzzers/filename_fuzzer.cpp
rename swig/python/gdal-utils/osgeo_utils/{samples => }/ogr_layer_algebra.py (99%)
create mode 100644 swig/python/gdal-utils/scripts/ogr_layer_algebra.py
git reset --hard HEAD
HEAD is now at 373237978d Geopackage: Add upsert operation support (#6516)
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
373237978d077d447b6d95a3ca949b91e1deacda 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 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.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\Microsoft\jdk-11.0.12.7-hotspot\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\TortoiseGit\bin;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 (x86)\Microsoft SQL Server\150\Tools\Binn\;C:\Program Files\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\150\DTS\Binn\;C:\Program Files\Azure Data Studio\bin;C:\nodejs\;C:\ProgramData\chocolatey\bin;C:\Program Files\7-Zip;C:\Users\szeke\AppData\Local\Microsoft\WindowsApps;C:\Users\szeke\.dotnet\tools;C:\Program Files\Azure Data Studio\bin;C:\Users\szeke\AppData\Roaming\npm;E:\MSVSCode\bin;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-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 882c009 docs(cache_disk.c): proofread comment text (#292)
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
882c009d6e059286753007bdcc9e7cd4af66dbd6 cd E:\buildsystem