This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository gdal.
commit 4cf38f65a58a9fe6e9ad5688a3adfd54a93bdabe
Author: Bas Couwenberg
Date: Tue Feb 17 23:17:49 2015 +0100
Refresh patches.
---
debian/changelog | 1 +
debian/patches/accomodate-typo | 26 ++
debian/patches/consistant-typo | 22 +++---
debian/patches/developement-typo | 13 +
debian/patches/explicitely-typo | 30 +++---
debian/patches/hdf4 | 10 +-
debian/patches/inconsistant-typo | 6 +++---
debian/patches/initalize-typo| 2 +-
debian/patches/ogdi | 2 +-
debian/patches/recommanded-typo | 6 +++---
debian/patches/ressource-typo| 32
debian/patches/spatialite| 6 +++---
debian/patches/supress-typo | 17 +++--
debian/patches/transfering-typo | 4 ++--
debian/patches/usefull-typo | 26 +-
15 files changed, 80 insertions(+), 123 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 34e38a8..7cd3b0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gdal (1.11.2+dfsg-1~exp1) UNRELEASED; urgency=medium
(closes: #774243)
* Update my email to @debian.org address.
* Drop get-orig-source script in favor of uscan + Files-Excluded.
+ * Refresh patches.
-- Bas Couwenberg Tue, 17 Feb 2015 23:31:13 +0100
diff --git a/debian/patches/accomodate-typo b/debian/patches/accomodate-typo
index 1e76f98..6da36df 100644
--- a/debian/patches/accomodate-typo
+++ b/debian/patches/accomodate-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0,
http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -3875,7 +3875,7 @@ GeoTIFF driver :
+@@ -4024,7 +4024,7 @@ GeoTIFF driver :
* Use official value for inverse flattening of the WGS84 ellipsoid (#2787)
* Add metadata domain for XML documents (#2786)
* Make GTiff driver friendly with files with huge number of bands and pixel
interleaving (#2838)
@@ -27,7 +27,7 @@ Applied-Upstream: 2.0,
http://trac.osgeo.org/gdal/changeset/28039
rmax=rmax*dscale;
--- a/frmts/gtiff/geotiff.cpp
+++ b/frmts/gtiff/geotiff.cpp
-@@ -1554,7 +1554,7 @@ CPLErr GTiffRasterBand::FillCacheForOthe
+@@ -1555,7 +1555,7 @@ CPLErr GTiffRasterBand::FillCacheForOthe
/* and O(nBands^2) performance ! */
/* */
/* If there are many bands and the block cache size is not big */
@@ -47,28 +47,6 @@ Applied-Upstream: 2.0,
http://trac.osgeo.org/gdal/changeset/28039
}
break;
a/frmts/gtiff/libtiff/tif_getimage.c
-+++ b/frmts/gtiff/libtiff/tif_getimage.c
-@@ -2541,7 +2541,7 @@ PickContigCase(TIFFRGBAImage* img)
-* must always be <= horizontal
subsampling; so
-* there are only a few possibilities
and we just
-* enumerate the cases.
-- * Joris: added support for the [1,2]
case, nonetheless, to accomodate
-+ * Joris: added support for the [1,2]
case, nonetheless, to accommodate
-* some OJPEG files
-*/
- uint16 SubsamplingHor;
a/frmts/gtiff/libtiff/tif_ojpeg.c
-+++ b/frmts/gtiff/libtiff/tif_ojpeg.c
-@@ -141,7 +141,7 @@
- * OJPEG_BUFFER: Define the size of the desired buffer here. Should be small
enough so as to guarantee
- *instant processing, optimal streaming and optimal use of processor
cache, but also big
- *enough so as to not result in significant call overhead. It should be
at least a few
-- *bytes to accomodate some structures (this is verified in asserts), but
it would not be
-+ *bytes to accommodate some structures (this is verified in asserts), but
it would not be
- *sensible to make it this small anyway, and it should be at most 64K
since it is indexed
- *with uint16. We recommend 2K.
- * EGYPTIANWALK: You could also define EGYPTIANWALK here, but it is not used
anywhere and has
--- a/man/man1/gdalwarp.1
+++ b/man/man1/gdalwarp.1
@@ -125,7 +125,7 @@ The source file name(s).
diff --git a/debian/patches/consistant-typo b/debian/patches/consistant-typo
index 697e98b..aeb1ec0 100644
--- a/debian/patches/consistant-typo
+++ b/debian/patches/consistant-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0,
http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -1918,7 +1918,7 @@ Utilities:
+@@ -2067,7 +2067,7 @@ Utilities:
* Add gdal_ls.py and gdal_cp.py as Python samples
* Add new sample utility, gdal_edit.py, to edit in place various informat
