[gdal] 07/15: Refresh patches.
Bas Couwenberg
sebastic at xs4all.nl
Sun May 4 12:27:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch experimental
in repository gdal.
commit d858b16a1f238434e52a91a8881b0b233cce0b61
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat May 3 02:09:53 2014 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/accomodate-typo | 20 ++---
debian/patches/algoritm-typo | 2 +-
debian/patches/allows-typo | 2 +-
debian/patches/bandwith-typo | 13 ++-
debian/patches/consistant-typo | 95 ++++++++++----------
debian/patches/developement-typo | 2 +-
debian/patches/doc | 6 +-
debian/patches/explicitely-typo | 160 +++++++++++++++------------------
debian/patches/gdalpaths | 12 +--
debian/patches/hardening | 2 +-
debian/patches/hdf4 | 10 +--
debian/patches/inconsistant-typo | 22 ++---
debian/patches/initalize-typo | 10 +--
debian/patches/java-make | 12 ++-
debian/patches/java.opt | 5 +-
debian/patches/ogdi | 2 +-
debian/patches/paramters-typo | 6 +-
debian/patches/ressource-typo | 42 ++++-----
debian/patches/spatialite | 31 +++----
debian/patches/supress-typo | 2 +-
debian/patches/symver | 9 +-
debian/patches/transfered-typo | 8 +-
debian/patches/transfering-typo | 4 +-
debian/patches/usefull-typo | 186 ++++++++++++++++++++++++++++-----------
25 files changed, 372 insertions(+), 292 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index cdfe42f..7088af4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gdal (1.11.0+dfsg-1) UNRELEASED; urgency=low
* Drop patch: man, applied upstream.
* Drop patch: unkown-typo, applied upstream.
* Drop patch: hurd-i386-pathmax, file removed upstream.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at xs4all.nl> Wed, 30 Apr 2014 20:10:05 +0200
diff --git a/debian/patches/accomodate-typo b/debian/patches/accomodate-typo
index 6de5547..01c55b9 100644
--- a/debian/patches/accomodate-typo
+++ b/debian/patches/accomodate-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/NEWS
+++ b/NEWS
-@@ -3106,7 +3106,7 @@ GeoTIFF driver :
+@@ -3665,7 +3665,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)
@@ -25,7 +25,7 @@ Last-Update: 2013-10-11
rmax=rmax*dscale;
--- a/frmts/gtiff/geotiff.cpp
+++ b/frmts/gtiff/geotiff.cpp
-@@ -1188,7 +1188,7 @@ CPLErr GTiffRasterBand::FillCacheForOthe
+@@ -1524,7 +1524,7 @@ CPLErr GTiffRasterBand::FillCacheForOthe
/* and O(nBands^2) performance ! */
/* */
/* If there are many bands and the block cache size is not big */
@@ -36,7 +36,7 @@ Last-Update: 2013-10-11
nBlockXSize * nBlockYSize * (GDALGetDataTypeSize(eDataType) / 8) < GDALGetCacheMax64() / poGDS->nBands)
--- a/frmts/gtiff/gt_wkt_srs.cpp
+++ b/frmts/gtiff/gt_wkt_srs.cpp
-@@ -487,7 +487,7 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
+@@ -433,7 +433,7 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
&& psDefn->UOMLengthInMeters != 1.0 )
{
psDefn->ProjParm[iParm] /= psDefn->UOMLengthInMeters;
@@ -76,11 +76,11 @@ Last-Update: 2013-10-11
-Mosaicing into an existing output file is supported if the output file already exists. The spatial extent of the existing file will not be modified to accomodate new data, so you may have to remove it in that case, or use the -overwrite option.
+Mosaicing into an existing output file is supported if the output file already exists. The spatial extent of the existing file will not be modified to accommodate new data, so you may have to remove it in that case, or use the -overwrite option.
.PP
- Polygon cutlines may be used as a mask to restrict the area of the destination file that may be updated, including blending. If the OGR layer containing the cutline features has no explicit SRS, the cutline features must be in the georeferenced units of the destination file. When outputing to a not yet existing target dataset, its extent will be the one of the original raster unless -te or -crop_to_cutline are specified.
+ Polygon cutlines may be used as a mask to restrict the area of the destination file that may be updated, including blending. If the OGR layer containing the cutline features has no explicit SRS, the cutline features must be in the SRS of the destination file. When outputing to a not yet existing target dataset, its extent will be the one of the original raster unless -te or -crop_to_cutline are specified.
.SH "EXAMPLE"
--- a/ogr/ogr_api.cpp
+++ b/ogr/ogr_api.cpp
-@@ -337,7 +337,7 @@ void OGR_G_GetPoint( OGRGeometryH hGeom,
+@@ -437,7 +437,7 @@ void CPL_DLL OGR_G_SetPoints( OGRGeometr
*
* If iPoint is larger than the number of existing
* points in the linestring, the point count will be increased to
@@ -89,7 +89,7 @@ Last-Update: 2013-10-11
*
* @param hGeom handle to the geometry to add a vertex to.
* @param i the index of the vertex to assign (zero based) or
-@@ -395,7 +395,7 @@ void OGR_G_SetPoint( OGRGeometryH hGeom,
+@@ -495,7 +495,7 @@ void OGR_G_SetPoint( OGRGeometryH hGeom,
*
* If iPoint is larger than the number of existing
* points in the linestring, the point count will be increased to
@@ -100,7 +100,7 @@ Last-Update: 2013-10-11
* @param i the index of the vertex to assign (zero based) or
--- a/ogr/ogrlinestring.cpp
+++ b/ogr/ogrlinestring.cpp
-@@ -355,7 +355,7 @@ void OGRLineString::setNumPoints( int nN
+@@ -360,7 +360,7 @@ void OGRLineString::setNumPoints( int nN
*
* If iPoint is larger than the number of necessary the number of existing
* points in the line string, the point count will be increased to
@@ -109,7 +109,7 @@ Last-Update: 2013-10-11
*
* There is no SFCOM analog to this method.
*
-@@ -381,7 +381,7 @@ void OGRLineString::setPoint( int iPoint
+@@ -386,7 +386,7 @@ void OGRLineString::setPoint( int iPoint
*
* If iPoint is larger than the number of necessary the number of existing
* points in the line string, the point count will be increased to
@@ -131,7 +131,7 @@ Last-Update: 2013-10-11
* Added PC Arc/Info coverages support
--- a/ogr/ogrsf_frmts/shape/drv_shapefile.html
+++ b/ogr/ogrsf_frmts/shape/drv_shapefile.html
-@@ -155,7 +155,7 @@ the datasource ExecuteSQL() method.</p>
+@@ -157,7 +157,7 @@ the datasource ExecuteSQL() method.</p>
<h2>Field sizes</h2>
<p>Starting with GDAL/OGR 1.10, the driver knows to auto-extend string and integer fields
@@ -226,7 +226,7 @@ Last-Update: 2013-10-11
* zero for a point.
--- a/apps/gdalwarp.cpp
+++ b/apps/gdalwarp.cpp
-@@ -204,7 +204,7 @@ Set the color interpretation of the band
+@@ -206,7 +206,7 @@ Set the color interpretation of the band
Mosaicing into an existing output file is supported if the output file
already exists. The spatial extent of the existing file will not
diff --git a/debian/patches/algoritm-typo b/debian/patches/algoritm-typo
index 8154f14..7a97276 100644
--- a/debian/patches/algoritm-typo
+++ b/debian/patches/algoritm-typo
@@ -14,7 +14,7 @@ Last-Update: 2013-10-11
--- a/alg/gdalgrid.cpp
+++ b/alg/gdalgrid.cpp
-@@ -2032,17 +2032,17 @@ GDALGridCreate( GDALGridAlgorithm eAlgor
+@@ -2045,17 +2045,17 @@ GDALGridCreate( GDALGridAlgorithm eAlgor
/* defaults. */
/************************************************************************/
diff --git a/debian/patches/allows-typo b/debian/patches/allows-typo
index 947abd8..dec7334 100644
--- a/debian/patches/allows-typo
+++ b/debian/patches/allows-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-13
--- a/swig/python/scripts/gdal_edit.dox
+++ b/swig/python/scripts/gdal_edit.dox
-@@ -14,7 +14,7 @@ gdal_edit [--help-general] [-a_srs srs_d
+@@ -14,7 +14,7 @@ gdal_edit [--help-general] [-ro] [-a_srs
\section gdal_edit_description DESCRIPTION
diff --git a/debian/patches/bandwith-typo b/debian/patches/bandwith-typo
index 71db03a..7a063db 100644
--- a/debian/patches/bandwith-typo
+++ b/debian/patches/bandwith-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
-@@ -444,7 +444,7 @@ int OGRSQLiteDataSource::OpenOrCreateDB(
+@@ -495,7 +495,7 @@ int OGRSQLiteDataSource::OpenOrCreateDB(
{
CPLError( CE_Failure, CPLE_OpenFailed, "%s",
"A trigger and/or view calls a OGR extension SQL function that could be used to "
@@ -12,3 +12,14 @@ Last-Update: 2013-10-11
"The database will not be opened unless the ALLOW_OGR_SQL_FUNCTIONS_FROM_TRIGGER_AND_VIEW "
"configuration option to YES.");
return FALSE;
+--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
++++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
+@@ -395,7 +395,7 @@ void OGRSQLiteLayer::BuildFeatureDefn( c
+ }
+
+ // Recognize a geometry column from trying to build the geometry
+- // Usefull for OGRSQLiteSelectLayer
++ // Useful for OGRSQLiteSelectLayer
+ if( nColType == SQLITE_BLOB &&
+ (bAllowMultipleGeomFields || poFeatureDefn->GetGeomFieldCount() == 0) )
+ {
diff --git a/debian/patches/consistant-typo b/debian/patches/consistant-typo
index 8705b51..bd6c2d1 100644
--- a/debian/patches/consistant-typo
+++ b/debian/patches/consistant-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/NEWS
+++ b/NEWS
-@@ -1149,7 +1149,7 @@ Utilities:
+@@ -1708,7 +1708,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
@@ -12,7 +12,7 @@ Last-Update: 2013-10-11
* Add --pause for convenient debugging, document it and --locale
Multi-driver topics:
-@@ -1607,7 +1607,7 @@ Utilities:
+@@ -2166,7 +2166,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
@@ -21,7 +21,7 @@ Last-Update: 2013-10-11
* ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
Multi driver topics:
-@@ -2113,7 +2113,7 @@ Utilities :
+@@ -2672,7 +2672,7 @@ Utilities :
to align on a standard grid (#3772)
AAIGRID driver:
@@ -30,7 +30,7 @@ Last-Update: 2013-10-11
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)
-@@ -2220,7 +2220,7 @@ GTX driver:
+@@ -2779,7 +2779,7 @@ GTX driver:
* Read NOAA .gtx vertical datum shift files.
GXF driver:
@@ -39,7 +39,7 @@ Last-Update: 2013-10-11
GDT_Float32 case
* Introduce a GXF_DATATYPE configuration option that can be set to Float64
* Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
-@@ -2453,7 +2453,7 @@ Core:
+@@ -3012,7 +3012,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
@@ -48,7 +48,7 @@ Last-Update: 2013-10-11
ST_Centroid() capabilities and the underlying GEOS method
* Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
datasources and layers virtual (#2978)
-@@ -3544,7 +3544,7 @@ General:
+@@ -4103,7 +4103,7 @@ General:
osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
* Make resampling an optionnal parameter for gdal.RegenerateOverview(),
@@ -57,7 +57,7 @@ Last-Update: 2013-10-11
* NONNULL checks have been added to check various arguments of methods
* add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
-@@ -3723,7 +3723,7 @@ Utilities:
+@@ -4282,7 +4282,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)
@@ -68,7 +68,7 @@ Last-Update: 2013-10-11
* gdal_rasterize: check that coordinates systems match (Ticket #1937)
--- a/alg/gdaltransformer.cpp
+++ b/alg/gdaltransformer.cpp
-@@ -775,7 +775,7 @@ retry:
+@@ -776,7 +776,7 @@ retry:
/* -------------------------------------------------------------------- */
@@ -79,7 +79,7 @@ Last-Update: 2013-10-11
dfMinYOut = dfMaxYOut - (*pnLines) * dfPixelSizeY;
--- a/apps/commonutils.cpp
+++ b/apps/commonutils.cpp
-@@ -36,7 +36,7 @@ CPL_CVSID("$Id: commonutils.cpp 25416 20
+@@ -36,7 +36,7 @@ CPL_CVSID("$Id: commonutils.cpp 27044 20
/* -------------------------------------------------------------------- */
/* CheckExtensionConsistency() */
/* */
@@ -90,7 +90,7 @@ Last-Update: 2013-10-11
/* or several drivers, and not by the selected one) */
--- a/apps/nearblack.cpp
+++ b/apps/nearblack.cpp
-@@ -184,7 +184,7 @@ int main( int argc, char ** argv )
+@@ -185,7 +185,7 @@ int main( int argc, char ** argv )
CSLDestroy( papszTokens );
@@ -112,7 +112,7 @@ Last-Update: 2013-10-11
--- a/frmts/bsb/bsb_read.c
+++ b/frmts/bsb/bsb_read.c
-@@ -643,7 +643,7 @@ static int BSBReadHeaderLine( BSBInfo *p
+@@ -644,7 +644,7 @@ static int BSBReadHeaderLine( BSBInfo *p
/* BSBSeekAndCheckScanlineNumber() */
/* */
/* Seek to the beginning of the scanline and check that the */
@@ -121,7 +121,7 @@ Last-Update: 2013-10-11
/* */
/* @param nScanline zero based line number */
/************************************************************************/
-@@ -768,7 +768,7 @@ int BSBReadScanline( BSBInfo *psInfo, in
+@@ -769,7 +769,7 @@ int BSBReadScanline( BSBInfo *psInfo, in
/* -------------------------------------------------------------------- */
/* Seek to the beginning of the scanline and check that the */
@@ -132,7 +132,7 @@ Last-Update: 2013-10-11
{
--- a/frmts/nitf/nitfdataset.cpp
+++ b/frmts/nitf/nitfdataset.cpp
-@@ -3563,7 +3563,7 @@ CPLErr NITFDataset::ReadJPEGBlock( int i
+@@ -3577,7 +3577,7 @@ CPLErr NITFDataset::ReadJPEGBlock( int i
if( poDS->GetRasterBand(1)->GetRasterDataType() != GetRasterBand(1)->GetRasterDataType())
{
CPLError( CE_Failure, CPLE_AppDefined,
@@ -143,7 +143,7 @@ Last-Update: 2013-10-11
delete poDS;
--- a/frmts/nitf/nitfimage.c
+++ b/frmts/nitf/nitfimage.c
-@@ -3300,7 +3300,7 @@ static void NITFLoadLocationTable( NITFI
+@@ -3301,7 +3301,7 @@ static void NITFLoadLocationTable( NITFI
}
else
{
@@ -152,7 +152,7 @@ Last-Update: 2013-10-11
bFoundValidLocation = FALSE;
break;
}
-@@ -3313,7 +3313,7 @@ static void NITFLoadLocationTable( NITFI
+@@ -3314,7 +3314,7 @@ static void NITFLoadLocationTable( NITFI
}
else
{
@@ -163,7 +163,7 @@ Last-Update: 2013-10-11
}
--- a/gcore/gdalpamrasterband.cpp
+++ b/gcore/gdalpamrasterband.cpp
-@@ -998,7 +998,7 @@ PamParseHistogram( CPLXMLNode *psHistIte
+@@ -999,7 +999,7 @@ PamParseHistogram( CPLXMLNode *psHistIte
if( strlen(pszHistCounts) < 2 * (size_t)(*pnBuckets) -1 )
{
CPLError(CE_Failure, CPLE_AppDefined,
@@ -174,7 +174,7 @@ Last-Update: 2013-10-11
--- a/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
+++ b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
-@@ -882,7 +882,7 @@ OGRFeature *OGRGenSQLResultsLayer::Trans
+@@ -1120,7 +1120,7 @@ OGRFeature *OGRGenSQLResultsLayer::Trans
// If joining a (primary) numeric column with a (secondary) string column
// then add implicit casting of the secondary column to numeric. This behaviour
@@ -185,36 +185,37 @@ Last-Update: 2013-10-11
if( eSecondaryFieldType == OFTString &&
--- a/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
-@@ -459,13 +459,13 @@ void OGRUnionLayer::AutoWarpLayerIfNeces
- (poSRS != NULL && poSRS2 == NULL) )
- {
- CPLError(CE_Warning, CPLE_AppDefined,
-- "SRS of layer %s not consistant with layer SRS",
-+ "SRS of layer %s not consistent with layer SRS",
- papoSrcLayers[iLayer]->GetName());
- }
- else if (poSRS != NULL && poSRS2 != NULL &&
- poSRS != poSRS2 && !poSRS->IsSame(poSRS2))
- {
-- CPLDebug("VRT", "SRS of layer %s not consistant with layer SRS. "
-+ CPLDebug("VRT", "SRS of layer %s not consistent with layer SRS. "
- "Trying auto warping",
- papoSrcLayers[iLayer]->GetName());
- OGRCoordinateTransformation* poCT =
+@@ -632,14 +632,14 @@ void OGRUnionLayer::AutoWarpLayerIfNeces
+ (poSRS != NULL && poSRS2 == NULL) )
+ {
+ CPLError(CE_Warning, CPLE_AppDefined,
+- "SRS of geometry field '%s' layer %s not consistant with UnionLayer SRS",
++ "SRS of geometry field '%s' layer %s not consistent with UnionLayer SRS",
+ GetLayerDefn()->GetGeomFieldDefn(i)->GetNameRef(),
+ papoSrcLayers[iLayer]->GetName());
+ }
+ else if (poSRS != NULL && poSRS2 != NULL &&
+ poSRS != poSRS2 && !poSRS->IsSame(poSRS2))
+ {
+- CPLDebug("VRT", "SRS of geometry field '%s' layer %s not consistant with UnionLayer SRS. "
++ CPLDebug("VRT", "SRS of geometry field '%s' layer %s not consistent with UnionLayer SRS. "
+ "Trying auto warping",
+ GetLayerDefn()->GetGeomFieldDefn(i)->GetNameRef(),
+ papoSrcLayers[iLayer]->GetName());
--- a/ogr/ogrsf_frmts/gml/drv_gml.html
+++ b/ogr/ogrsf_frmts/gml/drv_gml.html
-@@ -105,7 +105,7 @@ When reading a feature, the driver will
- last recognized GML geometry found (in case they are multiples) in the XML subtree describing the feature.<p>
+@@ -126,7 +126,7 @@ fields will be reported by the GML drive
+ <a href="http://trac.osgeo.org/gdal/wiki/rfc41_multiple_geometry_fields">RFC 41</a>.<p>
Starting with OGR 1.10, in case of multiple geometry occurences, if a geometry is in a <geometry> element,
-this will be the one selected. This will make default behaviour consistant with Inspire objects.<p>
+this will be the one selected. This will make default behaviour consistent with Inspire objects.<p>
+
Starting with OGR 1.8.0, the user can change the .gfs file to select the appropriate
- geometry by specifying its path with the <GeometryElementPath> element. See the
--- a/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp
+++ b/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp
-@@ -160,7 +160,7 @@ int OGRIdrisiLayer::Detect_AVL_ADC(const
+@@ -161,7 +161,7 @@ int OGRIdrisiLayer::Detect_AVL_ADC(const
if( pszRecords == NULL || atoi(pszRecords) != (int)nTotalFeatures )
{
CPLDebug("IDRISI", ".adc file found, but 'records' not found or not "
@@ -236,7 +237,7 @@ Last-Update: 2013-10-11
/* -------------------------------------------------------------------- */
--- a/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
+++ b/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
-@@ -1089,7 +1089,7 @@ OGRFeature *OGRWFSLayer::GetNextFeature(
+@@ -1092,7 +1092,7 @@ OGRFeature *OGRWFSLayer::GetNextFeature(
poBaseLayer = poBaseDS->GetLayer(0);
poBaseLayer->ResetReading();
@@ -247,7 +248,7 @@ Last-Update: 2013-10-11
bGotApproximateLayerDefn = TRUE;
--- a/port/cpl_csv.cpp
+++ b/port/cpl_csv.cpp
-@@ -462,7 +462,7 @@ char CSVDetectSeperator (const char* psz
+@@ -463,7 +463,7 @@ char CSVDetectSeperator (const char* psz
chDelimiter = *pszLine;
else if (chDelimiter != *pszLine)
{
@@ -258,7 +259,7 @@ Last-Update: 2013-10-11
chDelimiter = ',';
--- a/swig/include/gdal_array.i
+++ b/swig/include/gdal_array.i
-@@ -622,9 +622,9 @@ def BandReadAsArray( band, xoff = 0, yof
+@@ -984,9 +984,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:
@@ -310,7 +311,7 @@ Last-Update: 2013-10-11
* This buffer must contain at least buf_xsize *
--- a/swig/python/osgeo/gdal_array.py
+++ b/swig/python/osgeo/gdal_array.py
-@@ -208,9 +208,9 @@ def BandReadAsArray( band, xoff = 0, yof
+@@ -252,9 +252,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:
@@ -325,7 +326,7 @@ Last-Update: 2013-10-11
--- a/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp
+++ b/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp
@@ -55,7 +55,7 @@ GMLFeatureClass::GMLFeatureClass( const
- m_nGeometryIndex = -1;
+ m_nFeatureCount = -1; // unknown
m_pszSRSName = NULL;
- m_bSRSNameConsistant = TRUE;
@@ -333,7 +334,7 @@ Last-Update: 2013-10-11
}
/************************************************************************/
-@@ -291,7 +291,7 @@ int GMLFeatureClass::GetExtents( double
+@@ -355,7 +355,7 @@ int GMLFeatureClass::GetExtents( double
void GMLFeatureClass::SetSRSName( const char* pszSRSName )
{
@@ -342,7 +343,7 @@ Last-Update: 2013-10-11
CPLFree(m_pszSRSName);
m_pszSRSName = (pszSRSName) ? CPLStrdup(pszSRSName) : NULL;
}
-@@ -303,7 +303,7 @@ void GMLFeatureClass::SetSRSName( const
+@@ -367,7 +367,7 @@ void GMLFeatureClass::SetSRSName( const
void GMLFeatureClass::MergeSRSName( const char* pszSRSName )
{
@@ -351,7 +352,7 @@ Last-Update: 2013-10-11
return;
if( m_pszSRSName == NULL )
-@@ -313,9 +313,9 @@ void GMLFeatureClass::MergeSRSName( cons
+@@ -377,9 +377,9 @@ void GMLFeatureClass::MergeSRSName( cons
}
else
{
@@ -365,8 +366,8 @@ Last-Update: 2013-10-11
m_pszSRSName = NULL;
--- a/ogr/ogrsf_frmts/gml/gmlreader.h
+++ b/ogr/ogrsf_frmts/gml/gmlreader.h
-@@ -122,7 +122,7 @@ class CPL_DLL GMLFeatureClass
- int m_nGeometryIndex;
+@@ -151,7 +151,7 @@ class CPL_DLL GMLFeatureClass
+ double m_dfYMax;
char *m_pszSRSName;
- int m_bSRSNameConsistant;
diff --git a/debian/patches/developement-typo b/debian/patches/developement-typo
index d24af28..dfe73fc 100644
--- a/debian/patches/developement-typo
+++ b/debian/patches/developement-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/NEWS
+++ b/NEWS
-@@ -224,7 +224,7 @@ Build(Unix):
+@@ -783,7 +783,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)
diff --git a/debian/patches/doc b/debian/patches/doc
index f3743f6..4a8c79a 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -4,8 +4,8 @@ Last-Update: 2013-10-13
--- a/doc/index.dox
+++ b/doc/index.dox
@@ -19,7 +19,7 @@ for data translation and processing. Th
- <a href="http://trac.osgeo.org/gdal/wiki/Release/1.9.2-News">NEWS</a>
- page describes the October 2012 GDAL/OGR 1.9.2 release.
+ <a href="http://trac.osgeo.org/gdal/wiki/Release/1.10.1-News">NEWS</a>
+ page describes the August 2013 GDAL/OGR 1.10.1 release.
-The related <a href="ogr/index.html">OGR</a> library (which lives within the GDAL source tree)
+The related <a href="../ogr/index.html">OGR</a> library (which lives within the GDAL source tree)
@@ -74,7 +74,7 @@ Last-Update: 2013-10-13
+++ b/doc/br/index_br.dox
@@ -29,7 +29,7 @@ A página
<a href="http://trac.osgeo.org/gdal/wiki/Release/1.9.0-News">novidades</a> descreve o
- lançamento em Dezembro de 2011 da release 1.9.0 da biblioteca GDAL/OGR.
+ lançamento em Abril de 2013 da release 1.10.0 da biblioteca GDAL/OGR.
-A bilioteca <a href="ogr">OGR</a> (cujo código fonte esta incluído na GDAL) possue
+A bilioteca <a href="../ogr/index.html">OGR</a> (cujo código fonte esta incluído na GDAL) possue
diff --git a/debian/patches/explicitely-typo b/debian/patches/explicitely-typo
index 93aeb93..dc00c26 100644
--- a/debian/patches/explicitely-typo
+++ b/debian/patches/explicitely-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/NEWS
+++ b/NEWS
-@@ -752,7 +752,7 @@ GML driver:
+@@ -1311,7 +1311,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/
@@ -12,7 +12,7 @@ Last-Update: 2013-10-11
* 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)
-@@ -1553,7 +1553,7 @@ Core:
+@@ -2112,7 +2112,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)
@@ -23,7 +23,7 @@ Last-Update: 2013-10-11
* OGR SQL: Add a mechanism to delete a layer (DROP TABLE x)
--- a/apps/gdal_rasterize.cpp
+++ b/apps/gdal_rasterize.cpp
-@@ -340,7 +340,7 @@ GDALDatasetH CreateOutputDataset(std::ve
+@@ -341,7 +341,7 @@ GDALDatasetH CreateOutputDataset(std::ve
}
/* When rasterizing point layers and that the bounds have */
@@ -32,7 +32,7 @@ Last-Update: 2013-10-11
/* a half-pixel size to avoid missing points on the border */
if (wkbFlatten(OGR_L_GetGeomType(hLayer)) == wkbPoint &&
!bTargetAlignedPixels && dfXRes != 0 && dfYRes != 0)
-@@ -478,7 +478,7 @@ int main( int argc, char ** argv )
+@@ -479,7 +479,7 @@ int main( int argc, char ** argv )
double dfXRes = 0, dfYRes = 0;
int bCreateOutput = FALSE;
const char* pszFormat = "GTiff";
@@ -41,7 +41,7 @@ Last-Update: 2013-10-11
char **papszCreateOptions = NULL;
GDALDriverH hDriver = NULL;
GDALDataType eOutputType = GDT_Float64;
-@@ -606,7 +606,7 @@ int main( int argc, char ** argv )
+@@ -607,7 +607,7 @@ int main( int argc, char ** argv )
else if( EQUAL(argv[i],"-of") && i < argc-1 )
{
pszFormat = argv[++i];
@@ -50,7 +50,7 @@ Last-Update: 2013-10-11
bCreateOutput = TRUE;
}
else if( EQUAL(argv[i],"-init") && i < argc - 1 )
-@@ -858,7 +858,7 @@ int main( int argc, char ** argv )
+@@ -859,7 +859,7 @@ int main( int argc, char ** argv )
exit( 1 );
}
@@ -81,7 +81,7 @@ Last-Update: 2013-10-11
EQUAL(pszFilename, "grid_cell1.gz") ||
--- a/frmts/ecw/ecwasyncreader.cpp
+++ b/frmts/ecw/ecwasyncreader.cpp
-@@ -280,7 +280,7 @@ NCSEcwReadStatus ECWAsyncReader::Refresh
+@@ -281,7 +281,7 @@ NCSEcwReadStatus ECWAsyncReader::Refresh
poReader->bComplete = TRUE;
}
@@ -123,7 +123,7 @@ Last-Update: 2013-10-11
--- a/frmts/nitf/nitfdataset.cpp
+++ b/frmts/nitf/nitfdataset.cpp
-@@ -605,7 +605,7 @@ GDALDataset *NITFDataset::OpenInternal(
+@@ -606,7 +606,7 @@ GDALDataset *NITFDataset::OpenInternal(
}
else
{
@@ -132,7 +132,7 @@ Last-Update: 2013-10-11
/* to be opened by a random driver, and also to make sure that */
/* a future new JPEG2000 compatible driver derives from GDALPamDataset */
static const char * const apszDrivers[] = { "JP2KAK", "JP2ECW", "JP2MRSID",
-@@ -4178,7 +4178,7 @@ NITFDataset::NITFCreateCopy(
+@@ -4225,7 +4225,7 @@ NITFDataset::NITFCreateCopy(
if (CSLPartialFindString(papszFullOptions, "TRE=GEOLOB=") != - 1)
{
@@ -141,7 +141,7 @@ Last-Update: 2013-10-11
"Overriding it with current georefencing info.");
}
-@@ -4205,7 +4205,7 @@ NITFDataset::NITFCreateCopy(
+@@ -4252,7 +4252,7 @@ NITFDataset::NITFCreateCopy(
papszFullOptions = CSLAddString( papszFullOptions, osGEOLOB ) ;
/* -------------------------------------------------------------------- */
@@ -150,7 +150,7 @@ Last-Update: 2013-10-11
/* -------------------------------------------------------------------- */
if (CSLPartialFindString(papszFullOptions, "FILE_TRE=GEOPSB=") == -1 &&
CSLPartialFindString(papszFullOptions, "TRE=GEOPSB=") == -1)
-@@ -4237,7 +4237,7 @@ NITFDataset::NITFCreateCopy(
+@@ -4284,7 +4284,7 @@ NITFDataset::NITFCreateCopy(
}
else
{
@@ -159,23 +159,9 @@ Last-Update: 2013-10-11
}
}
---- a/frmts/pdf/frmt_pdf.html
-+++ b/frmts/pdf/frmt_pdf.html
-@@ -64,9 +64,9 @@ specified, all features are rendered.</l
- Defaults to 3.</li>
- <li><i>GDAL_PDF_LAYERS</i> = list of layers (comma separated) to turn ON (or "ALL" to turn all layers ON).
- The layer names can be obtained by querying the LAYERS metadata domain. When this option is specified,
--layers not explicitely listed will be turned off.</li>
-+layers not explicitly listed will be turned off.</li>
- <li><i>GDAL_PDF_LAYERS_OFF</i> = list of layers (comma separated) to turn OFF. The layer names can be obtained by
--querying the LAYERS metadata domain. When this option is specified, layers not explicitely listed will be turned
-+querying the LAYERS metadata domain. When this option is specified, layers not explicitly listed will be turned
- off.</li>
- </ul>
-
--- a/frmts/pdf/pdfdataset.cpp
+++ b/frmts/pdf/pdfdataset.cpp
-@@ -2509,7 +2509,7 @@ void PDFDataset::TurnLayersOnOff()
+@@ -2511,7 +2511,7 @@ void PDFDataset::TurnLayersOnOff()
oIter->second->setState(OptionalContentGroup::On);
}
@@ -184,7 +170,7 @@ Last-Update: 2013-10-11
// in the list.
size_t nLen = strlen(papszLayers[i]);
int bFoundChildLayer = FALSE;
-@@ -4968,7 +4968,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
+@@ -4970,7 +4970,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
bGeoTransformValid = TRUE;
bProjDirty = TRUE;
@@ -193,7 +179,7 @@ Last-Update: 2013-10-11
if (!bNeatLineDirty)
SetMetadataItem("NEATLINE", NULL);
return CE_None;
-@@ -5140,7 +5140,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
+@@ -5153,7 +5153,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
bProjDirty = TRUE;
@@ -204,7 +190,7 @@ Last-Update: 2013-10-11
--- a/frmts/xyz/xyzdataset.cpp
+++ b/frmts/xyz/xyzdataset.cpp
-@@ -314,7 +314,7 @@ int XYZDataset::IdentifyEx( GDALOpenInfo
+@@ -475,7 +475,7 @@ int XYZDataset::IdentifyEx( GDALOpenInfo
GDALOpenInfo* poOpenInfoToDelete = NULL;
/* GZipped .xyz files are common, so automagically open them */
@@ -213,7 +199,7 @@ Last-Update: 2013-10-11
if (strlen(poOpenInfo->pszFilename) > 6 &&
EQUAL(poOpenInfo->pszFilename + strlen(poOpenInfo->pszFilename) - 6, "xyz.gz") &&
!EQUALN(poOpenInfo->pszFilename, "/vsigzip/", 9))
-@@ -446,7 +446,7 @@ GDALDataset *XYZDataset::Open( GDALOpenI
+@@ -607,7 +607,7 @@ GDALDataset *XYZDataset::Open( GDALOpenI
CPLString osFilename(poOpenInfo->pszFilename);
/* GZipped .xyz files are common, so automagically open them */
@@ -224,7 +210,7 @@ Last-Update: 2013-10-11
!EQUALN(poOpenInfo->pszFilename, "/vsigzip/", 9))
--- a/gcore/gdaldataset.cpp
+++ b/gcore/gdaldataset.cpp
-@@ -2346,7 +2346,7 @@ GDALDatasetH GDALOpenInternal( GDALOpenI
+@@ -2385,7 +2385,7 @@ GDALDatasetH GDALOpenInternal( GDALOpenI
* Starting with GDAL 1.6.0, if GDALOpenShared() is called on the same pszFilename
* from two different threads, a different GDALDataset object will be returned as
* it is not safe to use the same dataset from different threads, unless the user
@@ -235,7 +221,7 @@ Last-Update: 2013-10-11
* a file in a .zip archive (see VSIInstallZipFileHandler()), in a .tar/.tar.gz/.tgz archive
--- a/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
+++ b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
-@@ -134,7 +134,7 @@ OGRGenSQLResultsLayer::OGRGenSQLResultsL
+@@ -152,7 +152,7 @@ OGRGenSQLResultsLayer::OGRGenSQLResultsL
poSrcLayer = papoTableLayers[0];
/* -------------------------------------------------------------------- */
@@ -246,7 +232,7 @@ Last-Update: 2013-10-11
/* -------------------------------------------------------------------- */
--- a/ogr/ogrsf_frmts/gml/drv_gml.html
+++ b/ogr/ogrsf_frmts/gml/drv_gml.html
-@@ -289,7 +289,7 @@ the layers must be read in the order the
+@@ -312,7 +312,7 @@ the layers must be read in the order the
If no .xsd and .gfs files are found, the parser will detect the layout of layers when
building the .gfs file. If the layers are found to be sequential, a <i><SequentialLayers>true</SequentialLayers></i>
element will be written in the .gfs file, so that the GML_READ_MODE will be automatically
@@ -299,7 +285,7 @@ Last-Update: 2013-10-11
@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
-@@ -3928,7 +3928,7 @@ OGRLayer * OGROSMDataSource::ExecuteSQL(
+@@ -4110,7 +4110,7 @@ OGRLayer * OGROSMDataSource::ExecuteSQL(
poSpatialFilter,
pszDialect );
@@ -310,7 +296,7 @@ Last-Update: 2013-10-11
if( pszDialect != NULL && EQUAL(pszDialect, "SQLITE") )
--- a/ogr/ogrsf_frmts/pg/drv_pg_advanced.html
+++ b/ogr/ogrsf_frmts/pg/drv_pg_advanced.html
-@@ -101,7 +101,7 @@ mode, will be retrieved from the databas
+@@ -116,7 +116,7 @@ mode, will be retrieved from the databas
new behaviour is that you must be careful if you re-use the same feature object in a loop that makes
insertions. After the first iteration, the FID will be set to a non-null value, so at the second iteration,
CreateFeature() will try to insert the new feature with the FID of the previous feature, which will fail as
@@ -321,7 +307,7 @@ Last-Update: 2013-10-11
Snippet example in Python :
--- a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
+++ b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
-@@ -558,7 +558,7 @@ class OGRSQLiteDataSource : public OGRDa
+@@ -607,7 +607,7 @@ class OGRSQLiteDataSource : public OGRDa
#endif
VSILFILE* fpMainFile; /* Set by the VFS layer when it opens the DB */
@@ -332,7 +318,7 @@ Last-Update: 2013-10-11
--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
-@@ -524,7 +524,7 @@ int OGR2SQLITE_ConnectCreate(sqlite3* hD
+@@ -526,7 +526,7 @@ int OGR2SQLITE_ConnectCreate(sqlite3* hD
if( poDS->GetLayerCount() > 1 )
{
@@ -343,7 +329,7 @@ Last-Update: 2013-10-11
return SQLITE_ERROR;
--- a/ogr/ogrsf_frmts/vrt/drv_vrt.html
+++ b/ogr/ogrsf_frmts/vrt/drv_vrt.html
-@@ -117,7 +117,7 @@ If set to FALSE, the source geometry fie
+@@ -146,7 +146,7 @@ element to wkbNone.
<li> <b>SrcRegion</b> (optionnal, from GDAL 1.7.0) : This element is used
to define an initial spatial filter for the source features. This spatial
@@ -434,7 +420,7 @@ Last-Update: 2013-10-11
public class Geometry:public void delete()
--- a/swig/python/extensions/gdal_wrap.cpp
+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -7652,7 +7652,7 @@ SWIGINTERN PyObject *_wrap_MajorObject_S
+@@ -7996,7 +7996,7 @@ SWIGINTERN PyObject *_wrap_MajorObject_S
if (_v) {
{
/* %typecheck(SWIG_TYPECHECK_POINTER) (char **dict) */
@@ -445,7 +431,7 @@ Last-Update: 2013-10-11
_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
-@@ -18084,7 +18084,7 @@ static PyMethodDef SwigMethods[] = {
+@@ -20881,7 +20881,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"
@@ -456,7 +442,7 @@ Last-Update: 2013-10-11
"an handle to a OGRLayer containing the results of the query.\n"
--- a/swig/python/osgeo/ogr.py
+++ b/swig/python/osgeo/ogr.py
-@@ -690,7 +690,7 @@ class DataSource(_object):
+@@ -737,7 +737,7 @@ class DataSource(_object):
pszDialect: allows control of the statement dialect. If set to NULL,
the OGR SQL engine will be used, except for RDBMS drivers that will
@@ -467,36 +453,36 @@ Last-Update: 2013-10-11
an handle to a OGRLayer containing the results of the query.
--- a/apps/gdal_grid.cpp
+++ b/apps/gdal_grid.cpp
-@@ -550,7 +550,7 @@ int main( int argc, char ** argv )
- {
- GDALDriverH hDriver;
- const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
-- int bFormatExplicitelySet = FALSE;
-+ int bFormatExplicitlySet = FALSE;
- char **papszLayers = NULL;
- const char *pszBurnAttribute = NULL;
- const char *pszWHERE = NULL, *pszSQL = NULL;
-@@ -601,7 +601,7 @@ int main( int argc, char ** argv )
- {
- CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
- pszFormat = argv[++i];
-- bFormatExplicitelySet = TRUE;
-+ bFormatExplicitlySet = TRUE;
- }
-
- else if( EQUAL(argv[i],"-q") || EQUAL(argv[i],"-quiet") )
-@@ -935,7 +935,7 @@ int main( int argc, char ** argv )
- if ( nYSize == 0 )
- nYSize = 256;
-
-- if (!bQuiet && !bFormatExplicitelySet)
-+ if (!bQuiet && !bFormatExplicitlySet)
- CheckExtensionConsistency(pszDest, pszFormat);
-
- hDstDS = GDALCreate( hDriver, pszDest, nXSize, nYSize, nBands,
+@@ -610,7 +610,7 @@ int main( int argc, char ** argv )
+ {
+ GDALDriverH hDriver;
+ const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
+- int bFormatExplicitelySet = FALSE;
++ int bFormatExplicitlySet = FALSE;
+ char **papszLayers = NULL;
+ const char *pszBurnAttribute = NULL;
+ double dfIncreaseBurnValue = 0.0;
+@@ -663,7 +663,7 @@ int main( int argc, char ** argv )
+ {
+ CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
+ pszFormat = argv[++i];
+- bFormatExplicitelySet = TRUE;
++ bFormatExplicitlySet = TRUE;
+ }
+
+ else if( EQUAL(argv[i],"-q") || EQUAL(argv[i],"-quiet") )
+@@ -1009,7 +1009,7 @@ int main( int argc, char ** argv )
+ if ( nYSize == 0 )
+ nYSize = 256;
+
+- if (!bQuiet && !bFormatExplicitelySet)
++ if (!bQuiet && !bFormatExplicitlySet)
+ CheckExtensionConsistency(pszDest, pszFormat);
+
+ hDstDS = GDALCreate( hDriver, pszDest, nXSize, nYSize, nBands,
--- a/apps/gdal_translate.cpp
+++ b/apps/gdal_translate.cpp
-@@ -268,7 +268,7 @@ static int ProxyMain( int argc, char **
+@@ -278,7 +278,7 @@ static int ProxyMain( int argc, char **
int i;
int nRasterXSize, nRasterYSize;
const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
@@ -505,7 +491,7 @@ Last-Update: 2013-10-11
GDALDriverH hDriver;
int *panBandList = NULL; /* negative value of panBandList[i] means mask band of ABS(panBandList[i]) */
int nBandCount = 0, bDefBands = TRUE;
-@@ -346,7 +346,7 @@ static int ProxyMain( int argc, char **
+@@ -363,7 +363,7 @@ static int ProxyMain( int argc, char **
else if( EQUAL(argv[i],"-of") && i < argc-1 )
{
pszFormat = argv[++i];
@@ -514,7 +500,7 @@ Last-Update: 2013-10-11
}
else if( EQUAL(argv[i],"-q") || EQUAL(argv[i],"-quiet") )
-@@ -671,7 +671,7 @@ static int ProxyMain( int argc, char **
+@@ -753,7 +753,7 @@ static int ProxyMain( int argc, char **
pfnProgress = GDALDummyProgress;
}
@@ -525,7 +511,7 @@ Last-Update: 2013-10-11
/* -------------------------------------------------------------------- */
--- a/apps/gdaldem.cpp
+++ b/apps/gdaldem.cpp
-@@ -2224,7 +2224,7 @@ int main( int argc, char ** argv )
+@@ -2233,7 +2233,7 @@ int main( int argc, char ** argv )
const char *pszDstFilename = NULL;
const char *pszColorFilename = NULL;
const char *pszFormat = "GTiff";
@@ -534,7 +520,7 @@ Last-Update: 2013-10-11
char **papszCreateOptions = NULL;
GDALDatasetH hSrcDataset = NULL;
-@@ -2405,7 +2405,7 @@ int main( int argc, char ** argv )
+@@ -2426,7 +2426,7 @@ int main( int argc, char ** argv )
{
CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
pszFormat = argv[++i];
@@ -543,7 +529,7 @@ Last-Update: 2013-10-11
}
else if( argv[i][0] == '-' )
{
-@@ -2496,7 +2496,7 @@ int main( int argc, char ** argv )
+@@ -2517,7 +2517,7 @@ int main( int argc, char ** argv )
exit( 1 );
}
@@ -554,7 +540,7 @@ Last-Update: 2013-10-11
double dfDstNoDataValue = 0;
--- a/apps/gdalenhance.cpp
+++ b/apps/gdalenhance.cpp
-@@ -88,7 +88,7 @@ int main( int argc, char ** argv )
+@@ -89,7 +89,7 @@ int main( int argc, char ** argv )
GDALDatasetH hDataset, hOutDS;
int i;
const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
@@ -563,7 +549,7 @@ Last-Update: 2013-10-11
GDALDriverH hDriver;
GDALDataType eOutputType = GDT_Unknown;
char **papszCreateOptions = NULL;
-@@ -129,7 +129,7 @@ int main( int argc, char ** argv )
+@@ -130,7 +130,7 @@ int main( int argc, char ** argv )
else if( EQUAL(argv[i],"-of") && i < argc-1 )
{
pszFormat = argv[++i];
@@ -572,7 +558,7 @@ Last-Update: 2013-10-11
}
else if( EQUAL(argv[i],"-ot") && i < argc-1 )
-@@ -264,7 +264,7 @@ int main( int argc, char ** argv )
+@@ -265,7 +265,7 @@ int main( int argc, char ** argv )
Usage();
}
@@ -583,7 +569,7 @@ Last-Update: 2013-10-11
/* -------------------------------------------------------------------- */
--- a/apps/gdalwarp.cpp
+++ b/apps/gdalwarp.cpp
-@@ -335,7 +335,7 @@ int main( int argc, char ** argv )
+@@ -337,7 +337,7 @@ int main( int argc, char ** argv )
{
GDALDatasetH hDstDS;
const char *pszFormat = "GTiff";
@@ -592,7 +578,7 @@ Last-Update: 2013-10-11
char **papszSrcFiles = NULL;
char *pszDstFilename = NULL;
int bCreateOutput = FALSE, i;
-@@ -438,7 +438,7 @@ int main( int argc, char ** argv )
+@@ -440,7 +440,7 @@ int main( int argc, char ** argv )
{
CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
pszFormat = argv[++i];
@@ -601,7 +587,7 @@ Last-Update: 2013-10-11
bCreateOutput = TRUE;
if( EQUAL(pszFormat,"VRT") )
bVRT = TRUE;
-@@ -893,7 +893,7 @@ int main( int argc, char ** argv )
+@@ -899,7 +899,7 @@ int main( int argc, char ** argv )
if( hDstDS == NULL )
{
@@ -612,7 +598,7 @@ Last-Update: 2013-10-11
hDstDS = GDALWarpCreateOutput( papszSrcFiles, pszDstFilename,pszFormat,
--- a/apps/nearblack.cpp
+++ b/apps/nearblack.cpp
-@@ -122,7 +122,7 @@ int main( int argc, char ** argv )
+@@ -123,7 +123,7 @@ int main( int argc, char ** argv )
int bSetAlpha = FALSE;
int bSetMask = FALSE;
const char* pszDriverName = "HFA";
@@ -621,7 +607,7 @@ Last-Update: 2013-10-11
char** papszCreationOptions = NULL;
int bQuiet = FALSE;
-@@ -147,7 +147,7 @@ int main( int argc, char ** argv )
+@@ -148,7 +148,7 @@ int main( int argc, char ** argv )
{
CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
pszDriverName = argv[++i];
@@ -630,7 +616,7 @@ Last-Update: 2013-10-11
}
else if( EQUAL(argv[i], "-white") ) {
bNearWhite = TRUE;
-@@ -269,7 +269,7 @@ int main( int argc, char ** argv )
+@@ -270,7 +270,7 @@ int main( int argc, char ** argv )
if (hDriver == NULL)
exit(1);
@@ -641,7 +627,7 @@ Last-Update: 2013-10-11
if (bSetAlpha)
--- a/apps/ogr2ogr.cpp
+++ b/apps/ogr2ogr.cpp
-@@ -805,7 +805,7 @@ int main( int nArgc, char ** papszArgv )
+@@ -855,7 +855,7 @@ int main( int nArgc, char ** papszArgv )
{
int nRetCode = 0;
int bQuiet = FALSE;
@@ -650,7 +636,7 @@ Last-Update: 2013-10-11
const char *pszFormat = "ESRI Shapefile";
const char *pszDataSource = NULL;
const char *pszDestDataSource = NULL;
-@@ -899,7 +899,7 @@ int main( int nArgc, char ** papszArgv )
+@@ -953,7 +953,7 @@ int main( int nArgc, char ** papszArgv )
else if( EQUAL(papszArgv[iArg],"-f") )
{
CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
@@ -659,7 +645,7 @@ Last-Update: 2013-10-11
pszFormat = papszArgv[++iArg];
}
else if( EQUAL(papszArgv[iArg],"-dsco") )
-@@ -1478,7 +1478,7 @@ int main( int nArgc, char ** papszArgv )
+@@ -1566,7 +1566,7 @@ int main( int nArgc, char ** papszArgv )
/* -------------------------------------------------------------------- */
if( !bUpdate )
{
@@ -670,7 +656,7 @@ Last-Update: 2013-10-11
OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
--- a/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
-@@ -457,7 +457,7 @@ OGRLayer * FGdbDataSource::ExecuteSQL( c
+@@ -477,7 +477,7 @@ OGRLayer * FGdbDataSource::ExecuteSQL( c
CPLDebug("FGDB", "Support for SELECT is known to be partially "
"non-compliant with FileGDB SDK API v1.2.\n"
"So for now, we use default OGR SQL engine. "
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index e5c8ebf..0f1d1e2 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -3,34 +3,34 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Last-Update: 2013-07-01
--- a/gcore/gdaldrivermanager.cpp
+++ b/gcore/gdaldrivermanager.cpp
-@@ -667,7 +667,7 @@ void GDALDriverManager::AutoLoadDrivers(
+@@ -691,7 +691,7 @@ void GDALDriverManager::AutoLoadDrivers(
#ifdef MACOSX_FRAMEWORK
GDAL_PREFIX "/PlugIns");
#else
- GDAL_PREFIX "/lib/gdalplugins" );
-+ GDAL_PREFIX "/lib/gdalplugins/1.10" );
++ GDAL_PREFIX "/lib/gdalplugins/1.11" );
#endif
#else
char szExecPath[1024];
--- a/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
+++ b/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
-@@ -807,7 +807,7 @@ void OGRSFDriverRegistrar::AutoLoadDrive
+@@ -820,7 +820,7 @@ void OGRSFDriverRegistrar::AutoLoadDrive
#ifdef MACOSX_FRAMEWORK
GDAL_PREFIX "/PlugIns");
#else
- GDAL_PREFIX "/lib/gdalplugins" );
-+ GDAL_PREFIX "/lib/gdalplugins/1.10" );
++ GDAL_PREFIX "/lib/gdalplugins/1.11" );
#endif
#else
char szExecPath[1024];
--- a/port/cpl_findfile.cpp
+++ b/port/cpl_findfile.cpp
-@@ -104,7 +104,7 @@ static FindFileTLS* CPLFinderInit()
+@@ -105,7 +105,7 @@ static FindFileTLS* CPLFinderInit()
#ifdef MACOSX_FRAMEWORK
CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
#else
- CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" );
-+ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.10" );
++ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.11" );
#endif
#else
CPLPushFinderLocation( "/usr/local/share/gdal" );
diff --git a/debian/patches/hardening b/debian/patches/hardening
index c47b014..2f64799 100644
--- a/debian/patches/hardening
+++ b/debian/patches/hardening
@@ -20,7 +20,7 @@ Last-Update: 2013-10-13
'lib/Geo/OGR.pm' => '$(INST_LIBDIR)/OGR.pm',
--- a/swig/java/GNUmakefile
+++ b/swig/java/GNUmakefile
-@@ -76,10 +76,10 @@ $(JAVA_MODULES): lib%jni.$(SO_EXT): %_wr
+@@ -100,10 +100,10 @@ $(JAVA_MODULES): lib%jni.$(SO_EXT): %_wr
# Do not remove -fno-strict-aliasing while SWIG generates weird code in upcast methods
# See http://trac.osgeo.org/gdal/changeset/16006
%.$(OBJ_EXT): %.cpp
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index b5f4ee1..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
-@@ -20930,7 +20930,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
-@@ -20990,7 +20990,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. */
-@@ -21021,7 +21021,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
-@@ -21036,7 +21036,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. */
-@@ -21067,7 +21067,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 8354601..7db598b 100644
--- a/debian/patches/inconsistant-typo
+++ b/debian/patches/inconsistant-typo
@@ -47,7 +47,7 @@ Last-Update: 2013-10-11
if (ParseTime (refTime, year, month, day, hour, min, 0) != 0) {
--- a/frmts/mbtiles/mbtilesdataset.cpp
+++ b/frmts/mbtiles/mbtilesdataset.cpp
-@@ -1703,7 +1703,7 @@ GDALDataset* MBTilesDataset::Open(GDALOp
+@@ -1736,7 +1736,7 @@ GDALDataset* MBTilesDataset::Open(GDALOp
if (bHasMinMaxLevel && (nMinLevel < 0 || nMinLevel > nMaxLevel))
{
CPLError(CE_Failure, CPLE_AppDefined,
@@ -58,7 +58,7 @@ Last-Update: 2013-10-11
}
--- a/frmts/nitf/nitfdataset.cpp
+++ b/frmts/nitf/nitfdataset.cpp
-@@ -4270,7 +4270,7 @@ NITFDataset::NITFCreateCopy(
+@@ -4317,7 +4317,7 @@ NITFDataset::NITFCreateCopy(
else
{
CPLError((bStrict) ? CE_Failure : CE_Warning, CPLE_NotSupported,
@@ -69,7 +69,7 @@ Last-Update: 2013-10-11
{
--- a/frmts/nitf/nitffile.c
+++ b/frmts/nitf/nitffile.c
-@@ -2523,7 +2523,7 @@ char **NITFGenericMetadataReadTRE(char *
+@@ -2624,7 +2624,7 @@ char **NITFGenericMetadataReadTRE(char *
if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -78,7 +78,7 @@ Last-Update: 2013-10-11
pszTREName );
}
if (nTreOffset < nTRESize)
-@@ -2659,7 +2659,7 @@ CPLXMLNode* NITFCreateXMLTre(NITFFile* p
+@@ -2760,7 +2760,7 @@ CPLXMLNode* NITFCreateXMLTre(NITFFile* p
if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -100,7 +100,7 @@ Last-Update: 2013-10-11
return NULL;
--- a/frmts/pds/pdsdataset.cpp
+++ b/frmts/pds/pdsdataset.cpp
-@@ -330,7 +330,7 @@ void PDSDataset::ParseSRS()
+@@ -331,7 +331,7 @@ void PDSDataset::ParseSRS()
/* Calculate upper left corner of pixel in meters from the */
/* upper left center pixel sample/line offsets. It doesn't */
/* mean the defaults will work for every PDS image, as these */
@@ -111,7 +111,7 @@ Last-Update: 2013-10-11
/* see GDAL PDS page or mapping within ISIS3 source (USGS) */
--- a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
+++ b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
-@@ -89,7 +89,7 @@ OGRShapeLayer::OGRShapeLayer( OGRShapeDa
+@@ -109,7 +109,7 @@ OGRShapeLayer::OGRShapeLayer( OGRShapeDa
nTotalShapeCount = hSHP->nRecords;
if( hDBF != NULL && hDBF->nRecords != nTotalShapeCount )
{
@@ -151,7 +151,7 @@ Last-Update: 2013-10-11
--- a/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
+++ b/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
-@@ -2454,7 +2454,7 @@ OGRErr OGRWFSLayer::CommitTransaction()
+@@ -2458,7 +2458,7 @@ OGRErr OGRWFSLayer::CommitTransaction()
if ((int)aosFIDList.size() != nGotInserted)
{
CPLError(CE_Failure, CPLE_AppDefined,
@@ -162,7 +162,7 @@ Last-Update: 2013-10-11
return OGRERR_FAILURE;
--- a/port/cpl_csv.cpp
+++ b/port/cpl_csv.cpp
-@@ -463,7 +463,7 @@ char CSVDetectSeperator (const char* psz
+@@ -464,7 +464,7 @@ char CSVDetectSeperator (const char* psz
else if (chDelimiter != *pszLine)
{
/* The separator is not consistant on the line. */
@@ -173,7 +173,7 @@ Last-Update: 2013-10-11
break;
--- a/port/cpl_vsisimple.cpp
+++ b/port/cpl_vsisimple.cpp
-@@ -511,7 +511,7 @@ void VSICheckMarkerBegin(char* ptr)
+@@ -512,7 +512,7 @@ void VSICheckMarkerBegin(char* ptr)
if (memcmp(ptr, "VSIM", 4) != 0)
{
CPLError(CE_Fatal, CPLE_AppDefined,
@@ -184,7 +184,7 @@ Last-Update: 2013-10-11
}
--- a/swig/include/cpl.i
+++ b/swig/include/cpl.i
-@@ -477,7 +477,7 @@ int wrapper_VSIFWriteL( int nLen, char *
+@@ -479,7 +479,7 @@ int wrapper_VSIFWriteL( int nLen, char *
{
if (nLen < size * memb)
{
@@ -195,7 +195,7 @@ Last-Update: 2013-10-11
return VSIFWriteL(pBuf, size, memb, f);
--- a/swig/python/extensions/gdal_wrap.cpp
+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -3497,7 +3497,7 @@ int wrapper_VSIFWriteL( int nLen, char *
+@@ -3499,7 +3499,7 @@ int wrapper_VSIFWriteL( int nLen, char *
{
if (nLen < size * memb)
{
diff --git a/debian/patches/initalize-typo b/debian/patches/initalize-typo
index f518b45..4272964 100644
--- a/debian/patches/initalize-typo
+++ b/debian/patches/initalize-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/apps/gdal_utilities.dox
+++ b/apps/gdal_utilities.dox
-@@ -1359,7 +1359,7 @@ Create an image with the pixels in all b
+@@ -1416,7 +1416,7 @@ Create an image with the pixels in all b
\endverbatim
Create an RGB image that shows blue in pixels with no data. The first two bands
@@ -25,18 +25,18 @@ Last-Update: 2013-10-11
.nf
--- a/ogr/ogrsf_frmts/ili/ili2reader.cpp
+++ b/ogr/ogrsf_frmts/ili/ili2reader.cpp
-@@ -614,7 +614,7 @@ int ILI2Reader::SetupParser() {
+@@ -509,7 +509,7 @@ int ILI2Reader::SetupParser() {
{
- char* msg = XMLString::transcode(toCatch.getMessage());
+ char* msg = tr_strdup(toCatch.getMessage());
CPLError( CE_Failure, CPLE_AppDefined,
- "Unable to initalize Xerces C++ based ILI2 reader. "
+ "Unable to initialize Xerces C++ based ILI2 reader. "
"Error message:\n%s\n", msg );
- XMLString::release(&msg);
+ CPLFree(msg);
--- a/ogr/ogrsf_frmts/tiger/ogr_tiger.h
+++ b/ogr/ogrsf_frmts/tiger/ogr_tiger.h
-@@ -82,7 +82,7 @@ const char * TigerVersionString( TigerVe
+@@ -83,7 +83,7 @@ const char * TigerVersionString( TigerVe
/*****************************************************************************/
/* The TigerFieldInfo and TigerRecordInfo structures hold information about */
/* the schema of a TIGER record type. In each layer implementation file */
diff --git a/debian/patches/java-make b/debian/patches/java-make
index b5abef2..4e587a9 100644
--- a/debian/patches/java-make
+++ b/debian/patches/java-make
@@ -4,12 +4,20 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Last-Update: 2013-07-01
--- a/swig/java/GNUmakefile
+++ b/swig/java/GNUmakefile
-@@ -35,7 +35,7 @@ JAVA_OBJECTS = gdalconst_wrap.$(OBJ_EXT)
+@@ -38,11 +38,11 @@ JAVA_OBJECTS = gdalconst_wrap.$(OBJ_EXT)
clean:
-rm -f ${JAVA_MODULES}
- -rm *.$(OBJ_EXT)
+- -rm .libs/*.so
+- -rm .libs/*.dylib
+- -rm *.so
+- -rm *.dylib
+ -rm -f *.$(OBJ_EXT)
++ -rm -f .libs/*.so
++ -rm -f .libs/*.dylib
++ -rm -f *.so
++ -rm -f *.dylib
+
ant clean
- veryclean: clean
diff --git a/debian/patches/java.opt b/debian/patches/java.opt
index e5806d8..34a33a9 100644
--- a/debian/patches/java.opt
+++ b/debian/patches/java.opt
@@ -4,11 +4,10 @@ Author: Ezequiel Lara Gómez <ezequiel.lara at yahoo.es>
Last-Update: 2013-07-01
--- a/swig/java/java.opt
+++ b/swig/java/java.opt
-@@ -1,7 +1,7 @@
- #
+@@ -2,6 +2,7 @@
# Java Stuff
#JAVA_HOME = "C:\Program Files\Java\jdk1.6.0_16"
--JAVA_HOME = /usr/lib/jvm/java-6-openjdk/
+ #JAVA_HOME = /usr/lib/jvm/java-6-openjdk/
+JAVA_HOME = /usr/lib/jvm/default-java/
JAVADOC=$(JAVA_HOME)/bin/javadoc
JAVAC=$(JAVA_HOME)/bin/javac
diff --git a/debian/patches/ogdi b/debian/patches/ogdi
index 4da034d..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
-@@ -353,7 +353,7 @@ endif
+@@ -372,7 +372,7 @@ endif
# PCRaster support
PCRASTER_SETTING = @PCRASTER_SETTING@
diff --git a/debian/patches/paramters-typo b/debian/patches/paramters-typo
index d87ff0d..47d5a16 100644
--- a/debian/patches/paramters-typo
+++ b/debian/patches/paramters-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenger <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/frmts/georaster/georaster_wrapper.cpp
+++ b/frmts/georaster/georaster_wrapper.cpp
-@@ -705,7 +705,7 @@ bool GeoRasterWrapper::Create( char* psz
+@@ -709,7 +709,7 @@ bool GeoRasterWrapper::Create( char* psz
nBandBlockSize = nBandBlockSize == 0 ? 1 : nBandBlockSize;
// -----------------------------------------------------------
@@ -12,7 +12,7 @@ Last-Update: 2013-10-11
// -----------------------------------------------------------
CPLString sBlocking;
-@@ -776,7 +776,7 @@ bool GeoRasterWrapper::Create( char* psz
+@@ -780,7 +780,7 @@ bool GeoRasterWrapper::Create( char* psz
}
// -----------------------------------------------------------
@@ -23,7 +23,7 @@ Last-Update: 2013-10-11
if( poConnection->GetVersion() > 10 )
--- a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
-@@ -1103,7 +1103,7 @@ CPLXMLNode* XMLSpatialReference(OGRSpati
+@@ -1178,7 +1178,7 @@ CPLXMLNode* XMLSpatialReference(OGRSpati
const char* gridvalues[7];
/*
diff --git a/debian/patches/ressource-typo b/debian/patches/ressource-typo
index 92547f3..8d36501 100644
--- a/debian/patches/ressource-typo
+++ b/debian/patches/ressource-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/NEWS
+++ b/NEWS
-@@ -1498,7 +1498,7 @@ USGSDEM driver:
+@@ -2057,7 +2057,7 @@ USGSDEM driver:
VRT driver:
* Implement VRTDataset::IRasterIO() that can delegate to source Dataset::RasterIO() in particular cases
* Implement GetMinimum() and GetMaximum()
@@ -12,7 +12,7 @@ Last-Update: 2013-10-11
* 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)
-@@ -2020,7 +2020,7 @@ Port:
+@@ -2579,7 +2579,7 @@ Port:
Core:
* RFC 24: progressive/async raster reading
* On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -21,7 +21,7 @@ Last-Update: 2013-10-11
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().
-@@ -2440,7 +2440,7 @@ Core:
+@@ -2999,7 +2999,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 @@ Last-Update: 2013-10-11
encoding
--- a/frmts/ecw/ecwasyncreader.cpp
+++ b/frmts/ecw/ecwasyncreader.cpp
-@@ -281,7 +281,7 @@ NCSEcwReadStatus ECWAsyncReader::Refresh
+@@ -282,7 +282,7 @@ NCSEcwReadStatus ECWAsyncReader::Refresh
}
/* Call CPLCleanupTLS explicitly since this thread isn't managed */
@@ -43,18 +43,18 @@ Last-Update: 2013-10-11
--- a/frmts/ecw/ecwdataset.cpp
+++ b/frmts/ecw/ecwdataset.cpp
-@@ -992,7 +992,7 @@ ECWDataset::~ECWDataset()
+@@ -982,7 +982,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;
- // static ressource allocated in NCJP2File.cpp can be called before GDALDestroy(), causing
+ // static resource allocated in NCJP2File.cpp can be called before GDALDestroy(), causing
// ECW SDK resources ( CNCSJP2File files ) to be closed before we get here.
- if( poFileView != NULL &&
- (!bIsJPEG2000 || !GDALIsInGlobalDestructor()) )
+ //
+ // 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
-@@ -2102,7 +2102,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2203,7 +2203,7 @@ static char** NITFGenericMetadataReadTRE
{
*pbError = TRUE;
CPLError( CE_Warning, CPLE_AppDefined,
@@ -63,7 +63,7 @@ Last-Update: 2013-10-11
pszTREName );
break;
}
-@@ -2126,7 +2126,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2227,7 +2227,7 @@ static char** NITFGenericMetadataReadTRE
if (nIterations < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -72,7 +72,7 @@ Last-Update: 2013-10-11
"invalid 'counter' %s",
pszTREName, pszCounter );
*pbError = TRUE;
-@@ -2147,7 +2147,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2248,7 +2248,7 @@ static char** NITFGenericMetadataReadTRE
if (NPART < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -81,7 +81,7 @@ Last-Update: 2013-10-11
"invalid 'counter' %s",
pszTREName, "NPART" );
*pbError = TRUE;
-@@ -2165,7 +2165,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2266,7 +2266,7 @@ static char** NITFGenericMetadataReadTRE
if (NUMOPG < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -90,7 +90,7 @@ Last-Update: 2013-10-11
"invalid 'counter' %s",
pszTREName, "NUMOPG" );
*pbError = TRUE;
-@@ -2187,7 +2187,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2288,7 +2288,7 @@ static char** NITFGenericMetadataReadTRE
if (NPAR < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -99,7 +99,7 @@ Last-Update: 2013-10-11
"invalid 'counter' %s",
pszTREName, "NPAR" );
*pbError = TRUE;
-@@ -2196,7 +2196,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2297,7 +2297,7 @@ static char** NITFGenericMetadataReadTRE
if (NPARO < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -108,7 +108,7 @@ Last-Update: 2013-10-11
"invalid 'counter' %s",
pszTREName, "NPAR0" );
*pbError = TRUE;
-@@ -2214,7 +2214,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2315,7 +2315,7 @@ static char** NITFGenericMetadataReadTRE
if (NPLN < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -117,7 +117,7 @@ Last-Update: 2013-10-11
"invalid 'counter' %s",
pszTREName, "NPLN" );
*pbError = TRUE;
-@@ -2236,7 +2236,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2337,7 +2337,7 @@ static char** NITFGenericMetadataReadTRE
if (NXPTS < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -126,7 +126,7 @@ Last-Update: 2013-10-11
"invalid 'counter' %s",
pszTREName, "NXPTS" );
*pbError = TRUE;
-@@ -2245,7 +2245,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2346,7 +2346,7 @@ static char** NITFGenericMetadataReadTRE
if (NYPTS < 0)
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -135,7 +135,7 @@ Last-Update: 2013-10-11
"invalid 'counter' %s",
pszTREName, "NYPTS" );
*pbError = TRUE;
-@@ -2256,7 +2256,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2357,7 +2357,7 @@ static char** NITFGenericMetadataReadTRE
else
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -144,7 +144,7 @@ Last-Update: 2013-10-11
"missing or invalid 'counter' or 'iterations' or 'formula'",
pszTREName );
*pbError = TRUE;
-@@ -2441,7 +2441,7 @@ static char** NITFGenericMetadataReadTRE
+@@ -2542,7 +2542,7 @@ static char** NITFGenericMetadataReadTRE
else
{
CPLError( CE_Warning, CPLE_AppDefined,
@@ -155,7 +155,7 @@ Last-Update: 2013-10-11
*pbError = TRUE;
--- a/frmts/vrt/vrtsources.cpp
+++ b/frmts/vrt/vrtsources.cpp
-@@ -207,7 +207,7 @@ CPLXMLNode *VRTSimpleSource::SerializeTo
+@@ -217,7 +217,7 @@ CPLXMLNode *VRTSimpleSource::SerializeTo
if ( strstr(poDS->GetDescription(), "/vsicurl/http") != NULL ||
strstr(poDS->GetDescription(), "/vsicurl/ftp") != NULL )
{
@@ -164,7 +164,7 @@ Last-Update: 2013-10-11
/* slow, so let's just suppose they exist */
pszRelativePath = poDS->GetDescription();
bRelativeToVRT = FALSE;
-@@ -469,7 +469,7 @@ void VRTSimpleSource::GetFileList(char**
+@@ -571,7 +571,7 @@ void VRTSimpleSource::GetFileList(char**
if ( strstr(pszFilename, "/vsicurl/http") != NULL ||
strstr(pszFilename, "/vsicurl/ftp") != NULL )
{
@@ -206,7 +206,7 @@ Last-Update: 2013-10-11
}
--- a/port/cpl_vsil_curl.cpp
+++ b/port/cpl_vsil_curl.cpp
-@@ -2630,9 +2630,9 @@ char** VSICurlFilesystemHandler::ReadDir
+@@ -2631,9 +2631,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 cd664f5..61570a1 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
-@@ -24910,7 +24910,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25230,7 +25230,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -12,30 +12,21 @@ Last-Update: 2011-05-12
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -24948,7 +24948,7 @@ fi
-
- if test "$SPATIALITE_INIT_FOUND" = "yes"; then
- HAVE_SPATIALITE=yes
-- LIBS="$LIBS -lspatialite"
-+ LIBS="$LIBS -lspatialite -lsqlite3"
- HAVE_SQLITE3=yes
- fi
- else
-@@ -24963,7 +24963,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25284,7 +25284,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lspatialite -L$with_spatialite/lib -lspatialite $LIBS"
-+LIBS="-lspatialite -L$with_spatialite/lib -lspatialite -lsqlite3 $LIBS"
++LIBS="-lspatialite -L$with_spatialite/lib -lsqlite3 $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -25013,7 +25013,7 @@ $as_echo "enabled" >&6; }
- # as there's a spatialite.h file in it, which we don't want to include.
- # We want to include include/spatialite.h instead !
- SQLITE3_CFLAGS="-I$with_spatialite/include"
-- LIBS="$LIBS -L$with_spatialite/lib -lspatialite"
-+ LIBS="$LIBS -L$with_spatialite/lib -lspatialite -lsqlite3"
- HAVE_SQLITE3=yes
+@@ -25376,7 +25376,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lspatialite $LIBS"
++LIBS="-lspatialite -lsqlite3 $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
- elif test -f "$with_spatialite/include/spatialite.h" -a \
diff --git a/debian/patches/supress-typo b/debian/patches/supress-typo
index 11ee766..187935a 100644
--- a/debian/patches/supress-typo
+++ b/debian/patches/supress-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2014-01-11
--- a/apps/ogr_utilities.dox
+++ b/apps/ogr_utilities.dox
-@@ -39,7 +39,7 @@ source to stdout (the terminal).
+@@ -40,7 +40,7 @@ source to stdout (the terminal).
<dt> <b>-ro</b>:</dt><dd> Open the data source in read-only mode. </dd>
<dt> <b>-al</b>:</dt><dd> List all features of all layers (used instead of having to
give layer names as arguments).</dd>
diff --git a/debian/patches/symver b/debian/patches/symver
index ae74f49..18a91e2 100644
--- a/debian/patches/symver
+++ b/debian/patches/symver
@@ -3,16 +3,13 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Last-Update: 2011-09-27
--- a/GNUmakefile
+++ b/GNUmakefile
-@@ -39,9 +39,10 @@ $(GDAL_SLIB): $(GDAL_OBJ) $(GDAL_LIB)
-
- $(LIBGDAL): $(GDAL_OBJ:.o=.lo)
+@@ -41,7 +41,8 @@ $(LIBGDAL): $(GDAL_OBJ:.o=.lo)
$(LD) $(LDFLAGS) $(LIBS) -o $@ $(GDAL_OBJ:.o=.lo) \
-- -rpath $(INST_LIB) \
-+ -rpath $(INST_LIB) \
+ -rpath $(INST_LIB) \
-no-undefined \
- -version-info $(LIBGDAL_CURRENT):$(LIBGDAL_REVISION):$(LIBGDAL_AGE)
+ -version-info $(LIBGDAL_CURRENT):$(LIBGDAL_REVISION):$(LIBGDAL_AGE) \
-+ -Wl,-Bsymbolic -Wl,--version-script,$(GDAL_ROOT)/debian/gdal.ver
++ -Wl,-Bsymbolic -Wl,--version-script,$(GDAL_ROOT)/debian/gdal.ver
ifeq ($(MACOSX_FRAMEWORK),yes)
install_name_tool -id ${OSX_VERSION_FRAMEWORK_PREFIX}/GDAL .libs/libgdal.dylib
endif
diff --git a/debian/patches/transfered-typo b/debian/patches/transfered-typo
index 10a5fab..9b4803e 100644
--- a/debian/patches/transfered-typo
+++ b/debian/patches/transfered-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/ogr/ogrsf_frmts/generic/ogrunionlayer.h
+++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
-@@ -94,7 +94,7 @@ class OGRUnionLayer : public OGRLayer
+@@ -102,7 +102,7 @@ class OGRUnionLayer : public OGRLayer
public:
OGRUnionLayer( const char* pszName,
int nSrcLayers, /* must be >= 1 */
@@ -21,11 +21,11 @@ Last-Update: 2013-10-11
-This reduces the amount of data to be transfered from 2 N to 1.333 N, where N is the size of EWKB data. However, it might be a
+This reduces the amount of data to be transferred from 2 N to 1.333 N, where N is the size of EWKB data. However, it might be a
bit slower than fetching in canonical form when the client and the server are on the same machine, so the default is NO.</li><p>
- </ul>
-
+ <li><b>OGR_TRUNCATE</b>: (GDAL >= 1.11) If set to "YES", the content of the table will be first erased with the SQL TRUNCATE command before
+ inserting the first feature. This is an alternative to using the -overwrite flag of ogr2ogr,
--- a/port/cpl_vsi_mem.cpp
+++ b/port/cpl_vsi_mem.cpp
-@@ -204,7 +204,7 @@ bool VSIMemFile::SetLength( vsi_l_offset
+@@ -205,7 +205,7 @@ bool VSIMemFile::SetLength( vsi_l_offset
if( !bOwnData )
{
CPLError(CE_Failure, CPLE_NotSupported,
diff --git a/debian/patches/transfering-typo b/debian/patches/transfering-typo
index 36083cb..996f248 100644
--- a/debian/patches/transfering-typo
+++ b/debian/patches/transfering-typo
@@ -14,7 +14,7 @@ Last-Update: 2013-10-11
* abort. May need to revisit this behavior. */
--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-@@ -3464,7 +3464,7 @@ int OGROSMDataSource::TransferToDiskIfNe
+@@ -3646,7 +3646,7 @@ int OGROSMDataSource::TransferToDiskIfNe
CPLString osNewTmpDBName;
osNewTmpDBName = CPLGenerateTempFilename("osm_tmp_nodes");
@@ -23,7 +23,7 @@ Last-Update: 2013-10-11
osNodesFilename.c_str(), osNewTmpDBName.c_str());
if( CPLCopyFile( osNewTmpDBName, osNodesFilename ) != 0 )
-@@ -3543,7 +3543,7 @@ int OGROSMDataSource::TransferToDiskIfNe
+@@ -3725,7 +3725,7 @@ int OGROSMDataSource::TransferToDiskIfNe
osNewTmpDBName = CPLGenerateTempFilename("osm_tmp");
diff --git a/debian/patches/usefull-typo b/debian/patches/usefull-typo
index 77aac29..81e3d48 100644
--- a/debian/patches/usefull-typo
+++ b/debian/patches/usefull-typo
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
Last-Update: 2013-10-11
--- a/NEWS
+++ b/NEWS
-@@ -2002,7 +2002,7 @@ Port:
+@@ -2561,7 +2561,7 @@ Port:
- /vsitar/ : to read in .tar or .tgz/.tar.gz files
* Add C API to create ZIP files
* Add support for writable /vsizip/
@@ -12,7 +12,7 @@ Last-Update: 2013-10-11
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
-@@ -2020,7 +2020,7 @@ Port:
+@@ -2579,7 +2579,7 @@ Port:
Core:
* RFC 24: progressive/async raster reading
* On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -21,7 +21,7 @@ Last-Update: 2013-10-11
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().
-@@ -2440,7 +2440,7 @@ Core:
+@@ -2999,7 +2999,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()
@@ -30,7 +30,7 @@ Last-Update: 2013-10-11
GDAL virtual filenames in software offering only file explorers (#3902)
* Expat based XML readers : add support for reading files with Windows-1252
encoding
-@@ -2710,7 +2710,7 @@ PostgreSQL driver:
+@@ -3269,7 +3269,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.
@@ -41,7 +41,7 @@ Last-Update: 2013-10-11
needs to fetch one with GetLayerByName().
--- a/apps/ogr_utilities.dox
+++ b/apps/ogr_utilities.dox
-@@ -239,7 +239,7 @@ GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOL
+@@ -246,7 +246,7 @@ GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOL
Add "25D" to the name to get 2.5D versions.
Starting with GDAL 1.10, PROMOTE_TO_MULTI can be used to automatically promote layers
that mix polygon or multipolygons to multipolygons, and layers that mix linestrings or
@@ -49,7 +49,7 @@ Last-Update: 2013-10-11
+multilinestrings to multilinestrings. Can be useful when converting shapefiles to PostGIS
(and other target drivers) that implements strict checks for geometry type.</dd>
<dt> <b>-dim</b><em> val</em>:</dt><dd>(starting with GDAL 1.10) Force the coordinate dimension to val (valid values are 2 or 3).
- This affects both the layer geometry type, and feature geometries.</dd>
+ This affects both the layer geometry type, and feature geometries.
--- a/doc/gdal_drivertut.dox
+++ b/doc/gdal_drivertut.dox
@@ -447,7 +447,7 @@ void GDALRegister_JDEM()
@@ -63,7 +63,7 @@ Last-Update: 2013-10-11
which you want to make it work. The GDAL_CHECK_VERSION macro will check that the GDAL version
--- a/frmts/gtiff/geotiff.cpp
+++ b/frmts/gtiff/geotiff.cpp
-@@ -237,7 +237,7 @@ class GTiffDataset : public GDALPamDatas
+@@ -247,7 +247,7 @@ class GTiffDataset : public GDALPamDatas
toff_t nDirOffset;
int bBase;
@@ -72,7 +72,7 @@ Last-Update: 2013-10-11
uint16 nPlanarConfig;
uint16 nSamplesPerPixel;
-@@ -693,7 +693,7 @@ GTiffRasterBand::GTiffRasterBand( GTiffD
+@@ -746,7 +746,7 @@ GTiffRasterBand::~GTiffRasterBand()
/* Reads directly bytes from the file using ReadMultiRange(), and by-pass */
/* block reading. Restricted to simple TIFF configurations (un-tiled, */
@@ -81,16 +81,16 @@ Last-Update: 2013-10-11
/* sub-windows of data on a large /vsicurl dataset). */
CPLErr GTiffRasterBand::DirectIO( GDALRWFlag eRWFlag,
-@@ -7643,7 +7643,7 @@ TIFF *GTiffDataset::CreateLL( const char
+@@ -8608,7 +8608,7 @@ TIFF *GTiffDataset::CreateLL( const char
}
-
+
/* Set the compression method before asking the default strip size */
- /* This is usefull when translating to a JPEG-In-TIFF file where */
+ /* This is useful when translating to a JPEG-In-TIFF file where */
/* the default strip size is 8 or 16 depending on the photometric value */
TIFFSetField( hTIFF, TIFFTAG_COMPRESSION, nCompression );
-@@ -8086,7 +8086,7 @@ GTiffDataset::CreateCopy( const char * p
+@@ -9092,7 +9092,7 @@ GTiffDataset::CreateCopy( const char * p
int bDirectCopyFromJPEG = FALSE;
/* Note: JPEG_DIRECT_COPY is not defined by default, because it is mainly */
@@ -108,7 +108,7 @@ Last-Update: 2013-10-11
-/* usefull for debugging purposes */
+/* useful for debugging purposes */
- CPL_CVSID("$Id: gt_jpeg_copy.cpp 24337 2012-04-28 15:06:01Z rouault $");
+ CPL_CVSID("$Id: gt_jpeg_copy.cpp 27044 2014-03-16 23:41:27Z rouault $");
--- a/frmts/pcraster/pcrasterutil.cpp
+++ b/frmts/pcraster/pcrasterutil.cpp
@@ -125,7 +125,7 @@ Last-Update: 2013-10-11
or CR_REAL4.
--- a/frmts/pdf/frmt_pdf.html
+++ b/frmts/pdf/frmt_pdf.html
-@@ -73,7 +73,7 @@ off.</li>
+@@ -72,7 +72,7 @@ querying the LAYERS metadata domain.</li
<h2>LAYERS Metadata domain</h2>
Starting with GDAL >= 1.10.0 and when GDAL is compiled against libpoppler, the LAYERS metadata domain can be queried
@@ -134,7 +134,7 @@ Last-Update: 2013-10-11
<i>GDAL_PDF_LAYERS</i> or <i>GDAL_PDF_LAYERS_OFF</i> configuration options.<p>
For example :
-@@ -171,7 +171,7 @@ specified, all the extra rasters will be
+@@ -172,7 +172,7 @@ specified, all the extra rasters will be
the /FTimesRoman and /FTimesBold fonts.</p></li>
<li><p><b>EXTRA_IMAGES=image_file_name,x,y,scale[,link=some_url] (possibly repeated)</b>: A list of (ungeoreferenced) images to insert into
@@ -156,7 +156,7 @@ Last-Update: 2013-10-11
--- a/frmts/vrt/vrtsources.cpp
+++ b/frmts/vrt/vrtsources.cpp
-@@ -342,7 +342,7 @@ CPLErr VRTSimpleSource::XMLInit( CPLXMLN
+@@ -444,7 +444,7 @@ CPLErr VRTSimpleSource::XMLInit( CPLXMLN
/* Newly generated VRT will have RasterXSize, RasterYSize, DataType, */
/* BlockXSize, BlockYSize tags, so that we don't have actually to */
/* open the real dataset immediately, but we can use a proxy dataset */
@@ -167,7 +167,7 @@ Last-Update: 2013-10-11
int nRasterXSize = 0, nRasterYSize =0;
--- a/gcore/gdalrasterband.cpp
+++ b/gcore/gdalrasterband.cpp
-@@ -4712,7 +4712,7 @@ CPLErr CPL_STDCALL GDALCreateMaskBand( G
+@@ -4761,7 +4761,7 @@ CPLErr CPL_STDCALL GDALCreateMaskBand( G
/**
* \brief Compute translation table for color tables.
*
@@ -178,19 +178,19 @@ Last-Update: 2013-10-11
* matching if no exact matching is possible.
--- a/man/man1/ogr2ogr.1
+++ b/man/man1/ogr2ogr.1
-@@ -86,7 +86,7 @@ Layer creation option (format specific)
+@@ -89,7 +89,7 @@ Layer creation option (format specific)
.IP "\fB\fB-nln\fP\fI name\fP:\fP" 1c
Assign an alternate name to the new layer
.IP "\fB\fB-nlt\fP\fI type\fP:\fP" 1c
-Define the geometry type for the created layer. One of NONE, GEOMETRY, POINT, LINESTRING, POLYGON, GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOLYGON or MULTILINESTRING. Add '25D' to the name to get 2.5D versions. Starting with GDAL 1.10, PROMOTE_TO_MULTI can be used to automatically promote layers that mix polygon or multipolygons to multipolygons, and layers that mix linestrings or multilinestrings to multilinestrings. Can be usefull when converting shapefiles to PostGIS (and other target d [...]
+Define the geometry type for the created layer. One of NONE, GEOMETRY, POINT, LINESTRING, POLYGON, GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOLYGON or MULTILINESTRING. Add '25D' to the name to get 2.5D versions. Starting with GDAL 1.10, PROMOTE_TO_MULTI can be used to automatically promote layers that mix polygon or multipolygons to multipolygons, and layers that mix linestrings or multilinestrings to multilinestrings. Can be useful when converting shapefiles to PostGIS (and other target dr [...]
.IP "\fB\fB-dim\fP\fI val\fP:\fP" 1c
- (starting with GDAL 1.10) Force the coordinate dimension to val (valid values are 2 or 3). This affects both the layer geometry type, and feature geometries.
+ (starting with GDAL 1.10) Force the coordinate dimension to val (valid values are 2 or 3). This affects both the layer geometry type, and feature geometries. Starting with GDAL 1.11, the value can be set to 'layer_dim' to instruct feature geometries to be promoted to the coordinate dimension declared by the layer.
.IP "\fB\fB-a_srs\fP\fI srs_def\fP:\fP" 1c
--- a/ogr/ogrgeometryfactory.cpp
+++ b/ogr/ogrgeometryfactory.cpp
-@@ -1025,7 +1025,7 @@ typedef enum
- * of holes is counterclockwise defined (this is the convention for shapefiles e.g.)
+@@ -1039,7 +1039,7 @@ typedef enum
+ * with care.
*
* If the OGR_ORGANIZE_POLYGONS configuration option is defined, its value will override
- * the value of the METHOD option of papszOptions (usefull to modify the behaviour of the
@@ -200,7 +200,7 @@ Last-Update: 2013-10-11
* @param papoPolygons array of geometry pointers - should all be OGRPolygons.
--- a/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
+++ b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
-@@ -1428,7 +1428,7 @@ void OGRGenSQLResultsLayer::CreateOrderB
+@@ -1748,7 +1748,7 @@ void OGRGenSQLResultsLayer::CreateOrderB
/* If it is already sorted, then free than panFIDIndex array */
/* so that GetNextFeature() can call a sequential GetNextFeature() */
@@ -222,7 +222,7 @@ Last-Update: 2013-10-11
The following content :
--- a/ogr/ogrsf_frmts/gml/drv_gml.html
+++ b/ogr/ogrsf_frmts/gml/drv_gml.html
-@@ -117,7 +117,7 @@ description of the .gfs syntax below.<p>
+@@ -140,7 +140,7 @@ description of the .gfs syntax below.<p>
OGR 1.8.0 adds support to "merge" the multiple geometries found in a feature by
setting the configuration option <b>GML_FETCH_ALL_GEOMETRIES</b> to <b>YES</b>. The geometries
will be collected into a GeometryCollection (or Multipolygon if individual geometries
@@ -244,7 +244,7 @@ Last-Update: 2013-10-11
*/
--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-@@ -2521,7 +2521,7 @@ int OGROSMDataSource::Open( const char *
+@@ -2677,7 +2677,7 @@ int OGROSMDataSource::Open( const char *
return FALSE;
}
@@ -266,7 +266,7 @@ Last-Update: 2013-10-11
will cause a web browser to be opened on the specified URL.</p></li>
--- a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
+++ b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
-@@ -555,7 +555,7 @@ void OGRShapeLayer::SetSpatialFilter( OG
+@@ -584,7 +584,7 @@ void OGRShapeLayer::SetSpatialFilter( OG
{
/* We clear the spatialFIDs only if we have a new non-NULL */
/* spatial filter, otherwise we keep the previous result */
@@ -277,7 +277,7 @@ Last-Update: 2013-10-11
/* a clearing of the spatial filter of the table layer, we */
--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
+++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
-@@ -544,7 +544,7 @@ OGRLayer * OGRSQLiteExecuteSQL( OGRDataS
+@@ -764,7 +764,7 @@ OGRLayer * OGRSQLiteExecuteSQL( OGRDataS
}
}
@@ -288,7 +288,7 @@ Last-Update: 2013-10-11
GByte* pabyEmptyDBClone = (GByte*)VSIMalloc(nEmptyDBSize);
--- a/ogr/ogrsf_frmts/vrt/drv_vrt.html
+++ b/ogr/ogrsf_frmts/vrt/drv_vrt.html
-@@ -145,12 +145,12 @@ default defaults to the value of "name".
+@@ -174,12 +174,12 @@ Defaults to the value of "name".
<li> <b>FeatureCount</b> (optional, from GDAL 1.10.0) : This element is used
to define the feature count of the layer (when no spatial or attribute filter is set).
@@ -303,16 +303,16 @@ Last-Update: 2013-10-11
getting the extent from the source layer is slow.</li>
<br>
-@@ -178,7 +178,7 @@ reference to use for the layer after rep
+@@ -207,7 +207,7 @@ reference to use for the layer after rep
<br>
<li> <b>ExtentXMin</b>, <b>ExtentYMin</b>, <b>ExtentXMax</b> and <b>ExtentXMax</b> (optional, from GDAL 1.10.0) :
-Those elements are used to define the extent of the layer. This can be usefull on static data, when
+Those elements are used to define the extent of the layer. This can be useful on static data, when
getting the extent from the source layer is slow.</li>
-
<br>
-@@ -254,7 +254,7 @@ the layer as a point layer, and as being
+
+@@ -292,7 +292,7 @@ the layer as a point layer, and as being
<h2>Example: Renaming attributes</h2>
@@ -323,7 +323,7 @@ Last-Update: 2013-10-11
(<name>, <desc>, etc.). This can be accomplished using
--- a/port/cpl_conv.cpp
+++ b/port/cpl_conv.cpp
-@@ -1527,7 +1527,7 @@ static void CPLAccessConfigOption(const
+@@ -1531,7 +1531,7 @@ static void CPLAccessConfigOption(const
* char* pszOldVal = pszOldValTmp ? CPLStrdup(pszOldValTmp) : NULL;
* // override with new value
* CPLSetConfigOption(pszKey, pszNewVal);
@@ -334,7 +334,7 @@ Last-Update: 2013-10-11
* CPLFree(pszOldVal);
--- a/port/cpl_http.cpp
+++ b/port/cpl_http.cpp
-@@ -513,7 +513,7 @@ void CPLHTTPSetOptions(CURL *http_handle
+@@ -522,7 +522,7 @@ void CPLHTTPSetOptions(CURL *http_handle
/************************************************************************/
/**
@@ -356,7 +356,7 @@ Last-Update: 2013-10-11
*/
--- a/swig/python/scripts/gdal2tiles.py
+++ b/swig/python/scripts/gdal2tiles.py
-@@ -91,7 +91,7 @@ Created by Klokan Petr Pridal on 2008-07
+@@ -93,7 +93,7 @@ Created by Klokan Petr Pridal on 2008-07
Google Summer of Code 2008, project GDAL2Tiles for OSGEO.
In case you use this class in your product, translate it to another language
@@ -367,7 +367,7 @@ Last-Update: 2013-10-11
--- a/swig/python/scripts/gdal_retile.py
+++ b/swig/python/scripts/gdal_retile.py
-@@ -45,7 +45,7 @@ import os
+@@ -46,7 +46,7 @@ import os
import math
class AffineTransformDecorator:
@@ -378,7 +378,7 @@ Last-Update: 2013-10-11
self.scaleX=self.geotransform[1]
--- a/alg/gdal_rpc.cpp
+++ b/alg/gdal_rpc.cpp
-@@ -335,7 +335,7 @@ typedef struct {
+@@ -336,7 +336,7 @@ typedef struct {
* an average height above sea level for ground in the target scene.
*
* <li> RPC_HEIGHT_SCALE: a factor used to multiply heights above ground.
@@ -389,7 +389,7 @@ Last-Update: 2013-10-11
* extract elevation offsets from. In this situation the Z passed into the
--- a/apps/gdaladdo.cpp
+++ b/apps/gdaladdo.cpp
-@@ -51,7 +51,7 @@ static void Usage(const char* pszErrorMs
+@@ -52,7 +52,7 @@ static void Usage(const char* pszErrorMs
" filename: The file to build overviews for (or whose overviews must be removed).\n"
" levels: A list of integral overview levels to build. Ignored with -clean option.\n"
"\n"
@@ -411,7 +411,7 @@ Last-Update: 2013-10-11
<td class="xml"> <AdviseRead><span class="value">true</span></AdviseRead></td>
--- a/gcore/gdal_priv.h
+++ b/gcore/gdal_priv.h
-@@ -912,7 +912,7 @@ int CPL_DLL GDALCheckDatasetDimensions(
+@@ -932,7 +932,7 @@ int CPL_DLL GDALCheckDatasetDimensions(
int CPL_DLL GDALCheckBandCount( int nBands, int bIsZeroAllowed );
@@ -422,7 +422,7 @@ Last-Update: 2013-10-11
(dfVal1 == dfVal2 || fabs(dfVal1 - dfVal2) < 1e-10 || (dfVal2 != 0 && fabs(1 - dfVal1 / dfVal2) < 1e-10 ))
--- a/gcore/gdaldataset.cpp
+++ b/gcore/gdaldataset.cpp
-@@ -1846,7 +1846,7 @@ void CPL_STDCALL GDALGetOpenDatasets( GD
+@@ -1874,7 +1874,7 @@ void CPL_STDCALL GDALGetOpenDatasets( GD
/* GDALCleanOpenDatasetsList() */
/************************************************************************/
@@ -433,7 +433,7 @@ Last-Update: 2013-10-11
{
--- a/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
+++ b/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
-@@ -1084,7 +1084,7 @@ OGRSpatialReference *OGRGPXLayer::GetSpa
+@@ -1076,7 +1076,7 @@ OGRFeature *OGRGPXLayer::GetNextFeature(
static char* OGRGPX_GetXMLCompatibleTagName(const char* pszExtensionsNS,
const char* pszName)
{
@@ -442,20 +442,9 @@ Last-Update: 2013-10-11
if (strncmp(pszName, pszExtensionsNS, strlen(pszExtensionsNS)) == 0 &&
pszName[strlen(pszExtensionsNS)] == '_')
{
---- a/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
-+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitelayer.cpp
-@@ -330,7 +330,7 @@ void OGRSQLiteLayer::BuildFeatureDefn( c
- }
-
- // Recognize a geometry column from trying to build the geometry
-- // Usefull for OGRSQLiteSelectLayer
-+ // Useful for OGRSQLiteSelectLayer
- if( nColType == SQLITE_BLOB && osGeomColumn.size() == 0 )
- {
- const int nBytes = sqlite3_column_bytes( hStmt, iCol );
--- a/port/cpl_string.cpp
+++ b/port/cpl_string.cpp
-@@ -2166,7 +2166,7 @@ size_t CPLStrlcat(char* pszDest, const c
+@@ -2167,7 +2167,7 @@ size_t CPLStrlcat(char* pszDest, const c
* the specified number of bytes.
*
* The CPLStrnlen() function returns MIN(strlen(pszStr), nMaxLen).
@@ -464,3 +453,100 @@ Last-Update: 2013-10-11
* test if a string contains at least nMaxLen characters without reading
* the full string up to the NUL terminating character.
*
+--- a/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp
++++ b/ogr/ogrsf_frmts/csv/ogrcsvlayer.cpp
+@@ -502,7 +502,7 @@ OGRCSVLayer::OGRCSVLayer( const char *ps
+ EQUAL(pszFieldName,"WKT") ? "" : CPLSPrintf("geom_%s", pszFieldName),
+ wkbUnknown );
+
+- /* Usefull hack for RFC 41 testing */
++ /* Useful hack for RFC 41 testing */
+ const char* pszEPSG = strstr(pszFieldName, "_EPSG_");
+ if( pszEPSG != NULL )
+ {
+--- a/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
++++ b/ogr/ogrsf_frmts/libkml/ogrlibkmldatasource.cpp
+@@ -174,7 +174,7 @@ static void OGRLIBKMLPostProcessOutput(s
+ size_t nPos = 0;
+
+ /* Manually add <?xml> node since libkml does not produce it currently */
+- /* and this is usefull in some circumstances (#5407) */
++ /* and this is useful in some circumstances (#5407) */
+ if( !(oKml[0] == '<' && oKml[1] == '?') )
+ oKml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" + oKml;
+
+--- a/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp
++++ b/ogr/ogrsf_frmts/openfilegdb/ogropenfilegdblayer.cpp
+@@ -789,7 +789,7 @@ FileGDBIterator* OGROpenFileGDBLayer::Bu
+ poNode->nOperation == SWQ_AND && poNode->nSubExprCount == 2 )
+ {
+ /* Even if there's only one branch of the 2 that results to an iterator, */
+- /* it is usefull. Of course, the iterator will not be sufficient to evaluate */
++ /* it is useful. Of course, the iterator will not be sufficient to evaluate */
+ /* the filter, but it will be a super-set of the features */
+ FileGDBIterator* poIter1 = BuildIteratorFromExprNode(poNode->papoSubExpr[0]);
+
+--- a/ogr/ogrsf_frmts/sqlite/drv_sqlite.html
++++ b/ogr/ogrsf_frmts/sqlite/drv_sqlite.html
+@@ -308,7 +308,7 @@ ogrinfo db.sqlite -sql "SELECT CreateSpa
+ </pre>
+ <p>
+
+-If a database has gone through editing operations, it might be usefull to run a
++If a database has gone through editing operations, it might be useful to run a
+ <a href="https://sqlite.org/lang_vacuum.html">VACUUM</a> query to compact and optimize it.
+ <pre>ogrinfo db.sqlite -sql "VACUUM"</pre>
+ <p>
+--- a/ogr/ogrsf_frmts/wasp/drv_wasp.html
++++ b/ogr/ogrsf_frmts/wasp/drv_wasp.html
+@@ -15,7 +15,7 @@ This driver writes .map files to be used
+
+ <ul>
+ <li>WASP_FIELDS : a coma separated list of fields. For elevation, the name of the height field. For rouhgness, the name of the left and right roughness fields resp.</li>
+- <li>WASP_MERGE : this may be set to "NO". Used only when generating roughness from polygons. All polygon boundaries will be output (including those with the same left and righ roughness). This is usefull (along with option -skipfailures) for debugging incorect input geometries.</li>
++ <li>WASP_MERGE : this may be set to "NO". Used only when generating roughness from polygons. All polygon boundaries will be output (including those with the same left and righ roughness). This is useful (along with option -skipfailures) for debugging incorect input geometries.</li>
+ <li>WASP_GEOM_FIELD : in case input has several geometry columns and the first one (default) is not the right one.</li>
+ <li>WASP_TOLERANCE : specify a tolerance for line simplification of output.</li>
+ </ul>
+--- a/port/cpl_virtualmem.h
++++ b/port/cpl_virtualmem.h
+@@ -216,7 +216,7 @@ CPLVirtualMem CPL_DLL *CPLVirtualMemFile
+ /** Create a new virtual memory mapping derived from an other virtual memory
+ * mapping.
+ *
+- * This may be usefull in case of creating mapping for pixel interleaved data.
++ * This may be useful in case of creating mapping for pixel interleaved data.
+ *
+ * The new mapping takes a reference on the base mapping.
+ *
+@@ -356,7 +356,7 @@ void CPL_DLL CPLVirtualMemUnDeclareThrea
+
+ /** Make sure that a region of virtual memory will be realized.
+ *
+- * Calling this function is not required, but might be usefull when debugging
++ * Calling this function is not required, but might be useful when debugging
+ * a process with tools like gdb or valgrind that do not naturally like
+ * segmentation fault signals.
+ *
+--- a/scripts/vce2008_wine/prepare-gdal-vce2008.sh
++++ b/scripts/vce2008_wine/prepare-gdal-vce2008.sh
+@@ -43,7 +43,7 @@ unzip /tmp/release-1500-dev.zip release-
+ svn checkout https://svn.osgeo.org/gdal/trunk $HOME/gdal_vce2008
+ ln -s $HOME/gdal_vce2008 ~/.wine/drive_c/gdal
+
+-# Install usefull scripts
++# Install useful scripts
+ cp build_vce2008.patch /tmp
+ cp build_vce2008.bat $HOME/gdal_vce2008/gdal
+ cp build_vce2008.sh $HOME/gdal_vce2008/gdal
+--- a/swig/python/scripts/gdal_edit.dox
++++ b/swig/python/scripts/gdal_edit.dox
+@@ -27,7 +27,7 @@ and exit.
+ </dd>
+
+ <dt> <b>-ro</b></dt>:<dd> (GDAL >= 1.11)
+-Open the dataset in read-only. Might be usefull for drivers refusing to
++Open the dataset in read-only. Might be useful for drivers refusing to
+ use the dataset in update-mode. In which case, updated information will go
+ into PAM .aux.xml files.</dd>
+
--
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