[gdal] 06/08: Refresh patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Feb 19 00:17:52 UTC 2015
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 <sebastic at xs4all.nl>
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 <sebastic at debian.org> 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 information of an existing GDAL dataset (projection, geotransform, nodata, metadata) (#4220)
* gdalcopyproj.py: make it copy GCPs too
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* Add --pause for convenient debugging, document it and --locale
Multi-driver topics:
-@@ -2376,7 +2376,7 @@ Utilities:
+@@ -2525,7 +2525,7 @@ Utilities:
* ogr2ogr: take into account fields specified in the -where clause in combinations with -select to create the correct list of fields to pass to SetIgnoredFields() (#4015)
* ogr2ogr: fix -zfield option so that the modified geometry properly reports coordinate dimension = 3. Also avoids it to be in the list of ignored field names
* ogr2ogr: add -simplify option to simplify geometries
@@ -23,7 +23,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
Multi driver topics:
-@@ -2882,7 +2882,7 @@ Utilities :
+@@ -3031,7 +3031,7 @@ Utilities :
to align on a standard grid (#3772)
AAIGRID driver:
@@ -32,7 +32,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDT_Float32 case; small optimization to avoid reading the first 100K when
we know that the datatype is already Float32
* Allow reading files where decimal separator is comma (#3668)
-@@ -2989,7 +2989,7 @@ GTX driver:
+@@ -3138,7 +3138,7 @@ GTX driver:
* Read NOAA .gtx vertical datum shift files.
GXF driver:
@@ -41,7 +41,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDT_Float32 case
* Introduce a GXF_DATATYPE configuration option that can be set to Float64
* Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
-@@ -3222,7 +3222,7 @@ Core:
+@@ -3371,7 +3371,7 @@ Core:
OGR_G_SymDifference() and OGR_G_UnionCascaded()
* Add C function: OGR_F_StealGeometry()
* Move Centroid() method from OGRPolygon to OGRGeometry base class to be able
@@ -50,7 +50,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
ST_Centroid() capabilities and the underlying GEOS method
* Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
datasources and layers virtual (#2978)
-@@ -4313,7 +4313,7 @@ General:
+@@ -4462,7 +4462,7 @@ General:
osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
* Make resampling an optionnal parameter for gdal.RegenerateOverview(),
@@ -59,7 +59,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* NONNULL checks have been added to check various arguments of methods
* add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
-@@ -4492,7 +4492,7 @@ Utilities:
+@@ -4641,7 +4641,7 @@ Utilities:
* gdalinfo: Display checksums on overviews when -checksum is specified
* gdalinfo: Display whether the mask band has overviews
* ogr2ogr: reset -gt to 1 with -skipfailures, document -gt (#2409)
@@ -70,7 +70,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* gdal_rasterize: check that coordinates systems match (Ticket #1937)
--- a/alg/gdaltransformer.cpp
+++ b/alg/gdaltransformer.cpp
-@@ -776,7 +776,7 @@ retry:
+@@ -797,7 +797,7 @@ retry:
/* -------------------------------------------------------------------- */
@@ -145,7 +145,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
delete poDS;
--- a/frmts/nitf/nitfimage.c
+++ b/frmts/nitf/nitfimage.c
-@@ -3301,7 +3301,7 @@ static void NITFLoadLocationTable( NITFI
+@@ -3298,7 +3298,7 @@ static void NITFLoadLocationTable( NITFI
}
else
{
@@ -154,7 +154,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
bFoundValidLocation = FALSE;
break;
}
-@@ -3314,7 +3314,7 @@ static void NITFLoadLocationTable( NITFI
+@@ -3311,7 +3311,7 @@ static void NITFLoadLocationTable( NITFI
}
else
{
@@ -261,7 +261,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
chDelimiter = ',';
--- a/swig/include/gdal_array.i
+++ b/swig/include/gdal_array.i
-@@ -984,9 +984,9 @@ def BandReadAsArray( band, xoff = 0, yof
+@@ -990,9 +990,9 @@ def BandReadAsArray( band, xoff = 0, yof
shape_buf_xsize = buf_obj.shape[2]
shape_buf_ysize = buf_obj.shape[1]
if buf_xsize is not None and buf_xsize != shape_buf_xsize:
diff --git a/debian/patches/developement-typo b/debian/patches/developement-typo
index 212a75f..af06df9 100644
--- a/debian/patches/developement-typo
+++ b/debian/patches/developement-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -993,7 +993,7 @@ Build(Unix):
+@@ -1142,7 +1142,7 @@ Build(Unix):
* New optional dependencies : libpcre (for regular expressions support in SQLite), libxml2 (validation of GML files)
* --with-python: make it work with python3, and also accept path to python binary as argument of --with-python (#4725)
* Use nc-config to detect netcdf compilation and linking parameters (#4424)
@@ -14,14 +14,3 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* Fix compilation failure with iconv on FreeBSD (#4525)
* Make FileGDBAPI detection work with FileGDBAPI v1.1 and v1.2 (#4570)
* Fix build on Gentoo with its custom zlib 1.2.6 with the OF macro removed
---- a/frmts/gtiff/libtiff/tif_ojpeg.c
-+++ b/frmts/gtiff/libtiff/tif_ojpeg.c
-@@ -39,7 +39,7 @@
- OF THIS SOFTWARE.
-
- Joris Van Damme and/or AWare Systems may be available for custom
-- developement. If you like what you see, and need anything similar or related,
-+ development. If you like what you see, and need anything similar or related,
- contact <info at awaresystems.be>.
- */
-
diff --git a/debian/patches/explicitely-typo b/debian/patches/explicitely-typo
index 2280d37..a4a4cdd 100644
--- a/debian/patches/explicitely-typo
+++ b/debian/patches/explicitely-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -1521,7 +1521,7 @@ GML driver:
+@@ -1670,7 +1670,7 @@ GML driver:
* Allow reading srsDimension attribute when set on LineString element, and not on posList (#4663)
* Partial support for reading GML 3.3 compat encoding profile, limited to <gmlce:SimplePolygon>, <gmlce:SimpleRectangle>, <gmlce:SimpleTriangle>, <gmlce:SimpleMultiPoint> elements
* Support WFS GetFeature response document to be piped and opened with /vsistdin/
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* Improve detection of extent and srs for WFS 2.0
* Allow ISO-8859-15 encoded files to be used by Expat parser (#4829)
* Handle CompositeCurve like MultiCurve (for NAS)
-@@ -2322,7 +2322,7 @@ Core:
+@@ -2471,7 +2471,7 @@ Core:
* OGR SQL: recognize optional ESCAPE escape_char clause
* OGR SQL: allow NULL to be used as a value, so that 'SELECT *, NULL FROM foo works'
* OGR SQL: Accept doublequoting of column_name in 'SELECT DISTINCT "column_name" FROM table_name' (#3966)
@@ -163,7 +163,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
}
--- a/frmts/pdf/pdfdataset.cpp
+++ b/frmts/pdf/pdfdataset.cpp
-@@ -2511,7 +2511,7 @@ void PDFDataset::TurnLayersOnOff()
+@@ -2510,7 +2510,7 @@ void PDFDataset::TurnLayersOnOff()
oIter->second->setState(OptionalContentGroup::On);
}
@@ -172,7 +172,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
// in the list.
size_t nLen = strlen(papszLayers[i]);
int bFoundChildLayer = FALSE;
-@@ -4970,7 +4970,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
+@@ -4972,7 +4972,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
bGeoTransformValid = TRUE;
bProjDirty = TRUE;
@@ -181,7 +181,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
if (!bNeatLineDirty)
SetMetadataItem("NEATLINE", NULL);
return CE_None;
-@@ -5153,7 +5153,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
+@@ -5155,7 +5155,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
bProjDirty = TRUE;
@@ -192,7 +192,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/frmts/xyz/xyzdataset.cpp
+++ b/frmts/xyz/xyzdataset.cpp
-@@ -479,7 +479,7 @@ int XYZDataset::IdentifyEx( GDALOpenInfo
+@@ -480,7 +480,7 @@ int XYZDataset::IdentifyEx( GDALOpenInfo
GDALOpenInfo* poOpenInfoToDelete = NULL;
/* GZipped .xyz files are common, so automagically open them */
@@ -201,7 +201,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
if (strlen(poOpenInfo->pszFilename) > 6 &&
EQUAL(poOpenInfo->pszFilename + strlen(poOpenInfo->pszFilename) - 6, "xyz.gz") &&
!EQUALN(poOpenInfo->pszFilename, "/vsigzip/", 9))
-@@ -611,7 +611,7 @@ GDALDataset *XYZDataset::Open( GDALOpenI
+@@ -612,7 +612,7 @@ GDALDataset *XYZDataset::Open( GDALOpenI
CPLString osFilename(poOpenInfo->pszFilename);
/* GZipped .xyz files are common, so automagically open them */
@@ -287,7 +287,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
@return an handle to a OGRLayer containing the results of the query.
--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-@@ -4110,7 +4110,7 @@ OGRLayer * OGROSMDataSource::ExecuteSQL(
+@@ -4111,7 +4111,7 @@ OGRLayer * OGROSMDataSource::ExecuteSQL(
poSpatialFilter,
pszDialect );
@@ -320,7 +320,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
-@@ -526,7 +526,7 @@ int OGR2SQLITE_ConnectCreate(sqlite3* hD
+@@ -545,7 +545,7 @@ int OGR2SQLITE_ConnectCreate(sqlite3* hD
if( poDS->GetLayerCount() > 1 )
{
@@ -422,7 +422,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
public class Geometry:public void delete()
--- a/swig/python/extensions/gdal_wrap.cpp
+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -7996,7 +7996,7 @@ SWIGINTERN PyObject *_wrap_MajorObject_S
+@@ -8002,7 +8002,7 @@ SWIGINTERN PyObject *_wrap_MajorObject_S
if (_v) {
{
/* %typecheck(SWIG_TYPECHECK_POINTER) (char **dict) */
@@ -433,7 +433,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
_v = ((PyMapping_Check(argv[1]) || PySequence_Check(argv[1]) ) && !SWIG_CheckState(SWIG_AsCharPtrAndSize(argv[1], 0, NULL, 0)) ) ? 1 : 0;
--- a/swig/python/extensions/ogr_wrap.cpp
+++ b/swig/python/extensions/ogr_wrap.cpp
-@@ -20881,7 +20881,7 @@ static PyMethodDef SwigMethods[] = {
+@@ -20887,7 +20887,7 @@ static PyMethodDef SwigMethods[] = {
"\n"
"pszDialect: allows control of the statement dialect. If set to NULL,\n"
"the OGR SQL engine will be used, except for RDBMS drivers that will\n"
@@ -513,7 +513,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* -------------------------------------------------------------------- */
--- a/apps/gdaldem.cpp
+++ b/apps/gdaldem.cpp
-@@ -2233,7 +2233,7 @@ int main( int argc, char ** argv )
+@@ -2237,7 +2237,7 @@ int main( int argc, char ** argv )
const char *pszDstFilename = NULL;
const char *pszColorFilename = NULL;
const char *pszFormat = "GTiff";
@@ -522,7 +522,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
char **papszCreateOptions = NULL;
GDALDatasetH hSrcDataset = NULL;
-@@ -2426,7 +2426,7 @@ int main( int argc, char ** argv )
+@@ -2430,7 +2430,7 @@ int main( int argc, char ** argv )
{
CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
pszFormat = argv[++i];
@@ -531,7 +531,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
}
else if( argv[i][0] == '-' )
{
-@@ -2517,7 +2517,7 @@ int main( int argc, char ** argv )
+@@ -2521,7 +2521,7 @@ int main( int argc, char ** argv )
exit( 1 );
}
@@ -589,7 +589,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
bCreateOutput = TRUE;
if( EQUAL(pszFormat,"VRT") )
bVRT = TRUE;
-@@ -899,7 +899,7 @@ int main( int argc, char ** argv )
+@@ -898,7 +898,7 @@ int main( int argc, char ** argv )
if( hDstDS == NULL )
{
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index 82c3475..6a38cf7 100644
--- a/debian/patches/hdf4
+++ b/debian/patches/hdf4
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>, Alan Boudreault <aboudre
Last-Update: 2012-02-01
--- a/configure
+++ b/configure
-@@ -21189,7 +21189,7 @@ fi
+@@ -21190,7 +21190,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
$as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
@@ -12,7 +12,7 @@ Last-Update: 2012-02-01
else
HDF_LIB_NAME=missing
fi
-@@ -21249,7 +21249,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -21250,7 +21250,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21,7 +21,7 @@ Last-Update: 2012-02-01
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -21280,7 +21280,7 @@ fi
+@@ -21281,7 +21281,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
$as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
@@ -30,7 +30,7 @@ Last-Update: 2012-02-01
else
HDF_LIB_NAME=missing
fi
-@@ -21295,7 +21295,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -21296,7 +21296,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -39,7 +39,7 @@ Last-Update: 2012-02-01
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -21326,7 +21326,7 @@ fi
+@@ -21327,7 +21327,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
$as_echo "$ac_cv_lib_mfhdf_SDreaddata" >&6; }
if test "x$ac_cv_lib_mfhdf_SDreaddata" = xyes; then :
diff --git a/debian/patches/inconsistant-typo b/debian/patches/inconsistant-typo
index 162f427..106f01e 100644
--- a/debian/patches/inconsistant-typo
+++ b/debian/patches/inconsistant-typo
@@ -71,7 +71,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
{
--- a/frmts/nitf/nitffile.c
+++ b/frmts/nitf/nitffile.c
-@@ -2624,7 +2624,7 @@ char **NITFGenericMetadataReadTRE(char *
+@@ -2626,7 +2626,7 @@ char **NITFGenericMetadataReadTRE(char *
if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -80,7 +80,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
pszTREName );
}
if (nTreOffset < nTRESize)
-@@ -2760,7 +2760,7 @@ CPLXMLNode* NITFCreateXMLTre(NITFFile* p
+@@ -2762,7 +2762,7 @@ CPLXMLNode* NITFCreateXMLTre(NITFFile* p
if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -197,7 +197,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
return VSIFWriteL(pBuf, size, memb, f);
--- a/swig/python/extensions/gdal_wrap.cpp
+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -3499,7 +3499,7 @@ int wrapper_VSIFWriteL( int nLen, char *
+@@ -3505,7 +3505,7 @@ int wrapper_VSIFWriteL( int nLen, char *
{
if (nLen < size * memb)
{
diff --git a/debian/patches/initalize-typo b/debian/patches/initalize-typo
index e1b0375..2a7e7fc 100644
--- a/debian/patches/initalize-typo
+++ b/debian/patches/initalize-typo
@@ -27,7 +27,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
.nf
--- a/ogr/ogrsf_frmts/ili/ili2reader.cpp
+++ b/ogr/ogrsf_frmts/ili/ili2reader.cpp
-@@ -509,7 +509,7 @@ int ILI2Reader::SetupParser() {
+@@ -511,7 +511,7 @@ int ILI2Reader::SetupParser() {
{
char* msg = tr_strdup(toCatch.getMessage());
CPLError( CE_Failure, CPLE_AppDefined,
diff --git a/debian/patches/ogdi b/debian/patches/ogdi
index 8c1fdd7..e33d9c9 100644
--- a/debian/patches/ogdi
+++ b/debian/patches/ogdi
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Last-Update: 2010-05-13
--- a/GDALmake.opt.in
+++ b/GDALmake.opt.in
-@@ -371,7 +371,7 @@ endif
+@@ -372,7 +372,7 @@ endif
# PCRaster support
PCRASTER_SETTING = @PCRASTER_SETTING@
diff --git a/debian/patches/recommanded-typo b/debian/patches/recommanded-typo
index e53bb5b..e750cce 100644
--- a/debian/patches/recommanded-typo
+++ b/debian/patches/recommanded-typo
@@ -38,7 +38,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
sub-strings in the photooverlay field, and the imagepyramid_tilesize,
--- a/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
-@@ -568,7 +568,7 @@ OGRErr OGRLIBKMLLayer::CreateFeature (
+@@ -571,7 +571,7 @@ OGRErr OGRLIBKMLLayer::CreateFeature (
{
bAlreadyWarned = TRUE;
CPLError(CE_Warning, CPLE_AppDefined,
@@ -49,7 +49,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
else
--- a/ogr/ogrsf_frmts/osm/osm_parser.cpp
+++ b/ogr/ogrsf_frmts/osm/osm_parser.cpp
-@@ -1907,7 +1907,7 @@ static void XMLCALL OSM_XML_startElement
+@@ -1908,7 +1908,7 @@ static void XMLCALL OSM_XML_startElement
else if( psCtxt->bInRelation &&
strcmp(pszName, "member") == 0 )
{
@@ -58,7 +58,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* to realloc over that value */
if (psCtxt->sRelation.nMembers >= psCtxt->nMembersAllocated)
{
-@@ -2248,7 +2248,7 @@ OSMContext* OSM_Open( const char* pszFil
+@@ -2249,7 +2249,7 @@ OSMContext* OSM_Open( const char* pszFil
psCtxt->nTagsAllocated = 256;
psCtxt->pasTags = (OSMTag*) VSIMalloc(sizeof(OSMTag) * psCtxt->nTagsAllocated);
diff --git a/debian/patches/ressource-typo b/debian/patches/ressource-typo
index 7e54c94..1ac3f28 100644
--- a/debian/patches/ressource-typo
+++ b/debian/patches/ressource-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -2267,7 +2267,7 @@ USGSDEM driver:
+@@ -2416,7 +2416,7 @@ USGSDEM driver:
VRT driver:
* Implement VRTDataset::IRasterIO() that can delegate to source Dataset::RasterIO() in particular cases
* Implement GetMinimum() and GetMaximum()
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* VRTComplexSource: correctly deal with complex data type (#3977)
* Fix 2 segfaults related to using '<VRTDataset', but with invalid XML, as the target filename of VRTDataset::Create()
* Fix 'VRTDerivedRasterBand with ComplexSource and nodata value yields potentially uninitialized buffer' (#4045)
-@@ -2789,7 +2789,7 @@ Port:
+@@ -2938,7 +2938,7 @@ Port:
Core:
* RFC 24: progressive/async raster reading
* On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -23,7 +23,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDAL virtual filenames in software offering only file explorers (#3902)
* Assume anything less than 100000 for GDAL_CACHEMAX is measured in metabytes.
* Read cartesian coordinates if applicable in GDALLoadOziMapFile().
-@@ -3209,7 +3209,7 @@ Core:
+@@ -3358,7 +3358,7 @@ Core:
* Add OGRLayer::GetName() and OGRLayer::GetGeomType() virtual methods,
and their C and SWIG mappings (#3719)
* On Unix, add capability of opening the target of a symlink through OGROpen()
@@ -45,7 +45,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/frmts/ecw/ecwdataset.cpp
+++ b/frmts/ecw/ecwdataset.cpp
-@@ -982,7 +982,7 @@ ECWDataset::~ECWDataset()
+@@ -981,7 +981,7 @@ ECWDataset::~ECWDataset()
// bInGDALGlobalDestructor is set to TRUE by gdaldllmain.cpp/GDALDestroy() so as
// to avoid an issue with the ECW SDK 3.3 where the destructor of CNCSJP2File::CNCSJP2FileVector CNCSJP2File::sm_Files;
@@ -56,7 +56,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
// We also have an issue with ECW SDK 5.0 and ECW files on Linux when
--- a/frmts/nitf/nitffile.c
+++ b/frmts/nitf/nitffile.c
-@@ -2203,7 +2203,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2205,7 +2205,7 @@ static char** NITFGenericMetadataReadTRE
{
*pbError = TRUE;
CPLError( CE_Warning, CPLE_AppDefined,
@@ -65,7 +65,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
pszTREName );
break;
}
-@@ -2227,7 +2227,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2229,7 +2229,7 @@ static char** NITFGenericMetadataReadTRE
if (nIterations < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -74,7 +74,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, pszCounter );
*pbError = TRUE;
-@@ -2248,7 +2248,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2250,7 +2250,7 @@ static char** NITFGenericMetadataReadTRE
if (NPART < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -83,7 +83,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NPART" );
*pbError = TRUE;
-@@ -2266,7 +2266,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2268,7 +2268,7 @@ static char** NITFGenericMetadataReadTRE
if (NUMOPG < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -92,7 +92,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NUMOPG" );
*pbError = TRUE;
-@@ -2288,7 +2288,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2290,7 +2290,7 @@ static char** NITFGenericMetadataReadTRE
if (NPAR < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -101,7 +101,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NPAR" );
*pbError = TRUE;
-@@ -2297,7 +2297,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2299,7 +2299,7 @@ static char** NITFGenericMetadataReadTRE
if (NPARO < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -110,7 +110,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NPAR0" );
*pbError = TRUE;
-@@ -2315,7 +2315,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2317,7 +2317,7 @@ static char** NITFGenericMetadataReadTRE
if (NPLN < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -119,7 +119,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NPLN" );
*pbError = TRUE;
-@@ -2337,7 +2337,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2339,7 +2339,7 @@ static char** NITFGenericMetadataReadTRE
if (NXPTS < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -128,7 +128,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NXPTS" );
*pbError = TRUE;
-@@ -2346,7 +2346,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2348,7 +2348,7 @@ static char** NITFGenericMetadataReadTRE
if (NYPTS < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -137,7 +137,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"invalid 'counter' %s",
pszTREName, "NYPTS" );
*pbError = TRUE;
-@@ -2357,7 +2357,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2359,7 +2359,7 @@ static char** NITFGenericMetadataReadTRE
else
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -146,7 +146,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
"missing or invalid 'counter' or 'iterations' or 'formula'",
pszTREName );
*pbError = TRUE;
-@@ -2542,7 +2542,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2544,7 +2544,7 @@ static char** NITFGenericMetadataReadTRE
else
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -208,7 +208,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
}
--- a/port/cpl_vsil_curl.cpp
+++ b/port/cpl_vsil_curl.cpp
-@@ -2631,9 +2631,9 @@ char** VSICurlFilesystemHandler::ReadDir
+@@ -2641,9 +2641,9 @@ char** VSICurlFilesystemHandler::ReadDir
* A special file handler is installed that allows reading on-the-fly of files
* available through HTTP/FTP web protocols, without downloading the entire file.
*
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index a5c1931..425ac75 100644
--- a/debian/patches/spatialite
+++ b/debian/patches/spatialite
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Last-Update: 2011-05-12
--- a/configure
+++ b/configure
-@@ -25200,7 +25200,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25265,7 +25265,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12,7 +12,7 @@ Last-Update: 2011-05-12
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -25254,7 +25254,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25319,7 +25319,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -21,7 +21,7 @@ Last-Update: 2011-05-12
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -25346,7 +25346,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
+@@ -25411,7 +25411,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
diff --git a/debian/patches/supress-typo b/debian/patches/supress-typo
index fd5e95e..1766a70 100644
--- a/debian/patches/supress-typo
+++ b/debian/patches/supress-typo
@@ -25,7 +25,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
<dt> <b>-dsco</b> <em>NAME=VALUE</em>:</dt><dd> Dataset creation option
--- a/NEWS
+++ b/NEWS
-@@ -1904,7 +1904,7 @@ Utilities:
+@@ -2053,7 +2053,7 @@ Utilities:
* gdalwarp: speed-up when using -tps with large number of GCPs
* gdalwarp: add support for optional use of libarmadillo to speed-up matrix inversion in -tps mode
* gdalwarp: detect situations where the user will override the source file
@@ -34,7 +34,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* gdal_rasterize: fix half pixel shift when rasterizing points; make gdal_rasterize utility increase the computed raster extent by a half-pixel for point layers (#3774)
* gdal_rasterize: when source datasource has a single layer, use it implicitely if none of -l or -sql is specified
* nearblack: add -color option (#4085)
-@@ -3598,7 +3598,7 @@ Python bindings:
+@@ -3747,7 +3747,7 @@ Python bindings:
when used and set to True, None is returned when GDALGetGeoTransform()
returns CE_Failure (instead of the fake (0,1,0,0,0,1)); backward
compatibility preserved when the parameter isn't specified
@@ -85,7 +85,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* -------------------------------------------------------------------- */
--- a/frmts/ecw/ecwcreatecopy.cpp
+++ b/frmts/ecw/ecwcreatecopy.cpp
-@@ -810,7 +810,7 @@ CPLErr GDALECWCompressor::Initialize(
+@@ -817,7 +817,7 @@ CPLErr GDALECWCompressor::Initialize(
pszOption = CSLFetchNameValue(papszOptions, "GEODATA_USAGE");
if( pszOption == NULL )
@@ -105,17 +105,6 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* GDAL_SKIP environment variable. */
/* -------------------------------------------------------------------- */
GetGDALDriverManager()->AutoSkipDrivers();
---- a/frmts/gtiff/libtiff/tif_zip.c
-+++ b/frmts/gtiff/libtiff/tif_zip.c
-@@ -36,7 +36,7 @@
- * of the library: this code assumes the 1.0 API and also depends on
- * the ability to write the zlib header multiple times (one per strip)
- * which was not possible with versions prior to 0.95. Note also that
-- * older versions of this codec avoided this bug by supressing the header
-+ * older versions of this codec avoided this bug by suppressing the header
- * entirely. This means that files written with the old library cannot
- * be read; they should be converted to a different compression scheme
- * and then reconverted.
--- a/frmts/zlib/deflate.h
+++ b/frmts/zlib/deflate.h
@@ -188,7 +188,7 @@ typedef struct internal_state {
diff --git a/debian/patches/transfering-typo b/debian/patches/transfering-typo
index f792a85..bf86240 100644
--- a/debian/patches/transfering-typo
+++ b/debian/patches/transfering-typo
@@ -16,7 +16,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
* abort. May need to revisit this behavior. */
--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-@@ -3647,7 +3647,7 @@ int OGROSMDataSource::TransferToDiskIfNe
+@@ -3648,7 +3648,7 @@ int OGROSMDataSource::TransferToDiskIfNe
CPLString osNewTmpDBName;
osNewTmpDBName = CPLGenerateTempFilename("osm_tmp_nodes");
@@ -25,7 +25,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
osNodesFilename.c_str(), osNewTmpDBName.c_str());
if( CPLCopyFile( osNewTmpDBName, osNodesFilename ) != 0 )
-@@ -3726,7 +3726,7 @@ int OGROSMDataSource::TransferToDiskIfNe
+@@ -3727,7 +3727,7 @@ int OGROSMDataSource::TransferToDiskIfNe
osNewTmpDBName = CPLGenerateTempFilename("osm_tmp");
diff --git a/debian/patches/usefull-typo b/debian/patches/usefull-typo
index 4fa0a58..1fb9104 100644
--- a/debian/patches/usefull-typo
+++ b/debian/patches/usefull-typo
@@ -5,7 +5,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
--- a/NEWS
+++ b/NEWS
-@@ -2771,7 +2771,7 @@ Port:
+@@ -2920,7 +2920,7 @@ Port:
- /vsitar/ : to read in .tar or .tgz/.tar.gz files
* Add C API to create ZIP files
* Add support for writable /vsizip/
@@ -14,7 +14,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
doing backward seeks by a few bytes on underlying file handles for which
backwardseeks are very slow, such as GZip handle
* Add service for base64 decoding
-@@ -2789,7 +2789,7 @@ Port:
+@@ -2938,7 +2938,7 @@ Port:
Core:
* RFC 24: progressive/async raster reading
* On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -23,7 +23,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDAL virtual filenames in software offering only file explorers (#3902)
* Assume anything less than 100000 for GDAL_CACHEMAX is measured in metabytes.
* Read cartesian coordinates if applicable in GDALLoadOziMapFile().
-@@ -3209,7 +3209,7 @@ Core:
+@@ -3358,7 +3358,7 @@ Core:
* Add OGRLayer::GetName() and OGRLayer::GetGeomType() virtual methods,
and their C and SWIG mappings (#3719)
* On Unix, add capability of opening the target of a symlink through OGROpen()
@@ -32,7 +32,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
GDAL virtual filenames in software offering only file explorers (#3902)
* Expat based XML readers : add support for reading files with Windows-1252
encoding
-@@ -3479,7 +3479,7 @@ PostgreSQL driver:
+@@ -3628,7 +3628,7 @@ PostgreSQL driver:
is set to YES
* If the PG_USE_BASE64 configuration option is set to YES, geometries will be
requested as BASE64 encoded EWKB instead of canonical HEX encoded EWKB.
@@ -99,7 +99,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* sub-windows of data on a large /vsicurl dataset). */
CPLErr GTiffRasterBand::DirectIO( GDALRWFlag eRWFlag,
-@@ -8649,7 +8649,7 @@ TIFF *GTiffDataset::CreateLL( const char
+@@ -8667,7 +8667,7 @@ TIFF *GTiffDataset::CreateLL( const char
}
/* Set the compression method before asking the default strip size */
@@ -108,8 +108,8 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* the default strip size is 8 or 16 depending on the photometric value */
TIFFSetField( hTIFF, TIFFTAG_COMPRESSION, nCompression );
-@@ -9133,7 +9133,7 @@ GTiffDataset::CreateCopy( const char * p
- int bDirectCopyFromJPEG = FALSE;
+@@ -9155,7 +9155,7 @@ GTiffDataset::CreateCopy( const char * p
+ #endif
/* Note: JPEG_DIRECT_COPY is not defined by default, because it is mainly */
- /* usefull for debugging purposes */
@@ -126,7 +126,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
-/* usefull for debugging purposes */
+/* useful for debugging purposes */
- CPL_CVSID("$Id: gt_jpeg_copy.cpp 27729 2014-09-24 00:40:16Z goatbar $");
+ CPL_CVSID("$Id: gt_jpeg_copy.cpp 27899 2014-10-23 13:36:59Z rouault $");
--- a/frmts/pcraster/pcrasterutil.cpp
+++ b/frmts/pcraster/pcrasterutil.cpp
@@ -185,7 +185,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
int nRasterXSize = 0, nRasterYSize =0;
--- a/gcore/gdalrasterband.cpp
+++ b/gcore/gdalrasterband.cpp
-@@ -4757,7 +4757,7 @@ CPLErr CPL_STDCALL GDALCreateMaskBand( G
+@@ -4766,7 +4766,7 @@ CPLErr CPL_STDCALL GDALCreateMaskBand( G
/**
* \brief Compute translation table for color tables.
*
@@ -271,7 +271,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
*/
--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-@@ -2678,7 +2678,7 @@ int OGROSMDataSource::Open( const char *
+@@ -2679,7 +2679,7 @@ int OGROSMDataSource::Open( const char *
return FALSE;
}
@@ -405,7 +405,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
self.scaleX=self.geotransform[1]
--- a/alg/gdal_rpc.cpp
+++ b/alg/gdal_rpc.cpp
-@@ -336,7 +336,7 @@ typedef struct {
+@@ -357,7 +357,7 @@ static const char* GDALSerializeRPCDEMRe
* an average height above sea level for ground in the target scene.
*
* <li> RPC_HEIGHT_SCALE: a factor used to multiply heights above ground.
@@ -438,7 +438,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
<td class="xml"> <AdviseRead><span class="value">true</span></AdviseRead></td>
--- a/gcore/gdal_priv.h
+++ b/gcore/gdal_priv.h
-@@ -935,7 +935,7 @@ int CPL_DLL GDALCheckDatasetDimensions(
+@@ -955,7 +955,7 @@ int CPL_DLL GDALCheckDatasetDimensions(
int CPL_DLL GDALCheckBandCount( int nBands, int bIsZeroAllowed );
@@ -471,7 +471,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
{
--- a/port/cpl_string.cpp
+++ b/port/cpl_string.cpp
-@@ -2167,7 +2167,7 @@ size_t CPLStrlcat(char* pszDest, const c
+@@ -2170,7 +2170,7 @@ size_t CPLStrlcat(char* pszDest, const c
* the specified number of bytes.
*
* The CPLStrnlen() function returns MIN(strlen(pszStr), nMaxLen).
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git
More information about the Pkg-grass-devel
mailing list