diff --git a/gdal-srcbands.patch b/gdal-srcbands.patch new file mode 100644 index 0000000..2fbf47b --- /dev/null +++ b/gdal-srcbands.patch @@ -0,0 +1,19 @@ +commit 9128246d1ef1c01ca9ec1d5606b920b59edb8765 +Author: Tom Hughes +Date: Wed Jan 24 09:37:48 2018 +0000 + + Use panSrcBands when accessing the source data + +diff --git a/gdal/alg/gdalwarpoperation.cpp b/gdal/alg/gdalwarpoperation.cpp +index b652506623..791ca67db9 100644 +--- a/gdal/alg/gdalwarpoperation.cpp ++++ b/gdal/alg/gdalwarpoperation.cpp +@@ -1776,7 +1776,7 @@ CPLErr GDALWarpOperation::WarpRegionToBuffer( + if( psOptions->nBandCount == 1 ) + { + // Particular case to simplify the stack a bit. +- eErr = poSrcDS->GetRasterBand(psOptions->panDstBands[0])->RasterIO( ++ eErr = poSrcDS->GetRasterBand(psOptions->panSrcBands[0])->RasterIO( + GF_Read, + nSrcXOff, nSrcYOff, nSrcXSize, nSrcYSize, + oWK.papabySrcImage[0], nSrcXSize, nSrcYSize, diff --git a/gdal.spec b/gdal.spec index 0f36e04..6ef2c3f 100644 --- a/gdal.spec +++ b/gdal.spec @@ -62,7 +62,7 @@ Name: gdal Version: 2.2.3 -Release: 7%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} +Release: 8%{?dist}%{?bootstrap:.%{bootstrap}.bootstrap} Summary: GIS file format library Group: System Environment/Libraries License: MIT @@ -97,6 +97,9 @@ Patch9: %{name}-2.2.2-zlib.patch Patch10: %{name}-2.2.3_json-c_013.patch +# https://github.com/OSGeo/gdal/pull/295 +Patch11: %{name}-srcbands.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ant @@ -336,6 +339,7 @@ rm -r frmts/grib/degrib18/g2clib-1.0.4 %patch8 -p1 -b .java~ %patch9 -p1 -b .zlib~ %patch10 -p1 -b .json-c_013~ +%patch11 -p2 -b .srcbands~ # Copy in PROVENANCE.TXT-fedora cp -p %SOURCE4 . @@ -883,6 +887,9 @@ popd #Or as before, using ldconfig %changelog +* Tue Feb 13 2018 Tom Hughes - 2.2.3-8 +- Add patch for bug by node-gdal tests and fixed upstream + * Tue Feb 13 2018 Tom Hughes - 2.2.3-7 - Use libtirpc for RPC routines