SET PATH=E:\builds\release-1900\bin;E:\builds\release-1900\bin\curl;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow;C:\Program Files (x86)\MSBuild\14.0\bin;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\BIN;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools;C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\VCPackages;C:\Program Files (x86)\HTML Help Workshop;C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Performance Tools;C:\Program Files (x86)\Windows Kits\10\bin\x86;C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 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 (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\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; if exist E:\builds\release-1900\bin\curl\curl.exe E:\builds\release-1900\bin\curl\curl.exe -o E:\builds\release-1900\bin\curl\curl-ca-bundle.crt "https://curl.haxx.se/ca/cacert.pem" set TERM=msys set "PATH=E:\Git\bin;%PATH%" cd ..\sdk\vc14\mapserver git reset --hard HEAD HEAD is now at 39adc758 Merge pull request #6146 from rouault/FindOracle_libnnz19 git pull origin Updating 39adc758..d0c544be Fast-forward mapscript/swiginc/map.i | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) git reset --hard HEAD HEAD is now at d0c544be Make it possible to send scale_independent to drawLegend via MapScript. (#6151) git log --pretty=format:%H -n 1 > E:\builds\release-1900\doc\ms_revision.txt type E:\builds\release-1900\doc\ms_revision.txt d0c544bed70029e47d7977f2db5622e735b771fc cd E:\builds cd ..\sdk\vc14\gdal\gdal git reset --hard HEAD HEAD is now at 62175c0fbb Merge pull request #2966 from talos-gis/Branch_gdalcompare git pull origin Updating 62175c0fbb..b7901af298 Fast-forward autotest/conftest.py | 3 +- autotest/gdrivers/data/fits/binary_table.fits | 3 + autotest/gdrivers/data/fits/byte_merc.fits | Bin 0 -> 5760 bytes autotest/gdrivers/data/fits/empty_primary_hdu.fits | 1 + .../data/fits/image_in_first_and_second_hdu.fits | Bin 0 -> 11520 bytes ...ge_in_second_and_fourth_hdu_table_in_third.fits | Bin 0 -> 20160 bytes .../gdrivers/data/fits/image_in_second_hdu.fits | Bin 0 -> 8640 bytes .../gdrivers/data/fits/offset_scale_no_georef.fits | Bin 0 -> 5760 bytes autotest/gdrivers/fits.py | 433 ++++- autotest/gdrivers/generate_fits.py | 178 ++ gdal/doc/source/drivers/raster/fits.rst | 260 ++- gdal/doc/source/programs/gdal_calc.rst | 14 + gdal/frmts/aaigrid/aaigriddataset.cpp | 6 +- gdal/frmts/fits/fitsdataset.cpp | 1838 +++++++++++++++----- gdal/ogr/ogrsf_frmts/segy/ogrsegydriver.cpp | 7 +- 15 files changed, 2286 insertions(+), 457 deletions(-) create mode 100644 autotest/gdrivers/data/fits/binary_table.fits create mode 100644 autotest/gdrivers/data/fits/byte_merc.fits create mode 100644 autotest/gdrivers/data/fits/empty_primary_hdu.fits create mode 100644 autotest/gdrivers/data/fits/image_in_first_and_second_hdu.fits create mode 100644 autotest/gdrivers/data/fits/image_in_second_and_fourth_hdu_table_in_third.fits create mode 100644 autotest/gdrivers/data/fits/image_in_second_hdu.fits create mode 100644 autotest/gdrivers/data/fits/offset_scale_no_georef.fits create mode 100644 autotest/gdrivers/generate_fits.py git reset --hard HEAD HEAD is now at b7901af298 aaigriddataset: Improve search for float data. (#2972) git log --pretty=format:%H -n 1 > E:\builds\release-1900\doc\gdal_revision.txt type E:\builds\release-1900\doc\gdal_revision.txt b7901af298c0290892367270b56cf64222c8769c cd E:\builds