SET PATH=E:\builds\release-1900-x64\bin;E:\builds\release-1900-x64\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\MSBuild\14.0\bin\amd64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN\amd64;C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools\x64;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x64;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools\x64\;C:\Perl64\site\bin;C:\Perl64\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;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 (x86)\Microsoft SDKs\TypeScript\1.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\Git\cmd;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:\Users\szekeres\AppData\Roaming\npm;C:\Users\szekeres\AppData\Local\Microsoft\WindowsApps;C:\Users\szekeres\AppData\Local\Programs\Fiddler;C:\Users\szekeres\.dotnet\tools; if exist E:\builds\release-1900-x64\bin\curl\curl.exe E:\builds\release-1900-x64\bin\curl\curl.exe -o E:\builds\release-1900-x64\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc14x64\mapserver-7-4 git reset --hard HEAD HEAD is now at 42027835 [Backport branch-7-4] Allow sorting in MSSQL with WFS (#5835) git pull origin Already up to date. git reset --hard b5c26cc372dd95f80f01b741cf9f2ebbdb221733 HEAD is now at b5c26cc3 update for 7.4.0 release git log --pretty=format:%H -n 1 > E:\builds\release-1900-x64\doc\ms_revision.txt type E:\builds\release-1900-x64\doc\ms_revision.txt b5c26cc372dd95f80f01b741cf9f2ebbdb221733 cd E:\builds cd ..\sdk\vc14x64\gdal-2.4\gdal git reset --hard HEAD HEAD is now at e8cfc11f41 Prepare for GDAL 2.4.1 git pull origin Updating e8cfc11f41..458ab9d6e3 Fast-forward .travis.yml | 4 + appveyor.yml | 4 + autotest/alg/warp.py | 18 +- .../gcore/data/bug_gh_1439_to_be_updated_lzw.tif | Bin 0 -> 8511 bytes autotest/gcore/data/bug_gh_1439_update_lzw.tif | Bin 0 -> 9755 bytes autotest/gcore/hfa_write.py | 4 +- autotest/gcore/mask.py | 16 +- autotest/gcore/misc.py | 31 +++- autotest/gcore/numpy_rw.py | 40 ++-- autotest/gcore/pam.py | 19 ++ autotest/gcore/rasterio.py | 3 +- autotest/gcore/tiff_ovr.py | 4 +- autotest/gcore/tiff_read.py | 52 ++---- autotest/gcore/tiff_write.py | 202 ++++++++++++++++----- autotest/gcore/transformer.py | 22 +++ autotest/gcore/vsicurl.py | 17 +- ...C21B0037339_15142232818F1C_3bands_truncated.cub | 80 ++++++++ autotest/gdrivers/data/SENSRB_TRE.ntf | Bin 0 -> 3015 bytes autotest/gdrivers/data/attr_all_datatypes.h5 | Bin 0 -> 2048 bytes autotest/gdrivers/eedai.py | 16 +- autotest/gdrivers/envi.py | 26 +++ autotest/gdrivers/gdalhttp.py | 4 +- autotest/gdrivers/hdf5.py | 15 ++ autotest/gdrivers/hfa.py | 9 +- autotest/gdrivers/isis.py | 18 ++ autotest/gdrivers/jp2metadata.py | 4 +- autotest/gdrivers/jpeg.py | 4 +- autotest/gdrivers/nitf.py | 114 ++++++++++++ autotest/gdrivers/pdf.py | 2 +- autotest/gdrivers/til.py | 12 +- autotest/gdrivers/vrtmask.py | 3 +- autotest/gdrivers/xyz.py | 19 ++ autotest/gnm/gnm_test.py | 6 +- autotest/ogr/data/weird_winding_order_fgdb.zip | Bin 0 -> 29564 bytes autotest/ogr/ogr_eeda.py | 59 +++--- autotest/ogr/ogr_elasticsearch.py | 30 +-- autotest/ogr/ogr_fgdb.py | 75 +++++--- autotest/ogr/ogr_geojson.py | 47 +++++ autotest/ogr/ogr_geojsonseq.py | 27 ++- autotest/ogr/ogr_geom.py | 18 ++ autotest/ogr/ogr_gml_read.py | 8 +- autotest/ogr/ogr_gmlas.py | 8 +- autotest/ogr/ogr_gmt.py | 11 ++ autotest/ogr/ogr_index_test.py | 8 +- autotest/ogr/ogr_openfilegdb.py | 18 +- autotest/ogr/ogr_plscenes.py | 2 +- autotest/ogr/ogr_shape.py | 79 ++++++++ autotest/ogr/ogr_sql_test.py | 4 +- autotest/pymod/webserver.py | 20 +- autotest/requirements.txt | 10 +- autotest/utilities/test_gdal_translate.py | 4 +- autotest/utilities/test_gdaladdo.py | 4 +- autotest/utilities/test_gnmutils.py | 6 +- gdal/GDALmake.opt.in | 2 +- gdal/NEWS | 164 +++++++++++++++++ gdal/VERSION | 2 +- gdal/alg/gdalrasterize.cpp | 8 +- gdal/alg/gdaltransformer.cpp | 27 ++- gdal/alg/gdalwarpkernel.cpp | 2 +- gdal/alg/marching_squares/segment_merger.h | 8 +- gdal/apps/gdal_contour.cpp | 2 - gdal/ci/travis/trusty_clang/before_install.sh | 12 +- gdal/data/plscenesconf.json | 12 +- gdal/frmts/aigrid/aigopen.c | 2 +- gdal/frmts/dted/dted_api.c | 9 +- gdal/frmts/eeda/drv_eeda.html | 5 +- gdal/frmts/eeda/eedacommon.cpp | 6 +- gdal/frmts/eeda/eedadataset.cpp | 103 ++++++----- gdal/frmts/eeda/eedaidataset.cpp | 6 +- gdal/frmts/eeda/frmt_eedai.html | 4 +- gdal/frmts/envisat/EnvisatFile.c | 14 +- gdal/frmts/gdalallregister.cpp | 10 +- gdal/frmts/grib/degrib/degrib/degrib1.cpp | 5 + gdal/frmts/grib/degrib/degrib/myerror.c | 10 +- gdal/frmts/gtiff/geotiff.cpp | 97 ++++------ gdal/frmts/gtiff/libtiff/tif_write.c | 72 ++++---- gdal/frmts/gxf/gxfdataset.cpp | 20 +- gdal/frmts/hdf5/bagdataset.cpp | 2 +- gdal/frmts/hdf5/gh5_convenience.cpp | 4 +- gdal/frmts/hdf5/hdf5dataset.cpp | 48 +++-- gdal/frmts/hdf5/hdf5imagedataset.cpp | 73 +++++--- gdal/frmts/kea/keaband.cpp | 5 + gdal/frmts/mrf/marfa.h | 15 +- gdal/frmts/mrf/marfa_dataset.cpp | 8 +- gdal/frmts/mrsid/mrsiddataset.cpp | 20 +- gdal/frmts/netcdf/netcdfdataset.cpp | 17 +- gdal/frmts/nitf/nitffile.c | 30 ++- gdal/frmts/pdf/pdfio.h | 5 - gdal/frmts/pdf/pdfobject.cpp | 59 ++---- gdal/frmts/pdf/pdfsdk_headers.h | 3 + gdal/frmts/pds/isis3dataset.cpp | 10 +- gdal/frmts/pds/nasakeywordhandler.cpp | 3 + gdal/frmts/pds/pdsdataset.cpp | 6 +- gdal/frmts/raw/envidataset.cpp | 78 +++++++- gdal/frmts/raw/envidataset.h | 6 + gdal/frmts/raw/rawdataset.cpp | 19 +- gdal/frmts/raw/rawdataset.h | 3 + gdal/frmts/rs2/rs2dataset.cpp | 4 +- gdal/frmts/vrt/vrtderivedrasterband.cpp | 39 ++-- gdal/frmts/wms/wmsdriver.cpp | 177 +++++------------- gdal/frmts/xyz/xyzdataset.cpp | 27 +-- gdal/gcore/gdal_version.h.in | 6 +- gdal/gcore/gdalpamdataset.cpp | 5 +- gdal/gcore/rasterio.cpp | 11 +- gdal/gnm/gnm.h | 5 +- gdal/ogr/ogr_core.h | 4 +- gdal/ogr/ogrlinestring.cpp | 38 +++- gdal/ogr/ogrpgeogeometry.cpp | 6 +- gdal/ogr/ogrsf_frmts/amigocloud/ogr_amigocloud.h | 9 +- gdal/ogr/ogrsf_frmts/avc/avc_misc.cpp | 49 +++-- .../ogrsf_frmts/elastic/ogrelasticdatasource.cpp | 9 +- gdal/ogr/ogrsf_frmts/elastic/ogrelasticlayer.cpp | 5 +- gdal/ogr/ogrsf_frmts/geojson/ogr_geojson.h | 1 + gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonlayer.cpp | 18 +- .../ogrsf_frmts/geojson/ogrgeojsonseqdriver.cpp | 1 + gdal/ogr/ogrsf_frmts/geojson/ogrgeojsonutils.cpp | 12 +- gdal/ogr/ogrsf_frmts/gml/parsexsd.cpp | 3 + gdal/ogr/ogrsf_frmts/gmlas/ogrgmlasdatasource.cpp | 2 +- .../ogrsf_frmts/gmlas/ogrgmlasschemaanalyzer.cpp | 26 +-- gdal/ogr/ogrsf_frmts/gmt/ogrgmtdriver.cpp | 11 +- .../ogrsf_frmts/gpkg/gdalgeopackagerasterband.cpp | 8 + .../ogrsf_frmts/gpkg/ogrgeopackagedatasource.cpp | 8 +- .../ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp | 6 +- gdal/ogr/ogrsf_frmts/mem/ogrmemlayer.cpp | 30 ++- gdal/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp | 3 +- gdal/ogr/ogrsf_frmts/pds/ogrpdslayer.cpp | 5 + gdal/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp | 13 +- gdal/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp | 2 +- gdal/ogr/ogrsf_frmts/shape/dbfopen.c | 2 +- gdal/ogr/ogrsf_frmts/shape/ogrshape.h | 2 + gdal/ogr/ogrsf_frmts/shape/ogrshapedatasource.cpp | 86 +++++++-- gdal/ogr/ogrsf_frmts/shape/ogrshapedriver.cpp | 11 +- gdal/ogr/ogrsf_frmts/shape/shpopen.c | 26 +-- .../ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp | 5 + gdal/ogr/ogrsf_frmts/wasp/ogrwasp.h | 2 - gdal/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp | 4 +- gdal/ogr/ogrsf_frmts/wfs/ogrwfs3driver.cpp | 61 ++++++- gdal/ogr/ogrsf_frmts/xlsx/ogrxlsxdriver.cpp | 7 +- gdal/port/cpl_aws.cpp | 30 ++- gdal/port/cpl_aws.h | 12 +- gdal/port/cpl_http.cpp | 92 +++++----- gdal/port/cpl_http.h | 3 +- gdal/port/cpl_odbc.cpp | 21 ++- gdal/port/cpl_userfaultfd.cpp | 7 + gdal/port/cpl_vsil_curl.cpp | 48 ++++- gdal/port/cpl_vsil_curl_streaming.cpp | 7 + gdal/port/cpl_vsil_gzip.cpp | 1 + gdal/port/cpl_vsil_tar.cpp | 12 +- gdal/port/cpl_vsil_webhdfs.cpp | 2 +- gdal/swig/include/perl/gdal_perl.i | 4 +- gdal/swig/include/perl/ogr_perl.i | 2 +- gdal/swig/python/{README.txt => README.rst} | 4 +- gdal/swig/python/scripts/gdal_calc.py | 10 +- gdal/swig/python/scripts/gdal_polygonize.py | 4 +- gdal/swig/python/scripts/ogrmerge.py | 14 +- gdal/swig/python/setup.py | 5 +- 156 files changed, 2243 insertions(+), 1006 deletions(-) create mode 100644 autotest/gcore/data/bug_gh_1439_to_be_updated_lzw.tif create mode 100644 autotest/gcore/data/bug_gh_1439_update_lzw.tif create mode 100644 autotest/gdrivers/data/FC21B0037339_15142232818F1C_3bands_truncated.cub create mode 100644 autotest/gdrivers/data/SENSRB_TRE.ntf create mode 100644 autotest/gdrivers/data/attr_all_datatypes.h5 create mode 100644 autotest/ogr/data/weird_winding_order_fgdb.zip rename gdal/swig/python/{README.txt => README.rst} (98%) git reset --hard 825662d03251faac29c5c683c74694ba56124e90 HEAD is now at 825662d032 Prepare for GDAL 2.4.2 git log --pretty=format:%H -n 1 > E:\builds\release-1900-x64\doc\gdal_revision.txt type E:\builds\release-1900-x64\doc\gdal_revision.txt 825662d03251faac29c5c683c74694ba56124e90 cd E:\builds