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.29.30133\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\Tools;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\devinit;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.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:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;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\7-Zip;C:\php;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;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 git config --global core.autocrlf false if not exist src\mapserver-vc16 git clone -b main https://github.com/mapserver/mapserver.git src\mapserver-vc16 cd src\mapserver-vc16 git reset --hard HEAD HEAD is now at 3fde53f9d add PR title to notification 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 3fde53f9d add PR title to notification git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928\doc\ms_revision.txt type E:\buildsystem\release-1928\doc\ms_revision.txt 3fde53f9d7f5c4f2889f116eeb32d2b60ba6a070 cd E:\buildsystem git config --global core.autocrlf false 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 18f9ed2b7c Merge pull request #9650 from rouault/revert_importlib_resources git fetch git checkout master Your branch is behind 'origin/master' by 56 commits, and can be fast-forwarded. (use "git pull" to update your local branch) git pull origin master Updating 18f9ed2b7c..95579fe331 Fast-forward .github/workflows/codeql.yml | 4 +- .github/workflows/scorecard.yml | 2 +- .pre-commit-config.yaml | 2 +- alg/rasterfill.cpp | 123 ++- apps/argparse/argparse.hpp | 30 + apps/gdal_translate_lib.cpp | 3 +- apps/gdal_utils_priv.h | 40 +- apps/gdalargumentparser.cpp | 26 + apps/gdalargumentparser.h | 3 + apps/gdalinfo_lib.cpp | 13 +- apps/gdalmdimtranslate_lib.cpp | 9 +- apps/gdaltindex_lib.cpp | 2 +- apps/gdalwarp_bin.cpp | 157 +-- apps/gdalwarp_lib.cpp | 1065 ++++++++++++-------- apps/ogr2ogr_lib.cpp | 34 +- apps/ogrinfo_lib.cpp | 7 +- apps/test_ogrsf.cpp | 34 +- autotest/alg/fillnodata.py | 235 ++++- autotest/cpp/data/utf8accents.txt | 1 + autotest/cpp/data/utf8accents_ascii.txt | 1 + autotest/cpp/test_cpl.cpp | 75 ++ autotest/gcore/cog.py | 38 +- autotest/gcore/mask.py | 84 +- autotest/gcore/overviewds.py | 12 +- autotest/gcore/tiff_ovr.py | 32 + autotest/gcore/tiff_read.py | 10 +- autotest/gcore/tiff_write.py | 107 +- autotest/gcore/vrt_read.py | 6 +- autotest/gcore/vrtmisc.py | 16 +- autotest/gcore/vsiaz.py | 93 ++ autotest/gdrivers/gpkg.py | 3 +- autotest/gdrivers/gti.py | 6 +- autotest/gdrivers/netcdf.py | 2 +- autotest/ogr/ogr_gpkg.py | 154 ++- autotest/ogr/ogr_mssqlspatial.py | 9 +- autotest/ogr/ogr_pg.py | 42 + autotest/ogr/ogr_pgdump.py | 60 ++ autotest/ogr/ogr_shape.py | 9 + autotest/ogr/ogr_sql_sqlite.py | 33 + autotest/ogr/ogr_sql_test.py | 16 + autotest/pyscripts/test_gdal_fillnodata.py | 30 + autotest/utilities/test_ogr2ogr_lib.py | 35 +- cmake/helpers/CheckDependentLibraries.cmake | 77 +- cmake/modules/packages/FindOpenJPEG.cmake | 10 +- doc/source/development/building_from_source.rst | 22 +- doc/source/drivers/raster/gtiff.rst | 30 +- doc/source/drivers/raster/pds4.rst | 4 +- doc/source/drivers/vector/gpkg.rst | 48 +- doc/source/drivers/vector/pg.rst | 12 + doc/source/drivers/vector/pgdump.rst | 15 +- doc/source/programs/gdal_fillnodata.rst | 49 +- doc/source/programs/gdalwarp.rst | 44 +- doc/source/programs/ogr2ogr.rst | 42 +- doc/source/sponsors/index.rst | 4 + doc/source/user/configoptions.rst | 3 +- frmts/gtiff/gtiffdataset_write.cpp | 62 +- frmts/netcdf/netcdfdataset.cpp | 4 +- frmts/nitf/nitfdataset.cpp | 6 +- frmts/ogcapi/gdalogcapidataset.cpp | 3 +- frmts/openjpeg/CMakeLists.txt | 6 +- frmts/pcidsk/sdk/core/pcidsk_utils.cpp | 21 +- frmts/pds/pds4dataset.cpp | 2 +- frmts/rmf/rmfdataset.cpp | 3 +- frmts/vrt/vrtsourcedrasterband.cpp | 6 +- frmts/zarr/zarr_array.cpp | 3 +- frmts/zarr/zarr_v2_array.cpp | 3 +- frmts/zarr/zarr_v2_group.cpp | 3 +- gcore/gdal_mdreader.cpp | 2 +- gcore/gdal_misc.cpp | 4 +- gcore/gdal_priv.h | 5 + gcore/gdaldataset.cpp | 14 +- gcore/gdaldefaultoverviews.cpp | 129 ++- gcore/gdaldriver.cpp | 6 +- gcore/gdaljp2abstractdataset.cpp | 3 +- gcore/gdaljp2metadata.cpp | 3 +- gcore/gdalmultidim.cpp | 10 +- gcore/gdalpamdataset.cpp | 12 +- gdal.cmake | 15 +- ogr/ogr_srs_pci.cpp | 2 +- ogr/ogrct.cpp | 12 +- ogr/ogrsf_frmts/avc/avc_binwr.cpp | 10 +- ogr/ogrsf_frmts/avc/avc_e00gen.cpp | 2 +- ogr/ogrsf_frmts/avc/avc_e00read.cpp | 5 +- ogr/ogrsf_frmts/avc/avc_e00write.cpp | 9 +- ogr/ogrsf_frmts/carto/ogrcartodatasource.cpp | 2 +- ogr/ogrsf_frmts/carto/ogrcartotablelayer.cpp | 5 +- ogr/ogrsf_frmts/dxf/ogr_autocad_services.cpp | 2 +- ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp | 6 +- ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp | 3 +- ogr/ogrsf_frmts/flatgeobuf/ogrflatgeobuflayer.cpp | 3 +- ogr/ogrsf_frmts/generic/ogr_gensql.cpp | 7 + ogr/ogrsf_frmts/generic/ogrlayer.cpp | 55 +- ogr/ogrsf_frmts/generic/ogrlayerarrow.cpp | 3 +- ogr/ogrsf_frmts/gmlas/CMakeLists.txt | 1 + ogr/ogrsf_frmts/gmlas/ogr_gmlas.h | 650 ++++++------ ogr/ogrsf_frmts/gmlas/ogrgmlasconf.cpp | 66 +- ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp | 466 ++++----- ogr/ogrsf_frmts/gmlas/ogrgmlasfeatureclass.cpp | 22 - ogr/ogrsf_frmts/gmlas/ogrgmlaslayer.cpp | 35 +- ogr/ogrsf_frmts/gmlas/ogrgmlasreader.cpp | 416 ++++---- ogr/ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp | 17 +- ogr/ogrsf_frmts/gmlas/ogrgmlasutils.cpp | 5 +- ogr/ogrsf_frmts/gmlas/ogrgmlaswriter.cpp | 399 ++++---- ogr/ogrsf_frmts/gmlas/ogrgmlasxlinkresolver.cpp | 6 +- ogr/ogrsf_frmts/gmlas/ogrgmlasxpatchmatcher.cpp | 16 - ogr/ogrsf_frmts/gmlas/ogrgmlasxsdcache.cpp | 40 +- ogr/ogrsf_frmts/gpkg/ogr_geopackage.h | 36 +- ogr/ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 238 ++++- ogr/ogrsf_frmts/gpkg/ogrgeopackagedriver.cpp | 5 + ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 79 +- ogr/ogrsf_frmts/gpsbabel/ogrgpsbabeldriver.cpp | 3 +- ogr/ogrsf_frmts/hana/ogrhanadatasource.cpp | 8 +- ogr/ogrsf_frmts/ili/ili2reader.cpp | 8 +- ogr/ogrsf_frmts/mitab/mitab_feature.cpp | 4 +- ogr/ogrsf_frmts/mitab/mitab_indfile.cpp | 4 +- ogr/ogrsf_frmts/mitab/mitab_utils.cpp | 8 +- .../mssqlspatial/ogrmssqlspatialdatasource.cpp | 2 +- ogr/ogrsf_frmts/mvt/ogrmvtdataset.cpp | 17 +- ogr/ogrsf_frmts/mysql/ogrmysqldatasource.cpp | 2 +- ogr/ogrsf_frmts/oci/ogrocidatasource.cpp | 3 +- ogr/ogrsf_frmts/oci/ogrocisession.cpp | 4 +- ogr/ogrsf_frmts/ogrsf_frmts.h | 4 + ogr/ogrsf_frmts/pg/ogr_pg.h | 6 + ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp | 16 +- ogr/ogrsf_frmts/pg/ogrpgdrivercore.cpp | 2 + ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp | 14 +- ogr/ogrsf_frmts/pgdump/ogr_pgdump.h | 9 +- ogr/ogrsf_frmts/pgdump/ogrpgdumpdatasource.cpp | 38 +- ogr/ogrsf_frmts/pgdump/ogrpgdumpdriver.cpp | 2 + ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp | 8 +- ogr/ogrsf_frmts/pgeo/ogrpgeodatasource.cpp | 3 +- ogr/ogrsf_frmts/pmtiles/vsipmtiles.cpp | 6 +- ogr/ogrsf_frmts/sqlite/ogr_sqlite.h | 9 + ogr/ogrsf_frmts/sqlite/ogrsqlitebase.h | 2 + ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp | 2 +- ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp | 43 +- ogr/ogrsf_frmts/sqlite/ogrsqliteselectlayer.cpp | 20 +- .../sqlite_rtree_bulk_load.c | 32 +- ogr/ogrsf_frmts/wfs/ogroapifdriver.cpp | 3 +- ogr/ogrsf_frmts/wfs/ogrwfsdatasource.cpp | 4 +- ogr/ogrspatialreference.cpp | 3 +- ogr/swq_op_general.cpp | 4 +- port/cpl_conv.cpp | 4 +- port/cpl_error.cpp | 55 +- port/cpl_error.h | 53 +- port/cpl_path.cpp | 8 +- port/cpl_recode.cpp | 804 ++++++++++++++- port/cpl_string.cpp | 30 + port/cpl_string.h | 5 + port/cpl_vsil_az.cpp | 14 +- port/cplstring.cpp | 9 +- {ogr => port}/utf8.h | 0 swig/CMakeLists.txt | 1 + swig/include/python/gdal_python.i | 5 +- .../gdal-utils/osgeo_utils/gdal_fillnodata.py | 12 + 155 files changed, 4649 insertions(+), 2615 deletions(-) create mode 100644 autotest/cpp/data/utf8accents.txt create mode 100644 autotest/cpp/data/utf8accents_ascii.txt rename {ogr => port}/utf8.h (100%) git reset --hard HEAD HEAD is now at 95579fe331 Fix formatting issue git log --pretty=format:%H -n 1 > E:\buildsystem\release-1928\doc\gdal_revision.txt type E:\buildsystem\release-1928\doc\gdal_revision.txt 95579fe331493a2357062110d97e72be62b5c626 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.29.30133\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\Tools;C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\devinit;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.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:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;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\7-Zip;C:\php;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;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 git config --global core.autocrlf false if not exist src\mapcache-vc16 git clone -b main https://github.com/MapServer/mapcache.git src\mapcache-vc16 cd src\mapcache-vc16 git reset --hard HEAD HEAD is now at add35ac add title to PR notification 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\doc\mapcache_revision.txt type E:\buildsystem\release-1928\doc\mapcache_revision.txt add35ace875a6e984cf5cad7aba65d593d17b5a8 cd E:\buildsystem