[gdal] 14/29: Drop patches applied upstream, refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Jun 14 20:19:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental-2.0
in repository gdal.
commit 90d66bd21102a81801fe65c9d4777018f83e5c0b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jun 14 01:39:46 2015 +0200
Drop patches applied upstream, refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/accomodate-typo | 217 ---------
debian/patches/algoritm-typo | 39 --
debian/patches/allows-typo | 16 -
debian/patches/bandwith-typo | 27 --
debian/patches/consistant-typo | 516 +++++++--------------
debian/patches/developement-typo | 16 -
debian/patches/doc | 20 -
debian/patches/explicitely-typo | 941 +++++++++++++++------------------------
debian/patches/gdalpaths | 17 +-
debian/patches/hdf4 | 10 +-
debian/patches/inconsistant-typo | 337 +++++++-------
debian/patches/initalize-typo | 61 +--
debian/patches/ogdi | 2 +-
debian/patches/paramters-typo | 36 +-
debian/patches/recommanded-typo | 98 +---
debian/patches/ressource-typo | 225 +---------
debian/patches/series | 6 -
debian/patches/spatialite | 6 +-
debian/patches/supress-typo | 415 +----------------
debian/patches/symver | 2 +-
debian/patches/transfered-typo | 74 ++-
debian/patches/transfering-typo | 36 --
debian/patches/usefull-typo | 656 +++++----------------------
24 files changed, 880 insertions(+), 2894 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e450508..f20a7e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gdal (2.0.0~rc1+dfsg-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Update copyright years & holders.
* Use uscan in get-orig-source target.
+ * Drop patches applied upstream, refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Sat, 13 Jun 2015 23:40:47 +0200
diff --git a/debian/patches/accomodate-typo b/debian/patches/accomodate-typo
deleted file mode 100644
index 6da36df..0000000
--- a/debian/patches/accomodate-typo
+++ /dev/null
@@ -1,217 +0,0 @@
-Description: Fix 'accomodate' typo, replace with 'accommodate'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
-
---- a/NEWS
-+++ b/NEWS
-@@ -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)
-- * Avoid precaching other bands if block cache size is not big enough to accomodate them (#2838)
-+ * Avoid precaching other bands if block cache size is not big enough to accommodate them (#2838)
- * Internal libtiff (4.0.0beta5) and libgeotiff (1.3.0beta) upgraded
- * use the SetCitationToSRS call for the PCSCitationGeoKey in a similar fashion to the GTCitationGeoKey (#2933)
- * NBITS set for GTiffOddBits. YCbCr JPEG added as a compression type.
---- a/frmts/grib/degrib18/g2clib-1.0.4/simpack.c
-+++ b/frmts/grib/degrib18/g2clib-1.0.4/simpack.c
-@@ -112,7 +112,7 @@ void simpack(g2float *fld,g2int ndpts,g2
- else if (nbits!=0 && idrstmpl[1]==0) {
- //
- // Use minimum number of bits specified by user and
-- // adjust binary scaling factor to accomodate data.
-+ // adjust binary scaling factor to accommodate data.
- //
- rmin=rmin*dscale;
- rmax=rmax*dscale;
---- a/frmts/gtiff/geotiff.cpp
-+++ b/frmts/gtiff/geotiff.cpp
-@@ -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 */
--/* enough to accomodate the size of all the blocks, don't enter */
-+/* enough to accommodate the size of all the blocks, don't enter */
- /* -------------------------------------------------------------------- */
- if( poGDS->nBands != 1 && !poGDS->bLoadingOtherBands &&
- nBlockXSize * nBlockYSize * (GDALGetDataTypeSize(eDataType) / 8) < GDALGetCacheMax64() / poGDS->nBands)
---- a/frmts/gtiff/gt_wkt_srs.cpp
-+++ b/frmts/gtiff/gt_wkt_srs.cpp
-@@ -433,7 +433,7 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
- && psDefn->UOMLengthInMeters != 1.0 )
- {
- psDefn->ProjParm[iParm] /= psDefn->UOMLengthInMeters;
-- CPLDebug( "GTIFF", "converting geokey to accomodate old broken file due to GTIFF_LINEAR_UNITS=BROKEN setting." );
-+ CPLDebug( "GTIFF", "converting geokey to accommodate old broken file due to GTIFF_LINEAR_UNITS=BROKEN setting." );
- }
- break;
-
---- a/man/man1/gdalwarp.1
-+++ b/man/man1/gdalwarp.1
-@@ -125,7 +125,7 @@ The source file name(s).
- The destination file name.
- .PP
- .PP
--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 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
-@@ -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
-- * accomodate the request.
-+ * accommodate the request.
- *
- * @param hGeom handle to the geometry to add a vertex to.
- * @param i the index of the vertex to assign (zero based) or
-@@ -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
-- * accomodate the request.
-+ * accommodate the request.
- *
- * @param hGeom handle to the geometry to add a vertex to.
- * @param i the index of the vertex to assign (zero based) or
---- a/ogr/ogrlinestring.cpp
-+++ b/ogr/ogrlinestring.cpp
-@@ -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
-- * accomodate the request.
-+ * accommodate the request.
- *
- * There is no SFCOM analog to this method.
- *
-@@ -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
-- * accomodate the request.
-+ * accommodate the request.
- *
- * There is no SFCOM analog to this method.
- *
---- a/ogr/ogrsf_frmts/avc/avc_e00write.c
-+++ b/ogr/ogrsf_frmts/avc/avc_e00write.c
-@@ -78,7 +78,7 @@
- * Accept '-' cahracter in new coverage name
- *
- * Revision 1.6 2000/01/10 02:57:44 daniel
-- * Little changes to accomodate read support for "weird" coverages
-+ * Little changes to accommodate read support for "weird" coverages
- *
- * Revision 1.5 1999/12/24 07:18:34 daniel
- * Added PC Arc/Info coverages support
---- a/ogr/ogrsf_frmts/shape/drv_shapefile.html
-+++ b/ogr/ogrsf_frmts/shape/drv_shapefile.html
-@@ -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
--(up to the 255 bytes limit imposed by the DBF format) to dynamically accomodate for
-+(up to the 255 bytes limit imposed by the DBF format) to dynamically accommodate for
- the length of the data to be inserted.</p>
-
- <p>It is also possible to force a resize of the fields to the optimal width by issuing a
---- a/swig/include/php/gdal_php.i
-+++ b/swig/include/php/gdal_php.i
-@@ -7,7 +7,7 @@
- /*
- * $Log$
- * Revision 1.1 2005/09/02 16:19:23 kruland
-- * Major reorganization to accomodate multiple language bindings.
-+ * Major reorganization to accommodate multiple language bindings.
- * Each language binding can define renames and supplemental code without
- * having to have a lot of conditionals in the main interface definition files.
- *
---- a/swig/include/php/ogr_php.i
-+++ b/swig/include/php/ogr_php.i
-@@ -7,7 +7,7 @@
- /*
- * $Log$
- * Revision 1.1 2005/09/02 16:19:23 kruland
-- * Major reorganization to accomodate multiple language bindings.
-+ * Major reorganization to accommodate multiple language bindings.
- * Each language binding can define renames and supplemental code without
- * having to have a lot of conditionals in the main interface definition files.
- *
---- a/swig/include/ruby/gdal_ruby.i
-+++ b/swig/include/ruby/gdal_ruby.i
-@@ -10,7 +10,7 @@
- * Copied over code from the Python version of gdal_ruby.i. Will have to port the code to Ruby.
- *
- * Revision 1.1 2005/09/02 16:19:23 kruland
-- * Major reorganization to accomodate multiple language bindings.
-+ * Major reorganization to accommodate multiple language bindings.
- * Each language binding can define renames and supplemental code without
- * having to have a lot of conditionals in the main interface definition files.
- *
---- a/swig/include/ruby/ogr_ruby.i
-+++ b/swig/include/ruby/ogr_ruby.i
-@@ -16,7 +16,7 @@
- * Added support for exceptions, removed some outdated code.
- *
- * Revision 1.1 2005/09/02 16:19:23 kruland
-- * Major reorganization to accomodate multiple language bindings.
-+ * Major reorganization to accommodate multiple language bindings.
- * Each language binding can define renames and supplemental code without
- * having to have a lot of conditionals in the main interface definition files.
- *
---- a/swig/include/ruby/typemaps_ruby.i
-+++ b/swig/include/ruby/typemaps_ruby.i
-@@ -39,7 +39,7 @@
- * Significantly updated typemaps for Ruby - resynced with the Python typemaps file.
- *
- * Revision 1.5 2005/09/02 16:19:23 kruland
-- * Major reorganization to accomodate multiple language bindings.
-+ * Major reorganization to accommodate multiple language bindings.
- * Each language binding can define renames and supplemental code without
- * having to have a lot of conditionals in the main interface definition files.
- *
---- a/swig/java/javadoc.java
-+++ b/swig/java/javadoc.java
-@@ -9103,7 +9103,7 @@ public class Geometry:public void SetCoo
- * <p>
- * If ipoint is larger than the number of existing
- * points in the linestring, the point count will be increased to
-- * accomodate the request.
-+ * accommodate the request.
- *
- * @param ipoint the index of the vertex to assign (zero based) or
- * zero for a point.
-@@ -9117,7 +9117,7 @@ public class Geometry:public void SetPoi
- * <p>
- * If ipoint is larger than the number of existing
- * points in the linestring, the point count will be increased to
-- * accomodate the request.
-+ * accommodate the request.
- *
- * @param ipoint the index of the vertex to assign (zero based) or
- * zero for a point.
-@@ -9132,7 +9132,7 @@ public class Geometry:public void SetPoi
- * <p>
- * If ipoint is larger than the number of existing
- * points in the linestring, the point count will be increased to
-- * accomodate the request.
-+ * accommodate the request.
- *
- * @param ipoint the index of the vertex to assign (zero based) or
- * zero for a point.
---- a/apps/gdalwarp.cpp
-+++ b/apps/gdalwarp.cpp
-@@ -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
--be modified to accomodate new data, so you may have to remove it in that case, or
-+be modified to accommodate new data, so you may have to remove it in that case, or
- use the -overwrite option.
-
- Polygon cutlines may be used as a mask to restrict the area of the destination file
diff --git a/debian/patches/algoritm-typo b/debian/patches/algoritm-typo
deleted file mode 100644
index 58ea7fd..0000000
--- a/debian/patches/algoritm-typo
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Fix 'algoritm' typo, replace with 'algorithm'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
-
---- a/swig/include/Operations.i
-+++ b/swig/include/Operations.i
-@@ -447,7 +447,7 @@ int wrapper_GridCreate( char* algorithmO
-
- if ( eErr != CE_None )
- {
-- CPLError( eErr, CPLE_AppDefined, "Failed to process algoritm name and parameters.\n" );
-+ CPLError( eErr, CPLE_AppDefined, "Failed to process algorithm name and parameters.\n" );
- return eErr;
- }
-
---- a/alg/gdalgrid.cpp
-+++ b/alg/gdalgrid.cpp
-@@ -2045,17 +2045,17 @@ GDALGridCreate( GDALGridAlgorithm eAlgor
- /* defaults. */
- /************************************************************************/
-
--CPLErr ParseAlgorithmAndOptions( const char *pszAlgoritm,
-+CPLErr ParseAlgorithmAndOptions( const char *pszAlgorithm,
- GDALGridAlgorithm *peAlgorithm,
- void **ppOptions )
- {
-- CPLAssert( pszAlgoritm );
-+ CPLAssert( pszAlgorithm );
- CPLAssert( peAlgorithm );
- CPLAssert( ppOptions );
-
- *ppOptions = NULL;
-
-- char **papszParms = CSLTokenizeString2( pszAlgoritm, ":", FALSE );
-+ char **papszParms = CSLTokenizeString2( pszAlgorithm, ":", FALSE );
-
- if ( CSLCount(papszParms) < 1 )
- return CE_Failure;
diff --git a/debian/patches/allows-typo b/debian/patches/allows-typo
deleted file mode 100644
index 1f5ab5c..0000000
--- a/debian/patches/allows-typo
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'allows to' typo.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
-
---- a/swig/python/scripts/gdal_edit.dox
-+++ b/swig/python/scripts/gdal_edit.dox
-@@ -14,7 +14,7 @@ gdal_edit [--help-general] [-ro] [-a_srs
-
- \section gdal_edit_description DESCRIPTION
-
--The gdal_edit.py script can be used to allows to edit in place various information
-+The gdal_edit.py script can be used to edit in place various information
- of an existing GDAL dataset (projection, geotransform, nodata, metadata).
-
- It works only with raster formats that support update access to
diff --git a/debian/patches/bandwith-typo b/debian/patches/bandwith-typo
deleted file mode 100644
index fb4730e..0000000
--- a/debian/patches/bandwith-typo
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix 'bandwith' typo, replace with 'bandwidth'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
-
---- a/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
-+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitedatasource.cpp
-@@ -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 "
-- "steal data, or use network bandwith, without your consent.\n"
-+ "steal data, or use network bandwidth, without your consent.\n"
- "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 aeb1ec0..3b7a0cc 100644
--- a/debian/patches/consistant-typo
+++ b/debian/patches/consistant-typo
@@ -1,87 +1,10 @@
Description: Fix 'consistant' typo, replace with 'consistent'.
Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
---- a/NEWS
-+++ b/NEWS
-@@ -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
-- * Add warning if a target filename extension isn't consistant with the output driver
-+ * Add warning if a target filename extension isn't consistent with the output driver
- * Add --pause for convenient debugging, document it and --locale
-
- Multi-driver topics:
-@@ -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
-- * ogr2ogr: add a warning if the target filename has an extension or a prefix that isn't consistant with the default output format (i.e. Shapefile), but which matches another driver. Can be made quiet with -q option
-+ * ogr2ogr: add a warning if the target filename has an extension or a prefix that isn't consistent with the default output format (i.e. Shapefile), but which matches another driver. Can be made quiet with -q option
- * ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
-
- Multi driver topics:
-@@ -3031,7 +3031,7 @@ Utilities :
- to align on a standard grid (#3772)
-
- AAIGRID driver:
-- * Cast nodata value to float to be consistant with precision of pixel data in
-+ * Cast nodata value to float to be consistent with precision of pixel data in
- 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)
-@@ -3138,7 +3138,7 @@ GTX driver:
- * Read NOAA .gtx vertical datum shift files.
-
- GXF driver:
-- * Cast nodata value to float to be consistant with precision of pixel data in
-+ * Cast nodata value to float to be consistent with precision of pixel data in
- GDT_Float32 case
- * Introduce a GXF_DATATYPE configuration option that can be set to Float64
- * Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
-@@ -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
-- to operate on various geometry types, and to be consistant with PostGIS
-+ to operate on various geometry types, and to be consistent with PostGIS
- ST_Centroid() capabilities and the underlying GEOS method
- * Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
- datasources and layers virtual (#2978)
-@@ -4462,7 +4462,7 @@ General:
- osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
- osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
- * Make resampling an optionnal parameter for gdal.RegenerateOverview(),
-- to be consistant with gdal.RegenerateOverviews()
-+ to be consistent with gdal.RegenerateOverviews()
- * NONNULL checks have been added to check various arguments of methods
- * add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
-
-@@ -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)
-- * ogr2ogr: Output error messages on stderr to be consistant; Make error message about failed reprojection more clearer (hopefully); Advertize the use of -skipfailures in error message (#2588)
-+ * ogr2ogr: Output error messages on stderr to be consistent; Make error message about failed reprojection more clearer (hopefully); Advertize the use of -skipfailures in error message (#2588)
- * nearblack: Add support for scanning from top and bottom as well as from the sides.
- * Prevent crash in gdalwarpsimple utility and in GDALSimpleImageWarp() when source dataset has no raster band
- * gdal_rasterize: check that coordinates systems match (Ticket #1937)
---- a/alg/gdaltransformer.cpp
-+++ b/alg/gdaltransformer.cpp
-@@ -797,7 +797,7 @@ retry:
-
-
- /* -------------------------------------------------------------------- */
--/* Recompute some bounds so that all return values are consistant */
-+/* Recompute some bounds so that all return values are consistent */
- /* -------------------------------------------------------------------- */
- dfMaxXOut = dfMinXOut + (*pnPixels) * dfPixelSizeX;
- dfMinYOut = dfMaxYOut - (*pnLines) * dfPixelSizeY;
--- a/apps/commonutils.cpp
+++ b/apps/commonutils.cpp
-@@ -36,7 +36,7 @@ CPL_CVSID("$Id: commonutils.cpp 27044 20
+@@ -36,7 +36,7 @@ CPL_CVSID("$Id: commonutils.cpp 27384 20
/* -------------------------------------------------------------------- */
/* CheckExtensionConsistency() */
/* */
@@ -90,167 +13,9 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* requested driver. Actually, we only warn in cases where the */
/* inconsistency is blatant (use of an extension declared by one */
/* or several drivers, and not by the selected one) */
---- a/apps/nearblack.cpp
-+++ b/apps/nearblack.cpp
-@@ -185,7 +185,7 @@ int main( int argc, char ** argv )
-
- CSLDestroy( papszTokens );
-
-- /***** check if the number of bands is consistant *****/
-+ /***** check if the number of bands is consistent *****/
-
- if ( oColors.size() > 0 &&
- oColors.front().size() != oColor.size() )
---- a/apps/testreprojmulti.cpp
-+++ b/apps/testreprojmulti.cpp
-@@ -65,7 +65,7 @@ void ReprojFunc(void* unused)
- memcpy(padfResultY, padfRefY, 1024 * sizeof(double));
- poCT->TransformEx( 1024, padfResultX, padfResultY, NULL, NULL );
-
-- /* Check that the results are consistant with the reference results */
-+ /* Check that the results are consistent with the reference results */
- assert(memcmp(padfResultX, padfRefResultX, 1024 * sizeof(double)) == 0);
- assert(memcmp(padfResultY, padfRefResultY, 1024 * sizeof(double)) == 0);
-
---- a/frmts/bsb/bsb_read.c
-+++ b/frmts/bsb/bsb_read.c
-@@ -644,7 +644,7 @@ static int BSBReadHeaderLine( BSBInfo *p
- /* BSBSeekAndCheckScanlineNumber() */
- /* */
- /* Seek to the beginning of the scanline and check that the */
--/* scanline number in file is consistant with what we expect */
-+/* scanline number in file is consistent with what we expect */
- /* */
- /* @param nScanline zero based line number */
- /************************************************************************/
-@@ -769,7 +769,7 @@ int BSBReadScanline( BSBInfo *psInfo, in
-
- /* -------------------------------------------------------------------- */
- /* Seek to the beginning of the scanline and check that the */
--/* scanline number in file is consistant with what we expect */
-+/* scanline number in file is consistent with what we expect */
- /* -------------------------------------------------------------------- */
- if ( !BSBSeekAndCheckScanlineNumber(psInfo, nScanline, TRUE) )
- {
---- a/frmts/nitf/nitfdataset.cpp
-+++ b/frmts/nitf/nitfdataset.cpp
-@@ -3577,7 +3577,7 @@ CPLErr NITFDataset::ReadJPEGBlock( int i
- if( poDS->GetRasterBand(1)->GetRasterDataType() != GetRasterBand(1)->GetRasterDataType())
- {
- CPLError( CE_Failure, CPLE_AppDefined,
-- "JPEG block %d data type (%s) not consistant with band data type (%s).",
-+ "JPEG block %d data type (%s) not consistent with band data type (%s).",
- iBlock, GDALGetDataTypeName(poDS->GetRasterBand(1)->GetRasterDataType()),
- GDALGetDataTypeName(GetRasterBand(1)->GetRasterDataType()) );
- delete poDS;
---- a/frmts/nitf/nitfimage.c
-+++ b/frmts/nitf/nitfimage.c
-@@ -3298,7 +3298,7 @@ static void NITFLoadLocationTable( NITFI
- }
- else
- {
-- CPLDebug("NITF", "The CoverageSectionSubheader content isn't consistant");
-+ CPLDebug("NITF", "The CoverageSectionSubheader content isn't consistent");
- bFoundValidLocation = FALSE;
- break;
- }
-@@ -3311,7 +3311,7 @@ static void NITFLoadLocationTable( NITFI
- }
- else
- {
-- CPLDebug("NITF", "The VQ tables content aren't consistant");
-+ CPLDebug("NITF", "The VQ tables content aren't consistent");
- bFoundValidLocation = FALSE;
- break;
- }
---- a/gcore/gdalpamrasterband.cpp
-+++ b/gcore/gdalpamrasterband.cpp
-@@ -1002,7 +1002,7 @@ PamParseHistogram( CPLXMLNode *psHistIte
- if( strlen(pszHistCounts) < 2 * (size_t)(*pnBuckets) -1 )
- {
- CPLError(CE_Failure, CPLE_AppDefined,
-- "HistCounts content isn't consistant with BucketCount value");
-+ "HistCounts content isn't consistent with BucketCount value");
- return FALSE;
- }
-
---- a/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
-+++ b/ogr/ogrsf_frmts/generic/ogr_gensql.cpp
-@@ -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
-- // worked in GDAL < 1.8, and it is consistant with how sqlite behaves too. See #4321
-+ // worked in GDAL < 1.8, and it is consistent with how sqlite behaves too. See #4321
- // For the reverse case, joining a string column with a numeric column, the
- // string constant will be cast to float by SWQAutoConvertStringToNumeric (#4259)
- if( eSecondaryFieldType == OFTString &&
---- a/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
-+++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.cpp
-@@ -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
-@@ -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
---- a/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp
-+++ b/ogr/ogrsf_frmts/idrisi/ogridrisilayer.cpp
-@@ -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 "
-- "consistant with feature number declared in .vdc");
-+ "consistent with feature number declared in .vdc");
- CSLDestroy( papszADC );
- return FALSE;
- }
---- a/ogr/ogrsf_frmts/shape/sbnsearch.c
-+++ b/ogr/ogrsf_frmts/shape/sbnsearch.c
-@@ -684,7 +684,7 @@ static int SBNSearchDiskInternal( Search
- #ifdef sanity_checks
- /* -------------------------------------------------------------------- */
- /* Those tests only check that the shape bounding box in the bin */
--/* are consistant (self-consistant and consistant with the node */
-+/* are consistent (self-consistent and consistent with the node */
- /* they are attached to). They are optional however (as far as */
- /* the safety of runtime is concerned at least). */
- /* -------------------------------------------------------------------- */
---- a/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
-+++ b/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
-@@ -1092,7 +1092,7 @@ OGRFeature *OGRWFSLayer::GetNextFeature(
- poBaseLayer = poBaseDS->GetLayer(0);
- poBaseLayer->ResetReading();
-
-- /* Check that the layer field definition is consistant with the one */
-+ /* Check that the layer field definition is consistent with the one */
- /* we got in BuildLayerDefn() */
- if (poFeatureDefn->GetFieldCount() != poBaseLayer->GetLayerDefn()->GetFieldCount())
- bGotApproximateLayerDefn = TRUE;
--- 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
chDelimiter = *pszLine;
else if (chDelimiter != *pszLine)
{
@@ -259,61 +24,127 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
CPLDebug("CSV", "Inconsistent separator. '%c' and '%c' found. Using ',' as default",
chDelimiter, *pszLine);
chDelimiter = ',';
---- a/swig/include/gdal_array.i
-+++ b/swig/include/gdal_array.i
-@@ -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:
-- raise ValueError('Specified buf_xsize not consistant with array shape')
-+ raise ValueError('Specified buf_xsize not consistent with array shape')
- if buf_ysize is not None and buf_ysize != shape_buf_ysize:
-- raise ValueError('Specified buf_ysize not consistant with array shape')
-+ raise ValueError('Specified buf_ysize not consistent with array shape')
- buf_xsize = shape_buf_xsize
- buf_ysize = shape_buf_ysize
-
---- a/swig/java/javadoc.java
-+++ b/swig/java/javadoc.java
-@@ -2235,7 +2235,7 @@ public class Dataset:public int ReadRast
- * <a href="../gdalconst/gdalconstConstants.html#GDT_Byte">gdalconstConstants.GDT_Byte</a>,
- * <a href="../gdalconst/gdalconstConstants.html#GDT_Int16">gdalconstConstants.GDT_Int16</a>, ...
- * The pixel values will automatically be translated to/from the Band
-- * data type as needed. The GDAL type must be consistant with the type of the Java array.
-+ * data type as needed. The GDAL type must be consistent with the type of the Java array.
- *
- * @param array The array into which the data will be written. This buffer must contain at least
- * buf_xsize * buf_ysize elements * nBandCount . It is organized
-@@ -2496,7 +2496,7 @@ public class Dataset:public int WriteRas
- * <a href="../gdalconst/gdalconstConstants.html#GDT_Byte">gdalconstConstants.GDT_Byte</a>,
- * <a href="../gdalconst/gdalconstConstants.html#GDT_Int16">gdalconstConstants.GDT_Int16</a>, ...
- * The pixel values will automatically be translated to/from the Band
-- * data type as needed. The GDAL type must be consistant with the type of the Java array.
-+ * data type as needed. The GDAL type must be consistent with the type of the Java array.
- *
- * @param array The array from which the data will be read. This buffer must contain at least
- * buf_xsize * buf_ysize elements * nBandCount . It is organized
-@@ -3639,7 +3639,7 @@ public class Band:public java.nio.ByteBu
- * <a href="../gdalconst/gdalconstConstants.html#GDT_Byte">gdalconstConstants.GDT_Byte</a>,
- * <a href="../gdalconst/gdalconstConstants.html#GDT_Int16">gdalconstConstants.GDT_Int16</a>, ...
- * The pixel values will automatically be translated to/from the Band
-- * data type as needed. The GDAL type must be consistant with the type of the Java array.
-+ * data type as needed. The GDAL type must be consistent with the type of the Java array.
- *
- * @param array The buffer into which the data should be read.
- * This buffer must contain at least buf_xsize *
-@@ -4045,7 +4045,7 @@ public class Band:public int WriteRaster
- * <a href="../gdalconst/gdalconstConstants.html#GDT_Byte">gdalconstConstants.GDT_Byte</a>,
- * <a href="../gdalconst/gdalconstConstants.html#GDT_Int16">gdalconstConstants.GDT_Int16</a>, ...
- * The pixel values will automatically be translated to/from the Band
-- * data type as needed. The GDAL type must be consistant with the type of the Java array.
-+ * data type as needed. The GDAL type must be consistent with the type of the Java array.
- *
- * @param array The buffer into which the data should be read.
- * This buffer must contain at least buf_xsize *
+--- a/alg/gdalwarper.h
++++ b/alg/gdalwarper.h
+@@ -45,7 +45,7 @@
+
+ CPL_C_START
+
+-/* Note: values are selected to be consistant with GDALRIOResampleAlg of gcore/gdal.h */
++/* Note: values are selected to be consistent with GDALRIOResampleAlg of gcore/gdal.h */
+ /*! Warp Resampling Algorithm */
+ typedef enum {
+ /*! Nearest neighbour (select on one input pixel) */ GRA_NearestNeighbour=0,
+--- a/gcore/gdal.h
++++ b/gcore/gdal.h
+@@ -103,7 +103,7 @@ typedef enum {
+ /*! Write data */ GF_Write = 1
+ } GDALRWFlag;
+
+-/* NOTE: values are selected to be consistant with GDALResampleAlg of alg/gdalwarper.h */
++/* NOTE: values are selected to be consistent with GDALResampleAlg of alg/gdalwarper.h */
+ /** RasterIO() resampling method.
+ * @since GDAL 2.0
+ */
+--- a/gcore/gdaljp2metadata.cpp
++++ b/gcore/gdaljp2metadata.cpp
+@@ -1139,7 +1139,7 @@ int GDALJP2Metadata::ParseGMLCoverageDes
+ {
+ CPLError(CE_Warning, CPLE_AppDefined,
+ "It is likely that the axis order of the GMLJP2 box is not "
+- "consistant with the EPSG order and that the resulting georeferencing "
++ "consistent with the EPSG order and that the resulting georeferencing "
+ "will be incorrect. Try setting GDAL_IGNORE_AXIS_ORIENTATION=TRUE if it is the case");
+ }
+ }
+--- a/ogr/ogrgeometryfactory.cpp
++++ b/ogr/ogrgeometryfactory.cpp
+@@ -3809,7 +3809,7 @@ static int OGRGF_DetectArc(const OGRLine
+
+ double dfStep10 = fabs(alpha1_2 - alpha0_2);
+ double dfStep21 = fabs(alpha2_2 - alpha1_2);
+- /* Check that the angle step is consistant with the original */
++ /* Check that the angle step is consistent with the original */
+ /* step. */
+ if( !(dfStep10 < 2 * dfMaxDeltaAlpha && dfStep21 < 2 * dfMaxDeltaAlpha) )
+ {
+@@ -3888,7 +3888,7 @@ static int OGRGF_DetectArc(const OGRLine
+ }
+
+ #ifdef VERBOSE_DEBUG_CURVEFROMLINESTRING
+- printf("j=%d, nAlphaRatioReversed = %u --> unconsistant values accross arc. Don't use it\n",
++ printf("j=%d, nAlphaRatioReversed = %u --> unconsistent values accross arc. Don't use it\n",
+ j, nAlphaRatioReversed);
+ #endif
+ bValidAlphaRatio = FALSE;
+--- a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
++++ b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
+@@ -776,7 +776,7 @@ char* FGdbLayer::CreateFieldDefn(OGRFiel
+ {
+ if( fldtypeCheck != fldtype )
+ {
+- CPLError(CE_Warning, CPLE_AppDefined, "Ignoring COLUMN_TYPES=%s=%s : %s not consistant with OGR data type",
++ CPLError(CE_Warning, CPLE_AppDefined, "Ignoring COLUMN_TYPES=%s=%s : %s not consistent with OGR data type",
+ fieldname.c_str(), pszFieldType, pszFieldType);
+ }
+ else
+--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
++++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
+@@ -591,7 +591,7 @@ int FileGDBTable::ReadTableXHeader()
+ returnErrorIf(VSIFReadL( pabyTablXBlockMap, nSizeInBytes, 1, fpTableX ) != 1 );
+ /* returnErrorIf(nMagic2 == 0 ); */
+
+- // Check that the map is consistant with n1024Blocks
++ // Check that the map is consistent with n1024Blocks
+ GUInt32 nCountBlocks = 0;
+ for(GUInt32 i=0;i<nBitsForBlockMap;i++)
+ nCountBlocks += TEST_BIT(pabyTablXBlockMap, i) != 0;
+--- a/port/cpl_virtualmem.h
++++ b/port/cpl_virtualmem.h
+@@ -198,7 +198,7 @@ int CPL_DLL CPLIsVirtualMemFileMapAvaila
+ * @param nOffset Offset in the file to start the mapping from.
+ * @param nLength Length of the portion of the file to map into memory.
+ * @param eAccessMode Permission to use for the virtual memory mapping. This must
+- * be consistant with how the file has been opened.
++ * be consistent with how the file has been opened.
+ * @param pfnFreeUserData callback that is called when the object is destroyed.
+ * @param pCbkUserData user data passed to pfnFreeUserData.
+ * @return a virtual memory object that must be freed by CPLVirtualMemFree(),
+--- a/swig/python/samples/validate_jp2.py
++++ b/swig/python/samples/validate_jp2.py
+@@ -450,7 +450,7 @@ def validate(filename, oidoc, inspire_tg
+ if h != '1':
+ error_report.EmitError('GeoJP2', 'GeoTIFF should have height of 1 pixel, not %s' % str(h))
+
+- # Check that information of GeoJP2 and GMLJP2 are consistant
++ # Check that information of GeoJP2 and GMLJP2 are consistent
+ if geotiff_found and gmljp2_found:
+ check_geojp2_gmljp2_consistency(filename, error_report)
+
--- a/swig/python/osgeo/gdal_array.py
+++ b/swig/python/osgeo/gdal_array.py
-@@ -252,9 +252,9 @@ def BandReadAsArray( band, xoff = 0, yof
+@@ -274,9 +274,9 @@ def DatasetReadAsArray( ds, xoff=0, yoff
+ 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:
+- raise ValueError('Specified buf_xsize not consistant with array shape')
++ raise ValueError('Specified buf_xsize not consistent with array shape')
+ if buf_ysize is not None and buf_ysize != shape_buf_ysize:
+- raise ValueError('Specified buf_ysize not consistant with array shape')
++ raise ValueError('Specified buf_ysize not consistent with array shape')
+ if buf_obj.shape[0] != ds.RasterCount:
+ raise ValueError('Array should have space for %d bands' % ds.RasterCount)
+
+@@ -284,7 +284,7 @@ def DatasetReadAsArray( ds, xoff=0, yoff
+ if not datatype:
+ raise ValueError("array does not have corresponding GDAL data type")
+ if buf_type is not None and buf_type != datatype:
+- raise ValueError("Specified buf_type not consistant with array type")
++ raise ValueError("Specified buf_type not consistent with array type")
+ buf_type = datatype
+
+ if DatasetIONumPy( ds, 0, xoff, yoff, win_xsize, win_ysize,
+@@ -332,15 +332,15 @@ 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:
@@ -322,58 +153,55 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
if buf_ysize is not None and buf_ysize != shape_buf_ysize:
- raise ValueError('Specified buf_ysize not consistant with array shape')
+ raise ValueError('Specified buf_ysize not consistent with array shape')
- buf_xsize = shape_buf_xsize
- buf_ysize = shape_buf_ysize
-
---- a/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp
-+++ b/ogr/ogrsf_frmts/gml/gmlfeatureclass.cpp
-@@ -55,7 +55,7 @@ GMLFeatureClass::GMLFeatureClass( const
- m_nFeatureCount = -1; // unknown
-
- m_pszSRSName = NULL;
-- m_bSRSNameConsistant = TRUE;
-+ m_bSRSNameConsistent = TRUE;
- }
-
- /************************************************************************/
-@@ -355,7 +355,7 @@ int GMLFeatureClass::GetExtents( double
- void GMLFeatureClass::SetSRSName( const char* pszSRSName )
- {
-- m_bSRSNameConsistant = TRUE;
-+ m_bSRSNameConsistent = TRUE;
- CPLFree(m_pszSRSName);
- m_pszSRSName = (pszSRSName) ? CPLStrdup(pszSRSName) : NULL;
- }
-@@ -367,7 +367,7 @@ void GMLFeatureClass::SetSRSName( const
- void GMLFeatureClass::MergeSRSName( const char* pszSRSName )
+ datatype = NumericTypeCodeToGDALTypeCode( buf_obj.dtype.type )
+ if not datatype:
+ raise ValueError("array does not have corresponding GDAL data type")
+ if buf_type is not None and buf_type != datatype:
+- raise ValueError("Specified buf_type not consistant with array type")
++ raise ValueError("Specified buf_type not consistent with array type")
+ buf_type = datatype
- {
-- if(!m_bSRSNameConsistant)
-+ if(!m_bSRSNameConsistent)
- return;
-
- if( m_pszSRSName == NULL )
-@@ -377,9 +377,9 @@ void GMLFeatureClass::MergeSRSName( cons
- }
- else
- {
-- m_bSRSNameConsistant = pszSRSName != NULL &&
-+ m_bSRSNameConsistent = pszSRSName != NULL &&
- strcmp(m_pszSRSName, pszSRSName) == 0;
-- if (!m_bSRSNameConsistant)
-+ if (!m_bSRSNameConsistent)
- {
- CPLFree(m_pszSRSName);
- m_pszSRSName = NULL;
---- a/ogr/ogrsf_frmts/gml/gmlreader.h
-+++ b/ogr/ogrsf_frmts/gml/gmlreader.h
-@@ -151,7 +151,7 @@ class CPL_DLL GMLFeatureClass
- double m_dfYMax;
-
- char *m_pszSRSName;
-- int m_bSRSNameConsistant;
-+ int m_bSRSNameConsistent;
-
- public:
- GMLFeatureClass( const char *pszName = "" );
+ if BandRasterIONumPy( band, 0, xoff, yoff, win_xsize, win_ysize,
+--- a/swig/include/gdal_array.i
++++ b/swig/include/gdal_array.i
+@@ -1076,9 +1076,9 @@ def DatasetReadAsArray( ds, xoff=0, yoff
+ 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:
+- raise ValueError('Specified buf_xsize not consistant with array shape')
++ raise ValueError('Specified buf_xsize not consistent with array shape')
+ if buf_ysize is not None and buf_ysize != shape_buf_ysize:
+- raise ValueError('Specified buf_ysize not consistant with array shape')
++ raise ValueError('Specified buf_ysize not consistent with array shape')
+ if buf_obj.shape[0] != ds.RasterCount:
+ raise ValueError('Array should have space for %d bands' % ds.RasterCount)
+
+@@ -1086,7 +1086,7 @@ def DatasetReadAsArray( ds, xoff=0, yoff
+ if not datatype:
+ raise ValueError("array does not have corresponding GDAL data type")
+ if buf_type is not None and buf_type != datatype:
+- raise ValueError("Specified buf_type not consistant with array type")
++ raise ValueError("Specified buf_type not consistent with array type")
+ buf_type = datatype
+
+ if DatasetIONumPy( ds, 0, xoff, yoff, win_xsize, win_ysize,
+@@ -1134,15 +1134,15 @@ 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:
+- raise ValueError('Specified buf_xsize not consistant with array shape')
++ raise ValueError('Specified buf_xsize not consistent with array shape')
+ if buf_ysize is not None and buf_ysize != shape_buf_ysize:
+- raise ValueError('Specified buf_ysize not consistant with array shape')
++ raise ValueError('Specified buf_ysize not consistent with array shape')
+
+ datatype = NumericTypeCodeToGDALTypeCode( buf_obj.dtype.type )
+ if not datatype:
+ raise ValueError("array does not have corresponding GDAL data type")
+ if buf_type is not None and buf_type != datatype:
+- raise ValueError("Specified buf_type not consistant with array type")
++ raise ValueError("Specified buf_type not consistent with array type")
+ buf_type = datatype
+
+ if BandRasterIONumPy( band, 0, xoff, yoff, win_xsize, win_ysize,
diff --git a/debian/patches/developement-typo b/debian/patches/developement-typo
deleted file mode 100644
index af06df9..0000000
--- a/debian/patches/developement-typo
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'developement' typo, replace with 'development'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
-
---- a/NEWS
-+++ b/NEWS
-@@ -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)
-- * Add frmts/vrt to CONFIG_CFLAGS for developement version of gdal-config (needed for postgis 2.0 compilation)
-+ * Add frmts/vrt to CONFIG_CFLAGS for development version of gdal-config (needed for postgis 2.0 compilation)
- * 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
diff --git a/debian/patches/doc b/debian/patches/doc
index 4a8c79a..88b47b3 100644
--- a/debian/patches/doc
+++ b/debian/patches/doc
@@ -1,26 +1,6 @@
Description: Fix links to OGR documentation.
Author: Francesco Paolo Lovergine <frankie at debian.org>, Bas Couwenberg <sebastic at xs4all.nl>
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.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)
- provides a similar capability for simple features vector data.
-
- Master: http://www.gdal.org<br>
-@@ -51,7 +51,7 @@ Download:
- <li> <a href="gdal_tutorial.html">GDAL API Tutorial</a>
- <li> <a href="gdal_drivertut.html">GDAL Driver Implementation Tutorial</a>
- <li> <a href="warptut.html">GDAL Warp API Tutorial</a>
--<li> <a href="ogr/osr_tutorial.html">OGRSpatialReference Tutorial</a>
-+<li> <a href="../ogr/osr_tutorial.html">OGRSpatialReference Tutorial</a>
- <li> <a href="gdal_8h.html">GDAL C API</a>
- <li> <a href="gdal__alg_8h.html">GDAL Algorithms C API</a>
- <li> <a href="classGDALDataset.html">GDALDataset C++ API</a>
--- a/ogr/index.dox
+++ b/ogr/index.dox
@@ -6,7 +6,7 @@ tools) providing read (and sometimes wri
diff --git a/debian/patches/explicitely-typo b/debian/patches/explicitely-typo
index a4a4cdd..9e9ef1a 100644
--- a/debian/patches/explicitely-typo
+++ b/debian/patches/explicitely-typo
@@ -1,86 +1,27 @@
Description: Fix 'explicitely' typo, replace with 'explicitly'.
Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
--- a/NEWS
+++ b/NEWS
-@@ -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/
-- * Support specifying connection string as 'filename.gml,xsd=some_filename.xsd' to explicitely provide a XSD
-+ * Support specifying connection string as 'filename.gml,xsd=some_filename.xsd' to explicitly provide a XSD
- * 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)
-@@ -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)
-- * OGR SQL: OGRGenSQLResultsLayer: if the dialect is explicitely set to OGRSQL, don't propagate the WHERE clause of the SELECT to the source layer, but evaluate it instead at the OGRGenSQLResultsLayer level (#4022)
-+ * OGR SQL: OGRGenSQLResultsLayer: if the dialect is explicitly set to OGRSQL, don't propagate the WHERE clause of the SELECT to the source layer, but evaluate it instead at the OGRGenSQLResultsLayer level (#4022)
- * OGR SQL: Avoid error emission on requests such as 'SELECT MIN(EAS_ID), COUNT(*) FROM POLY'
- * OGR SQL: Avoid setting width/precision for AVG column
- * OGR SQL: Add a mechanism to delete a layer (DROP TABLE x)
---- a/apps/gdal_rasterize.cpp
-+++ b/apps/gdal_rasterize.cpp
-@@ -341,7 +341,7 @@ GDALDatasetH CreateOutputDataset(std::ve
- }
-
- /* When rasterizing point layers and that the bounds have */
-- /* not been explicitely set, voluntary increase the extent by */
-+ /* not been explicitly set, voluntary increase the extent by */
- /* a half-pixel size to avoid missing points on the border */
- if (wkbFlatten(OGR_L_GetGeomType(hLayer)) == wkbPoint &&
- !bTargetAlignedPixels && dfXRes != 0 && dfYRes != 0)
-@@ -479,7 +479,7 @@ int main( int argc, char ** argv )
- double dfXRes = 0, dfYRes = 0;
- int bCreateOutput = FALSE;
- const char* pszFormat = "GTiff";
-- int bFormatExplicitelySet = FALSE;
-+ int bFormatExplicitlySet = FALSE;
- char **papszCreateOptions = NULL;
- GDALDriverH hDriver = NULL;
- GDALDataType eOutputType = GDT_Float64;
-@@ -607,7 +607,7 @@ int main( int argc, char ** argv )
- else if( EQUAL(argv[i],"-of") && i < argc-1 )
- {
- pszFormat = argv[++i];
-- bFormatExplicitelySet = TRUE;
-+ bFormatExplicitlySet = TRUE;
- bCreateOutput = TRUE;
- }
- else if( EQUAL(argv[i],"-init") && i < argc - 1 )
-@@ -859,7 +859,7 @@ int main( int argc, char ** argv )
- exit( 1 );
- }
-
-- if (!bQuiet && !bFormatExplicitelySet)
-+ if (!bQuiet && !bFormatExplicitlySet)
- CheckExtensionConsistency(pszDstFilename, pszFormat);
- }
- else
---- a/frmts/ctg/ctgdataset.cpp
-+++ b/frmts/ctg/ctgdataset.cpp
-@@ -360,7 +360,7 @@ int CTGDataset::Identify( GDALOpenInfo *
-
- GDALOpenInfo* poOpenInfoToDelete = NULL;
- /* GZipped grid_cell.gz files are common, so automagically open them */
-- /* if the /vsigzip/ has not been explicitely passed */
-+ /* if the /vsigzip/ has not been explicitly passed */
- const char* pszFilename = CPLGetFilename(poOpenInfo->pszFilename);
- if ((EQUAL(pszFilename, "grid_cell.gz") ||
- EQUAL(pszFilename, "grid_cell1.gz") ||
-@@ -431,7 +431,7 @@ GDALDataset *CTGDataset::Open( GDALOpenI
- CPLString osFilename(poOpenInfo->pszFilename);
-
- /* GZipped grid_cell.gz files are common, so automagically open them */
-- /* if the /vsigzip/ has not been explicitely passed */
-+ /* if the /vsigzip/ has not been explicitly passed */
- const char* pszFilename = CPLGetFilename(poOpenInfo->pszFilename);
- if ((EQUAL(pszFilename, "grid_cell.gz") ||
- EQUAL(pszFilename, "grid_cell1.gz") ||
+@@ -57,7 +57,7 @@ Build(Unix):
+ * Make sure $(GDAL_INCLUDE) is first to avoid being confused by GDAL headers of a previous version elsewhere in the include path (#5664)
+ * Always use stat rather than stat64 for Mac OSX in AC_UNIX_STDIO_64. (#5780, #5414).
+ * Add support for ECW SDK 5.1 (#5390)
+- * Do not enable Python bindings if PYTHON env variable is set without --with-python being explicitely specified (#5956)
++ * Do not enable Python bindings if PYTHON env variable is set without --with-python being explicitly specified (#5956)
+
+ Build(Windows):
+ * PDF: fix compilation issue with Visual Studio 2012 (#5744)
+@@ -1356,7 +1356,7 @@ Core:
+ * OGR SQL: more stricter checks
+ * OGR SQL: make parsing error report a usefull hint where the syntax error occured
+ * OGR SQL: fix thread-safety of swq_op_registrar::GetOperator() (#5196)
+- * OGR SQL: support not explicitely specifying AS keyword for aliasing a column spec
++ * OGR SQL: support not explicitly specifying AS keyword for aliasing a column spec
+ * OGR SQL: don't call CONCAT(a_column ...) or SUBSTR(a_column ...) as a_column
+ * OGR SQL: validate that arguments of MAX, MIN, AVG, SUM, COUNT are columns and not any expression since this is not supported
+ * OGR SQL: make AVG field definition a OFTReal
--- a/frmts/ecw/ecwasyncreader.cpp
+++ b/frmts/ecw/ecwasyncreader.cpp
@@ -281,7 +281,7 @@ NCSEcwReadStatus ECWAsyncReader::Refresh
@@ -92,183 +33,10 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
/* by CPL. This will free the ressources taken by the above CPLDebug */
if( poReader->bComplete )
CPLCleanupTLS();
---- a/frmts/hf2/hf2dataset.cpp
-+++ b/frmts/hf2/hf2dataset.cpp
-@@ -330,7 +330,7 @@ int HF2Dataset::Identify( GDALOpenInfo *
-
- GDALOpenInfo* poOpenInfoToDelete = NULL;
- /* GZipped .hf2 files are common, so automagically open them */
-- /* if the /vsigzip/ has not been explicitely passed */
-+ /* if the /vsigzip/ has not been explicitly passed */
- CPLString osFilename(poOpenInfo->pszFilename);
- if ((EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "hfz") ||
- (strlen(poOpenInfo->pszFilename) > 6 &&
-@@ -374,7 +374,7 @@ GDALDataset *HF2Dataset::Open( GDALOpenI
-
- GDALOpenInfo* poOpenInfoToDelete = NULL;
- /* GZipped .hf2 files are common, so automagically open them */
-- /* if the /vsigzip/ has not been explicitely passed */
-+ /* if the /vsigzip/ has not been explicitly passed */
- CPLString osFilename(poOpenInfo->pszFilename);
- if ((EQUAL(CPLGetExtension(poOpenInfo->pszFilename), "hfz") ||
- (strlen(poOpenInfo->pszFilename) > 6 &&
---- a/frmts/jpeg/frmt_jpeg.html
-+++ b/frmts/jpeg/frmt_jpeg.html
-@@ -40,7 +40,7 @@ compressed tiles.<p>
-
- To be able to read and write JPEG images with 12-bit sample, you can build GDAL
- with its internal libjpeg (based on IJG libjpeg-6b, with additional changes for 12-bit
--sample support), or explicitely pass --with-jpeg12=yes to configure script when building
-+sample support), or explicitly pass --with-jpeg12=yes to configure script when building
- with external libjpeg. See <a href="http://trac.osgeo.org/gdal/wiki/TIFF12BitJPEG">
- "8 and 12 bit JPEG in TIFF"</a> wiki page for more details.<p>
-
---- a/frmts/nitf/nitfdataset.cpp
-+++ b/frmts/nitf/nitfdataset.cpp
-@@ -606,7 +606,7 @@ GDALDataset *NITFDataset::OpenInternal(
- }
- else
- {
-- /* We explicitely list the allowed drivers to avoid hostile content */
-+ /* We explicitly list the allowed drivers to avoid hostile content */
- /* 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",
-@@ -4225,7 +4225,7 @@ NITFDataset::NITFCreateCopy(
-
- if (CSLPartialFindString(papszFullOptions, "TRE=GEOLOB=") != - 1)
- {
-- CPLDebug("NITF", "GEOLOB TRE was explicitely defined before. "
-+ CPLDebug("NITF", "GEOLOB TRE was explicitly defined before. "
- "Overriding it with current georefencing info.");
- }
-
-@@ -4252,7 +4252,7 @@ NITFDataset::NITFCreateCopy(
- papszFullOptions = CSLAddString( papszFullOptions, osGEOLOB ) ;
-
- /* -------------------------------------------------------------------- */
--/* Write GEOPSB TRE if not already explicitely provided */
-+/* Write GEOPSB TRE if not already explicitly provided */
- /* -------------------------------------------------------------------- */
- if (CSLPartialFindString(papszFullOptions, "FILE_TRE=GEOPSB=") == -1 &&
- CSLPartialFindString(papszFullOptions, "TRE=GEOPSB=") == -1)
-@@ -4284,7 +4284,7 @@ NITFDataset::NITFCreateCopy(
- }
- else
- {
-- CPLDebug("NITF", "GEOPSB TRE was explicitely defined before. Keeping it.");
-+ CPLDebug("NITF", "GEOPSB TRE was explicitly defined before. Keeping it.");
- }
-
- }
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -2510,7 +2510,7 @@ void PDFDataset::TurnLayersOnOff()
- oIter->second->setState(OptionalContentGroup::On);
- }
-
-- // Turn child layers on, unless there's one of them explicitely listed
-+ // Turn child layers on, unless there's one of them explicitly listed
- // in the list.
- size_t nLen = strlen(papszLayers[i]);
- int bFoundChildLayer = FALSE;
-@@ -4972,7 +4972,7 @@ CPLErr PDFDataset::SetGeoTransform(doubl
- bGeoTransformValid = TRUE;
- bProjDirty = TRUE;
-
-- /* Reset NEATLINE if not explicitely set by the user */
-+ /* Reset NEATLINE if not explicitly set by the user */
- if (!bNeatLineDirty)
- SetMetadataItem("NEATLINE", NULL);
- return CE_None;
-@@ -5155,7 +5155,7 @@ CPLErr PDFDataset::SetGCPs( int nGCPCoun
-
- bProjDirty = TRUE;
-
-- /* Reset NEATLINE if not explicitely set by the user */
-+ /* Reset NEATLINE if not explicitly set by the user */
- if (!bNeatLineDirty)
- SetMetadataItem("NEATLINE", NULL);
-
---- a/frmts/xyz/xyzdataset.cpp
-+++ b/frmts/xyz/xyzdataset.cpp
-@@ -480,7 +480,7 @@ int XYZDataset::IdentifyEx( GDALOpenInfo
-
- GDALOpenInfo* poOpenInfoToDelete = NULL;
- /* GZipped .xyz files are common, so automagically open them */
-- /* if the /vsigzip/ has not been explicitely passed */
-+ /* if the /vsigzip/ has not been explicitly passed */
- if (strlen(poOpenInfo->pszFilename) > 6 &&
- EQUAL(poOpenInfo->pszFilename + strlen(poOpenInfo->pszFilename) - 6, "xyz.gz") &&
- !EQUALN(poOpenInfo->pszFilename, "/vsigzip/", 9))
-@@ -612,7 +612,7 @@ GDALDataset *XYZDataset::Open( GDALOpenI
- CPLString osFilename(poOpenInfo->pszFilename);
-
- /* GZipped .xyz files are common, so automagically open them */
-- /* if the /vsigzip/ has not been explicitely passed */
-+ /* if the /vsigzip/ has not been explicitly passed */
- if (strlen(poOpenInfo->pszFilename) > 6 &&
- EQUAL(poOpenInfo->pszFilename + strlen(poOpenInfo->pszFilename) - 6, "xyz.gz") &&
- !EQUALN(poOpenInfo->pszFilename, "/vsigzip/", 9))
--- a/gcore/gdaldataset.cpp
+++ b/gcore/gdaldataset.cpp
-@@ -2381,7 +2381,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
-- * does explicitely use mutexes in its code.
-+ * does explicitly use mutexes in its code.
- *
- * For drivers supporting the VSI virtual file API, it is possible to open
- * 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
-@@ -152,7 +152,7 @@ OGRGenSQLResultsLayer::OGRGenSQLResultsL
- poSrcLayer = papoTableLayers[0];
-
- /* -------------------------------------------------------------------- */
--/* If the user has explicitely requested a OGRSQL dialect, then */
-+/* If the user has explicitly requested a OGRSQL dialect, then */
- /* we should avoid to forward the where clause to the source layer */
- /* when there is a risk it cannot understand it (#4022) */
- /* -------------------------------------------------------------------- */
---- a/ogr/ogrsf_frmts/gml/drv_gml.html
-+++ b/ogr/ogrsf_frmts/gml/drv_gml.html
-@@ -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
--initialized to MONOBLOCK_LAYERS if not explicitely set by the user.<p>
-+initialized to MONOBLOCK_LAYERS if not explicitly set by the user.<p>
-
- Starting with OGR 1.9.0, the GML_READ_MODE configuration option can be set to INTERLEAVED_LAYERS to be able
- to read a GML file whose features from different layers are interleaved. In the case, the semantics of the
---- a/ogr/ogrsf_frmts/gpx/drv_gpx.html
-+++ b/ogr/ogrsf_frmts/gpx/drv_gpx.html
-@@ -275,7 +275,7 @@ ogr2ogr -f GPX output.gpx input.shp -sql
- <li>How to solve "ERROR 6: Cannot create GPX layer XXXXXX with unknown geometry type" ?<p>
- This error happens when the layer to create does not expose a precise geometry type, but just a generic
- wkbUnknown type. This is for example the case when using ogr2ogr with a SQL request to a PostgreSQL datasource.
--You must then explicitely specify -nlt POINT (or LINESTRING or MULTILINESTRING).
-+You must then explicitly specify -nlt POINT (or LINESTRING or MULTILINESTRING).
- </li>
-
-
---- a/ogr/ogrsf_frmts/mdb/drv_mdb.html
-+++ b/ogr/ogrsf_frmts/mdb/drv_mdb.html
-@@ -47,7 +47,7 @@
- <li>If you didn't specify --with-jvm-lib-add-rpath at configure time, set the path of the directory that contains libjvm.so in LD_LIBRARY_PATH or in /etc/ld.so.conf.</li>
- <li>Download jackcess-1.2.2.jar, commons-lang-2.4.jar and commons-logging-1.1.1.jar (other versions might work)</li>
- <li>Put the 3 JARs either in the lib/ext directory of the JRE (e.g. /usr/lib/jvm/java-6-openjdk/jre/lib/ext) or in another directory
-- and explicitely point them with the CLASSPATH environment variable.</li>
-+ and explicitly point them with the CLASSPATH environment variable.</li>
- </ol>
-
- <h2>Resources</h2>
---- a/ogr/ogrsf_frmts/ogrsf_frmts.dox
-+++ b/ogr/ogrsf_frmts/ogrsf_frmts.dox
-@@ -911,7 +911,7 @@ success.
- @param poSpatialFilter geometry which represents a spatial filter. Can be NULL.
+@@ -3535,7 +3535,7 @@ OGRLayerH GDALDatasetCopyLayer( GDALData
+ @param hSpatialFilter geometry which represents a spatial filter. Can be NULL.
@param pszDialect allows control of the statement dialect. If set to NULL, the
OGR SQL engine will be used, except for RDBMS drivers that will use their dedicated SQL engine,
-unless OGRSQL is explicitely passed as the dialect. Starting with OGR 1.10, the SQLITE dialect
@@ -276,183 +44,55 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
can also be used.
@return an OGRLayer containing the results of the query. Deallocate with
-@@ -949,7 +949,7 @@ can also be used.
- @param hSpatialFilter handle to a geometry which represents a spatial filter. Can be NULL.
+@@ -4893,7 +4893,7 @@ OGRErr GDALDataset::ProcessSQLAlterTable
+ @param poSpatialFilter geometry which represents a spatial filter. Can be NULL.
@param pszDialect allows control of the statement dialect. If set to NULL, the
OGR SQL engine will be used, except for RDBMS drivers that will use their dedicated SQL engine,
-unless OGRSQL is explicitely passed as the dialect. Starting with OGR 1.10, the SQLITE dialect
+unless OGRSQL is explicitly passed as the dialect. Starting with OGR 1.10, the SQLITE dialect
can also be used.
- @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
-@@ -4111,7 +4111,7 @@ OGRLayer * OGROSMDataSource::ExecuteSQL(
- poSpatialFilter,
- pszDialect );
-
-- /* If the user explicitely run a COUNT() request, then do it ! */
-+ /* If the user explicitly run a COUNT() request, then do it ! */
- if( poResultSetLayer )
- {
- if( pszDialect != NULL && EQUAL(pszDialect, "SQLITE") )
---- a/ogr/ogrsf_frmts/pg/drv_pg_advanced.html
-+++ b/ogr/ogrsf_frmts/pg/drv_pg_advanced.html
-@@ -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
--you cannot insert 2 features with same FID. So in that case you must explicitely reset the FID before calling CreateFeature(),
-+you cannot insert 2 features with same FID. So in that case you must explicitly reset the FID before calling CreateFeature(),
- or use a fresh feature object.<p>
+ @return an OGRLayer containing the results of the query. Deallocate with
+@@ -5559,7 +5559,7 @@ int GDALDataset::TestCapability( CPL_UNU
+
+ By default, when bForce is set to FALSE, only "efficient" transactions will be
+ attempted. Some drivers may offer an emulation of transactions, but sometimes
+- with significant overhead, in which case the user must explicitely allow for such
++ with significant overhead, in which case the user must explicitly allow for such
+ an emulation by setting bForce to TRUE. Drivers that offer emulated transactions
+ should advertize the ODsCEmulatedTransactions capability (and not ODsCTransactions).
+
+@@ -5609,7 +5609,7 @@ OGRErr GDALDataset::StartTransaction(CPL
+
+ By default, when bForce is set to FALSE, only "efficient" transactions will be
+ attempted. Some drivers may offer an emulation of transactions, but sometimes
+- with significant overhead, in which case the user must explicitely allow for such
++ with significant overhead, in which case the user must explicitly allow for such
+ an emulation by setting bForce to TRUE. Drivers that offer emulated transactions
+ should advertize the ODsCEmulatedTransactions capability (and not ODsCTransactions).
- Snippet example in Python :
--- a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
+++ b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
-@@ -607,7 +607,7 @@ class OGRSQLiteDataSource : public OGRDa
+@@ -675,7 +675,7 @@ class OGRSQLiteBaseDataSource : public G
#endif
VSILFILE* fpMainFile; /* Set by the VFS layer when it opens the DB */
- /* Must *NOT* be closed by the datasource explicitely. */
+ /* Must *NOT* be closed by the datasource explicitly. */
- GIntBig nFileTimestamp;
- int bLastSQLCommandIsUpdateLayerStatistics;
-
---- a/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
-+++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitevirtualogr.cpp
-@@ -545,7 +545,7 @@ int OGR2SQLITE_ConnectCreate(sqlite3* hD
- if( poDS->GetLayerCount() > 1 )
- {
-- *pzErr = sqlite3_mprintf( "Datasource '%s' has more than one layers, and none was explicitely selected.",
-+ *pzErr = sqlite3_mprintf( "Datasource '%s' has more than one layers, and none was explicitly selected.",
- osDSName.c_str() );
- poDS->Release();
- return SQLITE_ERROR;
+ int OpenOrCreateDB(int flags, int bRegisterOGR2SQLiteExtensions);
+ int SetSynchronous();
--- a/ogr/ogrsf_frmts/vrt/drv_vrt.html
+++ b/ogr/ogrsf_frmts/vrt/drv_vrt.html
-@@ -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
--filter will be combined with any spatial filter explicitely set on the VRT
-+filter will be combined with any spatial filter explicitly set on the VRT
- layer with the SetSpatialFilter() method. The value of the element must be
- a valid WKT string defining a polygon. An optional <b>clip</b> attribute
- can be set to "TRUE" to clip the geometries to the source region, otherwise
---- a/swig/include/cpl.i
-+++ b/swig/include/cpl.i
-@@ -363,7 +363,7 @@ int VSIUnlink(const char * utf8_path );
-
- /* Added in GDAL 1.7.0 */
- /* Thread support is necessary for binding languages with threaded GC */
--/* even if the user doesn't explicitely use threads */
-+/* even if the user doesn't explicitly use threads */
- %inline {
- int wrapper_HasThreadSupport()
- {
---- a/swig/include/python/docs/ogr_datasource_docs.i
-+++ b/swig/include/python/docs/ogr_datasource_docs.i
-@@ -171,7 +171,7 @@ filter. Can be NULL.
-
- pszDialect: allows control of the statement dialect. If set to NULL,
- the OGR SQL engine will be used, except for RDBMS drivers that will
--use their dedicated SQL engine, unless OGRSQL is explicitely passed as
-+use their dedicated SQL engine, unless OGRSQL is explicitly passed as
- the dialect.
-
- an handle to a OGRLayer containing the results of the query.
---- a/swig/include/python/typemaps_python.i
-+++ b/swig/include/python/typemaps_python.i
-@@ -685,7 +685,7 @@ CreateTupleFromDoubleArray( int *first,
- %typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) (char **dict)
- {
- /* %typecheck(SWIG_TYPECHECK_POINTER) (char **dict) */
-- /* Note: we exclude explicitely strings, because they can be considered as a sequence of characters, */
-+ /* Note: we exclude explicitly strings, because they can be considered as a sequence of characters, */
- /* which is not desirable since it makes it impossible to define bindings such as SetMetadata(string) and SetMetadata(array_of_string) */
- /* (see #4816) */
- $1 = ((PyMapping_Check($input) || PySequence_Check($input) ) && !SWIG_CheckState(SWIG_AsCharPtrAndSize($input, 0, NULL, 0)) ) ? 1 : 0;
---- a/swig/java/javadoc.java
-+++ b/swig/java/javadoc.java
-@@ -1336,7 +1336,7 @@ public class gdal:public static Driver G
- * The first successful open will result in a returned dataset. If all
- * drivers fail then null is returned.
- * <p>
-- * It is required that you explicitely close a dataset opened in update
-+ * It is required that you explicitly close a dataset opened in update
- * mode with the Dataset.delete() method. Otherwise the data might not be
- * flushed to the disk. Don't rely only on Java garbage collection.
- *
-@@ -6738,7 +6738,7 @@ public class Layer:public int DeleteFeat
- Sequential reads are generally considered interrupted by a GetFeature() call.
- <p>
- The returned feature will be properly handled by the Java garbage collector,
-- but you can help it by explicitely calling the
-+ but you can help it by explicitly calling the
- Feature.<a href="Feature.html#delete()">delete()</a> method.
-
- @param fid the feature id of the feature to read.
-@@ -6870,7 +6870,7 @@ public class Layer:public int GetGeomTyp
- ResetReading() method can be used to start at the beginning again.
- <p>
- The returned feature will be properly handled by the Java garbage collector,
-- but you can help it by explicitely calling the
-+ but you can help it by explicitly calling the
- Feature.<a href="Feature.html#delete()">delete()</a> method.
-
- @return a feature, or null if no more features are available.
-@@ -7595,7 +7595,7 @@ public class Feature:public Feature Clon
- * <p>
- * Calling this method is not required as normal garbage collection will
- * reclaim associated resources when the object goes out of scope.
-- * Otherwise calling delete() explicitely will help release resources sooner.
-+ * Otherwise calling delete() explicitly will help release resources sooner.
- * Don't call any method on a deleted object !
- */
- public class Feature:public void delete()
-@@ -8475,7 +8475,7 @@ public class Geometry:public boolean Cro
- * <p>
- * Calling this method is not required as normal garbage collection will
- * reclaim associated resources when the object goes out of scope.
-- * Otherwise calling delete() explicitely will help release resources sooner.
-+ * Otherwise calling delete() explicitly will help release resources sooner.
- * Don't call any method on a deleted object !
- */
- public class Geometry:public void delete()
---- a/swig/python/extensions/gdal_wrap.cpp
-+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -8002,7 +8002,7 @@ SWIGINTERN PyObject *_wrap_MajorObject_S
- if (_v) {
- {
- /* %typecheck(SWIG_TYPECHECK_POINTER) (char **dict) */
-- /* Note: we exclude explicitely strings, because they can be considered as a sequence of characters, */
-+ /* Note: we exclude explicitly strings, because they can be considered as a sequence of characters, */
- /* which is not desirable since it makes it impossible to define bindings such as SetMetadata(string) and SetMetadata(array_of_string) */
- /* (see #4816) */
- _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
-@@ -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"
-- "use their dedicated SQL engine, unless OGRSQL is explicitely passed as\n"
-+ "use their dedicated SQL engine, unless OGRSQL is explicitly passed as\n"
- "the dialect.\n"
- "\n"
- "an handle to a OGRLayer containing the results of the query.\n"
---- a/swig/python/osgeo/ogr.py
-+++ b/swig/python/osgeo/ogr.py
-@@ -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
-- use their dedicated SQL engine, unless OGRSQL is explicitely passed as
-+ use their dedicated SQL engine, unless OGRSQL is explicitly passed as
- the dialect.
-
- an handle to a OGRLayer containing the results of the query.
+@@ -160,7 +160,7 @@ whether the geometry field is nullable.
+ </p>
+ <p>
+ When several geometry fields are used, the following child elements of <b>GeometryField</b>
+-can be defined to explicitely set the geometry type, SRS, source region, or extent.
++can be defined to explicitly set the geometry type, SRS, source region, or extent.
+ <ul>
+ <li><b>GeometryType</b> (optional) : same syntax as OGRVRTLayer-level <b>GeometryType</b>.</li>
+ <li><b>SRS</b> (optional) : same syntax as OGRVRTLayer-level <b>LayerSRS</b> (note SRS vs LayerSRS)</li>
--- a/apps/gdal_grid.cpp
+++ b/apps/gdal_grid.cpp
@@ -610,7 +610,7 @@ int main( int argc, char ** argv )
@@ -464,7 +104,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
char **papszLayers = NULL;
const char *pszBurnAttribute = NULL;
double dfIncreaseBurnValue = 0.0;
-@@ -663,7 +663,7 @@ int main( int argc, char ** argv )
+@@ -665,7 +665,7 @@ int main( int argc, char ** argv )
{
CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
pszFormat = argv[++i];
@@ -473,7 +113,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
}
else if( EQUAL(argv[i],"-q") || EQUAL(argv[i],"-quiet") )
-@@ -1009,7 +1009,7 @@ int main( int argc, char ** argv )
+@@ -1021,7 +1021,7 @@ int main( int argc, char ** argv )
if ( nYSize == 0 )
nYSize = 256;
@@ -482,188 +122,323 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
CheckExtensionConsistency(pszDest, pszFormat);
hDstDS = GDALCreate( hDriver, pszDest, nXSize, nYSize, nBands,
---- a/apps/gdal_translate.cpp
-+++ b/apps/gdal_translate.cpp
-@@ -278,7 +278,7 @@ static int ProxyMain( int argc, char **
- int i;
- int nRasterXSize, nRasterYSize;
- const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
-- int bFormatExplicitelySet = FALSE;
-+ int bFormatExplicitlySet = FALSE;
- GDALDriverH hDriver;
- int *panBandList = NULL; /* negative value of panBandList[i] means mask band of ABS(panBandList[i]) */
- int nBandCount = 0, bDefBands = TRUE;
-@@ -363,7 +363,7 @@ static int ProxyMain( int argc, char **
- else if( EQUAL(argv[i],"-of") && i < argc-1 )
- {
- pszFormat = argv[++i];
-- bFormatExplicitelySet = TRUE;
-+ bFormatExplicitlySet = TRUE;
- }
+--- a/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
++++ b/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
+@@ -487,7 +487,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. "
+- "Explicitely specify -dialect FileGDB\n"
++ "Explicitly specify -dialect FileGDB\n"
+ "to use the SQL engine from the FileGDB SDK API");
+ return OGRDataSource::ExecuteSQL( pszSQLCommand,
+ poSpatialFilter,
+--- a/MIGRATION_GUIDE.TXT
++++ b/MIGRATION_GUIDE.TXT
+@@ -141,7 +141,7 @@ Behaviour changes:
- else if( EQUAL(argv[i],"-q") || EQUAL(argv[i],"-quiet") )
-@@ -753,7 +753,7 @@ static int ProxyMain( int argc, char **
- pfnProgress = GDALDummyProgress;
- }
+ * The PG and SQLite drivers could accept apparently nested calls to StartTransaction()
+ (at the layer level). This is no longer possible since they are now redirected
+- to dataset transactions, that explicitely do not support it.
++ to dataset transactions, that explicitly do not support it.
-- if (!bQuiet && !bFormatExplicitelySet)
-+ if (!bQuiet && !bFormatExplicitlySet)
- CheckExtensionConsistency(pszDest, pszFormat);
+ H) RFC 55: Refined SetFeature() and DeleteFeature() semantics
- /* -------------------------------------------------------------------- */
---- a/apps/gdaldem.cpp
-+++ b/apps/gdaldem.cpp
-@@ -2237,7 +2237,7 @@ int main( int argc, char ** argv )
- const char *pszDstFilename = NULL;
- const char *pszColorFilename = NULL;
- const char *pszFormat = "GTiff";
-- int bFormatExplicitelySet = FALSE;
-+ int bFormatExplicitlySet = FALSE;
- char **papszCreateOptions = NULL;
-
- GDALDatasetH hSrcDataset = NULL;
-@@ -2430,7 +2430,7 @@ int main( int argc, char ** argv )
+--- a/apps/ogrlineref.cpp
++++ b/apps/ogrlineref.cpp
+@@ -1223,7 +1223,7 @@ int main( int nArgc, char ** papszArgv )
+ else if( EQUAL(papszArgv[iArg],"-f") )
{
CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
- pszFormat = argv[++i];
-- bFormatExplicitelySet = TRUE;
-+ bFormatExplicitlySet = TRUE;
+- //bFormatExplicitelySet = TRUE;
++ //bFormatExplicitlySet = TRUE;
+ pszFormat = papszArgv[++iArg];
}
- else if( argv[i][0] == '-' )
- {
-@@ -2521,7 +2521,7 @@ int main( int argc, char ** argv )
- exit( 1 );
- }
-
-- if (!bQuiet && !bFormatExplicitelySet)
-+ if (!bQuiet && !bFormatExplicitlySet)
- CheckExtensionConsistency(pszDstFilename, pszFormat);
-
- double dfDstNoDataValue = 0;
---- a/apps/gdalenhance.cpp
-+++ b/apps/gdalenhance.cpp
-@@ -89,7 +89,7 @@ int main( int argc, char ** argv )
- GDALDatasetH hDataset, hOutDS;
- int i;
- const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
-- int bFormatExplicitelySet = FALSE;
-+ int bFormatExplicitlySet = FALSE;
- GDALDriverH hDriver;
- GDALDataType eOutputType = GDT_Unknown;
- char **papszCreateOptions = NULL;
-@@ -130,7 +130,7 @@ int main( int argc, char ** argv )
- else if( EQUAL(argv[i],"-of") && i < argc-1 )
- {
- pszFormat = argv[++i];
-- bFormatExplicitelySet = TRUE;
-+ bFormatExplicitlySet = TRUE;
+ else if( EQUAL(papszArgv[iArg],"-dsco") )
+--- a/configure
++++ b/configure
+@@ -17463,7 +17463,7 @@ $as_echo "no" >&6; }
+ if test "$with_sse" = "yes"; then
+ echo "Caution: the generated binaries will not run on this system."
+ else
+- echo "Disabling SSE as it is not explicitely required"
++ echo "Disabling SSE as it is not explicitly required"
+ HAVE_SSE_AT_COMPILE_TIME=""
+ SSEFLAGS=""
+ fi
+@@ -17537,7 +17537,7 @@ $as_echo "no" >&6; }
+ if test "$with_avx" = "yes"; then
+ echo "Caution: the generated binaries will not run on this system."
+ else
+- echo "Disabling AVX as it is not explicitely required"
++ echo "Disabling AVX as it is not explicitly required"
+ AVXFLAGS=""
+ HAVE_AVX_AT_COMPILE_TIME=""
+ fi
+--- a/configure.in
++++ b/configure.in
+@@ -257,7 +257,7 @@ if test "$with_sse" = "yes" -o "$with_ss
+
+ dnl On Solaris, the presence of SSE instructions is flagged in the binary
+ dnl and prevent it to run on non SSE hardware even if the instructions are
+- dnl not executed. So if the user did not explicitely requires SSE, test that
++ dnl not executed. So if the user did not explicitly requires SSE, test that
+ dnl we can run SSE binaries
+ if test "$HAVE_SSE_AT_COMPILE_TIME" = "yes"; then
+ case $host_os in
+@@ -270,7 +270,7 @@ if test "$with_sse" = "yes" -o "$with_ss
+ if test "$with_sse" = "yes"; then
+ echo "Caution: the generated binaries will not run on this system."
+ else
+- echo "Disabling SSE as it is not explicitely required"
++ echo "Disabling SSE as it is not explicitly required"
+ HAVE_SSE_AT_COMPILE_TIME=""
+ SSEFLAGS=""
+ fi
+@@ -324,7 +324,7 @@ if test "$with_avx" = "yes" -o "$with_av
+
+ dnl On Solaris, the presence of AVX instructions is flagged in the binary
+ dnl and prevent it to run on non AVX hardware even if the instructions are
+- dnl not executed. So if the user did not explicitely requires AVX, test that
++ dnl not executed. So if the user did not explicitly requires AVX, test that
+ dnl we can run AVX binaries
+ if test "$HAVE_AVX_AT_COMPILE_TIME" = "yes"; then
+ case $host_os in
+@@ -337,7 +337,7 @@ if test "$with_avx" = "yes" -o "$with_av
+ if test "$with_avx" = "yes"; then
+ echo "Caution: the generated binaries will not run on this system."
+ else
+- echo "Disabling AVX as it is not explicitely required"
++ echo "Disabling AVX as it is not explicitly required"
+ AVXFLAGS=""
+ HAVE_AVX_AT_COMPILE_TIME=""
+ fi
+--- a/frmts/ecw/ecwdataset.cpp
++++ b/frmts/ecw/ecwdataset.cpp
+@@ -1010,7 +1010,7 @@ ECWDataset::~ECWDataset()
+ //
+ // We also have an issue with ECW SDK 5.0 and ECW files on Linux when
+ // running a multi-threaded test under Java if there's still an ECW dataset
+- // not explicitely closed at process termination.
++ // not explicitly closed at process termination.
+ /* #0 0x00007fffb26e7a80 in NCSAtomicAdd64 () from /home/even/ecwjp2_sdk/redistributable/x64/libNCSEcw.so
+ #1 0x00007fffb2aa7684 in NCS::SDK::CBuffer2D::Free() () from /home/even/ecwjp2_sdk/redistributable/x64/libNCSEcw.so
+ #2 0x00007fffb2aa7727 in NCS::SDK::CBuffer2D::~CBuffer2D() () from /home/even/ecwjp2_sdk/redistributable/x64/libNCSEcw.so
+--- a/frmts/gtiff/geotiff.cpp
++++ b/frmts/gtiff/geotiff.cpp
+@@ -7470,14 +7470,14 @@ void GTiffDataset::WriteRPC( GDALDataset
+ bRPCSerializedOtherWay = TRUE;
}
- else if( EQUAL(argv[i],"-ot") && i < argc-1 )
-@@ -265,7 +265,7 @@ int main( int argc, char ** argv )
- Usage();
- }
-
-- if (!bQuiet && pszDest != NULL && !bFormatExplicitelySet)
-+ if (!bQuiet && pszDest != NULL && !bFormatExplicitlySet)
- CheckExtensionConsistency(pszDest, pszFormat);
-
- /* -------------------------------------------------------------------- */
---- a/apps/gdalwarp.cpp
-+++ b/apps/gdalwarp.cpp
-@@ -337,7 +337,7 @@ int main( int argc, char ** argv )
- {
- GDALDatasetH hDstDS;
- const char *pszFormat = "GTiff";
-- int bFormatExplicitelySet = FALSE;
-+ int bFormatExplicitlySet = FALSE;
- char **papszSrcFiles = NULL;
- char *pszDstFilename = NULL;
- int bCreateOutput = FALSE, i;
-@@ -440,7 +440,7 @@ int main( int argc, char ** argv )
+- /* Write RPB file if explicitely asked, or if a non GDAL specific */
++ /* Write RPB file if explicitly asked, or if a non GDAL specific */
+ /* profile is selected and RPCTXT is not asked */
+- int bRPBExplicitelyAsked = CSLFetchBoolean( papszCreationOptions, "RPB", FALSE );
+- int bRPBExplicitelyDenied = !CSLFetchBoolean( papszCreationOptions, "RPB", TRUE );
++ int bRPBExplicitlyAsked = CSLFetchBoolean( papszCreationOptions, "RPB", FALSE );
++ int bRPBExplicitlyDenied = !CSLFetchBoolean( papszCreationOptions, "RPB", TRUE );
+ if( (!EQUAL(pszProfile,"GDALGeoTIFF") &&
+ !CSLFetchBoolean( papszCreationOptions, "RPCTXT", FALSE ) &&
+- !bRPBExplicitelyDenied )
+- || bRPBExplicitelyAsked )
++ !bRPBExplicitlyDenied )
++ || bRPBExplicitlyAsked )
{
- CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
- pszFormat = argv[++i];
-- bFormatExplicitelySet = TRUE;
-+ bFormatExplicitlySet = TRUE;
- bCreateOutput = TRUE;
- if( EQUAL(pszFormat,"VRT") )
- bVRT = TRUE;
-@@ -898,7 +898,7 @@ int main( int argc, char ** argv )
-
- if( hDstDS == NULL )
+ if( !bWriteOnlyInPAMIfNeeded )
+ GDALWriteRPBFile( pszTIFFFilename, papszRPCMD );
+--- a/frmts/l1b/l1bdataset.cpp
++++ b/frmts/l1b/l1bdataset.cpp
+@@ -178,7 +178,7 @@ static const char *apszBandDesc[] =
+ #define L1B_NOAA15_HDR_REC_SRC_OFF 154 // Receiving station name offset
+ #define L1B_NOAA15_HDR_REC_ELLIPSOID_OFF 328
+
+-/* This only apply if L1B_HIGH_GCP_DENSITY is explicitely set to NO */
++/* This only apply if L1B_HIGH_GCP_DENSITY is explicitly set to NO */
+ /* otherwise we will report more GCPs */
+ #define DESIRED_GCPS_PER_LINE 11
+ #define DESIRED_LINES_OF_GCPS 20
+--- a/frmts/openjpeg/openjpegdataset.cpp
++++ b/frmts/openjpeg/openjpegdataset.cpp
+@@ -2484,7 +2484,7 @@ GDALDataset * JP2OpenJPEGDataset::Create
+ !bGeoreferencingCompatOfGMLJP2 && nGMLJP2Version == 1 )
{
-- if (!bQuiet && !bFormatExplicitelySet)
-+ if (!bQuiet && !bFormatExplicitlySet)
- CheckExtensionConsistency(pszDstFilename, pszFormat);
+ CPLError(CE_Warning, CPLE_AppDefined,
+- "GMLJP2 box was explicitely required but cannot be written due "
++ "GMLJP2 box was explicitly required but cannot be written due "
+ "to lack of georeferencing and/or unsupported georeferencing for GMLJP2");
+ }
- hDstDS = GDALWarpCreateOutput( papszSrcFiles, pszDstFilename,pszFormat,
---- a/apps/nearblack.cpp
-+++ b/apps/nearblack.cpp
-@@ -123,7 +123,7 @@ int main( int argc, char ** argv )
- int bSetAlpha = FALSE;
- int bSetMask = FALSE;
- const char* pszDriverName = "HFA";
-- int bFormatExplicitelySet = FALSE;
-+ int bFormatExplicitlySet = FALSE;
- char** papszCreationOptions = NULL;
- int bQuiet = FALSE;
+@@ -2492,7 +2492,7 @@ GDALDataset * JP2OpenJPEGDataset::Create
+ !bGeoreferencingCompatOfGeoJP2 )
+ {
+ CPLError(CE_Warning, CPLE_AppDefined,
+- "GeoJP2 box was explicitely required but cannot be written due "
++ "GeoJP2 box was explicitly required but cannot be written due "
+ "to lack of georeferencing");
+ }
+ int bGeoBoxesAfter = CSLFetchBoolean(papszOptions, "GEOBOXES_AFTER_JP2C",
+--- a/frmts/pdf/frmt_pdf.html
++++ b/frmts/pdf/frmt_pdf.html
+@@ -108,7 +108,7 @@ 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.</li>
+ </ul>
+--- a/gcore/gdaldllmain.cpp
++++ b/gcore/gdaldllmain.cpp
+@@ -55,7 +55,7 @@ void CPLFinalizeTLS();
+ * This function calls GDALDestroyDriverManager() and OGRCleanupAll() and
+ * finalize Thread Local Storage variables.
+ *
+- * This function should *not* usually be explicitely called by application code
++ * This function should *not* usually be explicitly called by application code
+ * if GDAL is dynamically linked, since it is automatically called through
+ * the unregistration mechanisms of dynamic library loading.
+ *
+--- a/gcore/gdaldrivermanager.cpp
++++ b/gcore/gdaldrivermanager.cpp
+@@ -435,7 +435,7 @@ int GDALDriverManager::RegisterDriver( G
+ poDriver->SetMetadataItem( GDAL_DCAP_CREATECOPY, "YES" );
+
+ /* Backward compability for GDAL raster out-of-tree drivers: */
+- /* if a driver hasn't explicitely set a vector capability, assume it is */
++ /* if a driver hasn't explicitly set a vector capability, assume it is */
+ /* a raster driver (legacy OGR drivers will have DCAP_VECTOR set before */
+ /* calling RegisterDriver() ) */
+ if( poDriver->GetMetadataItem( GDAL_DCAP_RASTER ) == NULL &&
+--- a/ogr/ogrcurvecollection.cpp
++++ b/ogr/ogrcurvecollection.cpp
+@@ -315,7 +315,7 @@ OGRErr OGRCurveCollection::exportToWkb(
+ if( nGType == wkbCurvePolygon )
+ nGType = POSTGIS15_CURVEPOLYGON;
+ if( bIs3D )
+- nGType = (OGRwkbGeometryType)(nGType | wkb25DBitInternalUse); /* yes we explicitely set wkb25DBit */
++ nGType = (OGRwkbGeometryType)(nGType | wkb25DBitInternalUse); /* yes we explicitly set wkb25DBit */
+ }
-@@ -148,7 +148,7 @@ int main( int argc, char ** argv )
- {
- CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
- pszDriverName = argv[++i];
-- bFormatExplicitelySet = TRUE;
-+ bFormatExplicitlySet = TRUE;
+ if( eByteOrder == wkbNDR )
+--- a/ogr/ogrgeometrycollection.cpp
++++ b/ogr/ogrgeometrycollection.cpp
+@@ -529,7 +529,7 @@ OGRErr OGRGeometryCollection::exportToW
+ else if( nGType == wkbMultiSurface )
+ nGType = POSTGIS15_MULTISURFACE;
+ if( bIs3D )
+- nGType = (OGRwkbGeometryType)(nGType | wkb25DBitInternalUse); /* yes we explicitely set wkb25DBit */
++ nGType = (OGRwkbGeometryType)(nGType | wkb25DBitInternalUse); /* yes we explicitly set wkb25DBit */
+ }
+
+ if( eByteOrder == wkbNDR )
+--- a/ogr/ogrgeometryfactory.cpp
++++ b/ogr/ogrgeometryfactory.cpp
+@@ -3485,8 +3485,8 @@ static int OGRGF_NeedSwithArcOrder(doubl
+ * and OGRGeometryFactory::curveFromLineString() can decode them.
+ * This is the best compromise for round-tripping in OGR and better results
+ * with PostGIS <a href="http://postgis.org/docs/ST_LineToCurve.html">ST_LineToCurve()</a>
+- * If set to YES, the intermediate point is explicitely added to the linestring.
+- * If set to NO, the intermediate point is not explicitely added.
++ * If set to YES, the intermediate point is explicitly added to the linestring.
++ * If set to NO, the intermediate point is not explicitly added.
+ * </li>
+ * </ul>
+ *
+--- a/ogr/ogrlinestring.cpp
++++ b/ogr/ogrlinestring.cpp
+@@ -897,7 +897,7 @@ OGRErr OGRSimpleCurve::exportToWkb( OGR
+ if ( eWkbVariant == wkbVariantIso )
+ nGType = getIsoGeometryType();
+ else if( eWkbVariant == wkbVariantPostGIS1 && wkbHasZ((OGRwkbGeometryType)nGType) )
+- nGType = (OGRwkbGeometryType)(wkbFlatten(nGType) | wkb25DBitInternalUse); /* yes we explicitely set wkb25DBit */
++ nGType = (OGRwkbGeometryType)(wkbFlatten(nGType) | wkb25DBitInternalUse); /* yes we explicitly set wkb25DBit */
+
+ if( eByteOrder == wkbNDR )
+ nGType = CPL_LSBWORD32( nGType );
+--- a/ogr/ogrsf_frmts/generic/ogrunionlayer.h
++++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
+@@ -112,7 +112,7 @@ class OGRUnionLayer : public OGRLayer
+ void SetFields(FieldUnionStrategy eFieldStrategy,
+ int nFields,
+ OGRFieldDefn** papoFields, /* duplicated by the method */
+- int nGeomFields, /* maybe -1 to explicitely disable geometry fields */
++ int nGeomFields, /* maybe -1 to explicitly disable geometry fields */
+ OGRUnionLayerGeomFieldDefn** papoGeomFields /* duplicated by the method */);
+ void SetSourceLayerFieldName(const char* pszSourceLayerFieldName);
+ void SetPreserveSrcFID(int bPreserveSrcFID);
+--- a/ogr/ogrsf_frmts/geojson/drv_geojson.html
++++ b/ogr/ogrsf_frmts/geojson/drv_geojson.html
+@@ -28,7 +28,7 @@ And starting with OGR 2.0, the GeoJSON d
+ are spread over multiple pages (for ArcGIS servers >= 10.3). This is automatically enabled
+ if URL does not contain an explicit <i>resultOffset</i> parameter. If it contains
+ this parameter and scrolling is still desired, the FEATURE_SERVER_PAGING open option must be set to YES.
+-The page size can be explicitely set with the <i>resultRecordCount</i> parameter (but
++The page size can be explicitly set with the <i>resultRecordCount</i> parameter (but
+ is subject to a server limit). If it is not set, OGR will set it to the maximum
+ value allowed by the server.</p>
+
+--- a/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp
++++ b/ogr/ogrsf_frmts/gml/ogrgmldatasource.cpp
+@@ -1421,7 +1421,7 @@ OGRGMLLayer *OGRGMLDataSource::Translate
}
- else if( EQUAL(argv[i], "-white") ) {
- bNearWhite = TRUE;
-@@ -270,7 +270,7 @@ int main( int argc, char ** argv )
- if (hDriver == NULL)
- exit(1);
+ }
-- if (!bQuiet && !bFormatExplicitelySet)
-+ if (!bQuiet && !bFormatExplicitlySet)
- CheckExtensionConsistency(pszOutFile, pszDriverName);
+- /* Report a COMPD_CS only if GML_REPORT_COMPD_CS is explicitely set to TRUE */
++ /* Report a COMPD_CS only if GML_REPORT_COMPD_CS is explicitly set to TRUE */
+ if( poSRS != NULL &&
+ !CSLTestBoolean(CPLGetConfigOption("GML_REPORT_COMPD_CS", "FALSE")) )
+ {
+--- a/ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html
++++ b/ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html
+@@ -124,7 +124,7 @@ recompression of tiles to be done, which
+ lossy compression (JPEG, WebP). To avoid that, the driver will create a temporary
+ database next to the main GeoPackage file to store partial GeoPackage tiles in a
+ lossless (and uncompressed) way. Once a tile has received data for its four quadrants
+-and for all the bands (or the dataset is closed or explicitely flushed with FlushCache()),
++and for all the bands (or the dataset is closed or explicitly flushed with FlushCache()),
+ those uncompressed tiles are definitely transfered to the GeoPackage file with
+ the appropriate compression. All of this is transparent to the user of GDAL API/utilities</p>
+
+--- a/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
++++ b/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
+@@ -1509,7 +1509,7 @@ OGRFeature *OGRPGLayer::GetNextRawFeatur
+ {
+ CPLError(CE_Failure, CPLE_AppDefined,
+ "Cursor used to read layer has been closed due to a COMMIT. "
+- "ResetReading() must be explicitely called to restart reading");
++ "ResetReading() must be explicitly called to restart reading");
+ return NULL;
+ }
+
+--- a/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp
++++ b/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp
+@@ -409,7 +409,7 @@ int OGRVRTLayer::ParseGeometryField(CPLX
+ CSLTestBoolean(CPLGetXMLValue( psNode, "reportSrcColumn", "YES" ));
- if (bSetAlpha)
---- a/apps/ogr2ogr.cpp
-+++ b/apps/ogr2ogr.cpp
-@@ -855,7 +855,7 @@ int main( int nArgc, char ** papszArgv )
- {
- int nRetCode = 0;
- int bQuiet = FALSE;
-- int bFormatExplicitelySet = FALSE;
-+ int bFormatExplicitlySet = FALSE;
- const char *pszFormat = "ESRI Shapefile";
- const char *pszDataSource = NULL;
- const char *pszDestDataSource = NULL;
-@@ -953,7 +953,7 @@ int main( int nArgc, char ** papszArgv )
- else if( EQUAL(papszArgv[iArg],"-f") )
- {
- CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-- bFormatExplicitelySet = TRUE;
-+ bFormatExplicitlySet = TRUE;
- pszFormat = papszArgv[++iArg];
- }
- else if( EQUAL(papszArgv[iArg],"-dsco") )
-@@ -1566,7 +1566,7 @@ int main( int nArgc, char ** papszArgv )
/* -------------------------------------------------------------------- */
- if( !bUpdate )
+-/* Guess geometry type if not explicitely provided (or computed) */
++/* Guess geometry type if not explicitly provided (or computed) */
+ /* -------------------------------------------------------------------- */
+ if( pszGType == NULL && poProps->eGeomType == wkbUnknown )
{
-- if (!bQuiet && !bFormatExplicitelySet)
-+ if (!bQuiet && !bFormatExplicitlySet)
- CheckDestDataSourceNameConsistency(pszDestDataSource, pszFormat);
-
- OGRSFDriverRegistrar *poR = OGRSFDriverRegistrar::GetRegistrar();
---- a/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
-+++ b/ogr/ogrsf_frmts/filegdb/FGdbDatasource.cpp
-@@ -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. "
-- "Explicitely specify -dialect FileGDB\n"
-+ "Explicitly specify -dialect FileGDB\n"
- "to use the SQL engine from the FileGDB SDK API");
- return OGRDataSource::ExecuteSQL( pszSQLCommand,
- poSpatialFilter,
+@@ -2322,7 +2322,7 @@ OGRErr OGRVRTLayer::SetIgnoredFields( co
+ char** papszFieldsSrc = NULL;
+ OGRFeatureDefn* poSrcFeatureDefn = poSrcLayer->GetLayerDefn();
+
+- /* Translate explicitely ignored fields of VRT layers to their equivalent */
++ /* Translate explicitly ignored fields of VRT layers to their equivalent */
+ /* source fields. */
+ while ( papszIter != NULL && *papszIter != NULL )
+ {
+--- a/port/cpl_virtualmem.cpp
++++ b/port/cpl_virtualmem.cpp
+@@ -626,7 +626,7 @@ static void CPLVirtualMemSIGUSR1Handler(
+ /* I guess this is only POSIX correct if it is implemented by an intrinsic */
+ CPLAtomicInc(&nCountThreadsInSigUSR1);
+ while( nWaitHelperThread )
+- usleep(1); /* not explicitely indicated as signal-async-safe, but hopefully ok */
++ usleep(1); /* not explicitly indicated as signal-async-safe, but hopefully ok */
+ CPLAtomicDec(&nCountThreadsInSigUSR1);
+ /* fprintfstderr("leaving CPLVirtualMemSIGUSR1Handler %X\n", pthread_self()); */
+ }
diff --git a/debian/patches/gdalpaths b/debian/patches/gdalpaths
index 0f1d1e2..9e6b5f7 100644
--- a/debian/patches/gdalpaths
+++ b/debian/patches/gdalpaths
@@ -3,23 +3,12 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Last-Update: 2013-07-01
--- a/gcore/gdaldrivermanager.cpp
+++ b/gcore/gdaldrivermanager.cpp
-@@ -691,7 +691,7 @@ void GDALDriverManager::AutoLoadDrivers(
+@@ -703,7 +703,7 @@ void GDALDriverManager::AutoLoadDrivers(
#ifdef MACOSX_FRAMEWORK
GDAL_PREFIX "/PlugIns");
#else
- GDAL_PREFIX "/lib/gdalplugins" );
-+ 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
-@@ -820,7 +820,7 @@ void OGRSFDriverRegistrar::AutoLoadDrive
- #ifdef MACOSX_FRAMEWORK
- GDAL_PREFIX "/PlugIns");
- #else
-- GDAL_PREFIX "/lib/gdalplugins" );
-+ GDAL_PREFIX "/lib/gdalplugins/1.11" );
++ GDAL_PREFIX "/lib/gdalplugins/2.0" );
#endif
#else
char szExecPath[1024];
@@ -30,7 +19,7 @@ Last-Update: 2013-07-01
CPLPushFinderLocation( GDAL_PREFIX "/Resources/gdal" );
#else
- CPLPushFinderLocation( GDAL_PREFIX "/share/gdal" );
-+ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/1.11" );
++ CPLPushFinderLocation( GDAL_PREFIX "/share/gdal/2.0" );
#endif
#else
CPLPushFinderLocation( "/usr/local/share/gdal" );
diff --git a/debian/patches/hdf4 b/debian/patches/hdf4
index 6a38cf7..990ed66 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
-@@ -21190,7 +21190,7 @@ fi
+@@ -21397,7 +21397,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
-@@ -21250,7 +21250,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -21457,7 +21457,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. */
-@@ -21281,7 +21281,7 @@ fi
+@@ -21488,7 +21488,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
-@@ -21296,7 +21296,7 @@ if ${ac_cv_lib_mfhdf_SDreaddata+:} false
+@@ -21503,7 +21503,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. */
-@@ -21327,7 +21327,7 @@ fi
+@@ -21534,7 +21534,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 106f01e..ec861e3 100644
--- a/debian/patches/inconsistant-typo
+++ b/debian/patches/inconsistant-typo
@@ -1,208 +1,173 @@
Description: Fix 'inconsistant' typo, replace with 'inconsistent'.
Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
---- a/frmts/grib/degrib18/degrib/metaname.cpp
-+++ b/frmts/grib/degrib18/degrib/metaname.cpp
-@@ -840,7 +840,7 @@ GRIB2ParmTable MeteoAtmos[] = {
- /* 18 */ {"SNFALB", "Snow free albedo", "%", UC_NONE},
- };
+--- a/MIGRATION_GUIDE.TXT
++++ b/MIGRATION_GUIDE.TXT
+@@ -227,7 +227,7 @@ OGR drivers :
--/* GRIB2 Code table 4.2 : 0.253 or 0.190 (Document is inconsistant.) */
-+/* GRIB2 Code table 4.2 : 0.253 or 0.190 (Document is inconsistent.) */
- GRIB2ParmTable MeteoText[] = {
- /* 0 */ {"", "Arbitrary text string", "CCITTIA5", UC_NONE},
- };
---- a/frmts/grib/degrib18/degrib/tdlpack.cpp
-+++ b/frmts/grib/degrib18/degrib/tdlpack.cpp
-@@ -175,7 +175,7 @@ static int ReadTDLPSect1 (uChar *pds, sI
- t_hour = li_temp - t_day * 100;
- if ((t_year != year) || (t_month != month) || (t_day != day) ||
- (t_hour != hour)) {
-- errSprintf ("Error Inconsistant Times in ReadTDLPSect1.\n");
-+ errSprintf ("Error Inconsistent Times in ReadTDLPSect1.\n");
- return -1;
- }
- if (ParseTime (&(pdsMeta->refTime), year, month, day, hour, min, 0) != 0) {
-@@ -232,10 +232,10 @@ static int ReadTDLPSect1 (uChar *pds, sI
- project_hr = GRIB_UNSIGN_INT2 (*pds, pds[1]);
- tau = pdsMeta->ID3 - ((pdsMeta->ID3 / 1000) * 1000);
- if (tau != project_hr) {
-- printf ("Warning: Inconsistant Projections in hours in "
-+ printf ("Warning: Inconsistent Projections in hours in "
- "ReadTDLPSect1 (%d vs %d)\n", tau, project_hr);
- /*
-- errSprintf ("Warning: Inconsistant Projections in hours in "
-+ errSprintf ("Warning: Inconsistent Projections in hours in "
- "ReadTDLPSect1 (%ld vs %d)\n", tau, project_hr);
- */
- project_hr = tau;
-@@ -634,7 +634,7 @@ int TDLP_RefTime (DataSource &fp, sInt4
+ * Due to RFC 41, if a OGR driver calls SetGeomType(wkbNone) on a layer,
+ it will be impossible to affect geometries to features of that layer.
+- This worked before, although it was inconsistant, but it does no longer now.
++ This worked before, although it was inconsistent, but it does no longer now.
+ In the developmenet of RFC 41, the CSV and VRT drivers have been upgraded
+ to fix such errors.
- if ((t_year != year) || (t_month != month) || (t_day != day) ||
- (t_hour != hour)) {
-- errSprintf ("Error Inconsistant Times in TDLP_RefTime.\n");
-+ errSprintf ("Error Inconsistent Times in TDLP_RefTime.\n");
- return -1;
- }
- if (ParseTime (refTime, year, month, day, hour, min, 0) != 0) {
---- a/frmts/mbtiles/mbtilesdataset.cpp
-+++ b/frmts/mbtiles/mbtilesdataset.cpp
-@@ -1746,7 +1746,7 @@ GDALDataset* MBTilesDataset::Open(GDALOp
- if (bHasMinMaxLevel && (nMinLevel < 0 || nMinLevel > nMaxLevel))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
-- "Inconsistant values : min(zoom_level) = %d, max(zoom_level) = %d",
-+ "Inconsistent values : min(zoom_level) = %d, max(zoom_level) = %d",
- nMinLevel, nMaxLevel);
- goto end;
- }
---- a/frmts/nitf/nitfdataset.cpp
-+++ b/frmts/nitf/nitfdataset.cpp
-@@ -4317,7 +4317,7 @@ NITFDataset::NITFCreateCopy(
- else
- {
- CPLError((bStrict) ? CE_Failure : CE_Warning, CPLE_NotSupported,
-- "Inconsistant ICORDS value with SRS : %s%s.\n", pszICORDS,
-+ "Inconsistent ICORDS value with SRS : %s%s.\n", pszICORDS,
- (!bStrict) ? ". Setting it to G instead" : "");
- if (bStrict)
- {
---- a/frmts/nitf/nitffile.c
-+++ b/frmts/nitf/nitffile.c
-@@ -2626,7 +2626,7 @@ char **NITFGenericMetadataReadTRE(char *
- if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
+--- a/frmts/openjpeg/frmt_jp2openjpeg.html
++++ b/frmts/openjpeg/frmt_jp2openjpeg.html
+@@ -204,11 +204,11 @@ be written. Defaults to NO.
+ <li><p><b>USE_SRC_CODESTREAM=YES/NO</b>: (GDAL >= 2.0)
+ (EXPERIMENTAL!) When source dataset is JPEG2000, whether to reuse the codestream
+ of the source dataset unmodified. Defaults to NO. Note that enabling that feature might result
+-in inconsistant content of the JP2 boxes w.r.t. to the content of the source codestream.
++in inconsistent content of the JP2 boxes w.r.t. to the content of the source codestream.
+ Most other creation options will be ignored in that mode. Can be usefull in some
+ use cases when adding/correcting georeferencing, metadata, ... INSPIRE_TG and
+ PROFILE options will be ignored, and the profile of the codestream will be overriden
+-with the one specified/implied by the options (which may be inconsistant with
++with the one specified/implied by the options (which may be inconsistent with
+ the characteristics of the codestream).
+ </p></li>
+
+--- a/frmts/openjpeg/openjpegdataset.cpp
++++ b/frmts/openjpeg/openjpegdataset.cpp
+@@ -2412,7 +2412,7 @@ GDALDataset * JP2OpenJPEGDataset::Create
+ (GDALGetDataTypeSize(eDataType) == 32 && (nBits <= 16 || nBits > 32)) )
{
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Inconsistant declaration of %s TRE",
-+ "Inconsistent declaration of %s TRE",
- pszTREName );
+ CPLError(CE_Warning, CPLE_NotSupported,
+- "Inconsistant NBITS value with data type. Using %d",
++ "Inconsistent NBITS value with data type. Using %d",
+ GDALGetDataTypeSize(eDataType));
}
- if (nTreOffset < nTRESize)
-@@ -2762,7 +2762,7 @@ CPLXMLNode* NITFCreateXMLTre(NITFFile* p
- if (bError == FALSE && nTreLength > 0 && nTreOffset != nTreLength)
+
+--- a/gcore/gdaldataset.cpp
++++ b/gcore/gdaldataset.cpp
+@@ -3383,7 +3383,7 @@ OGRLayer *GDALDataset::CreateLayer( cons
+ !poLayer->TestCapability(OLCCurveGeometries) )
{
CPLError( CE_Warning, CPLE_AppDefined,
-- "Inconsistant declaration of %s TRE",
-+ "Inconsistent declaration of %s TRE",
- pszTREName );
+- "Inconsistant driver: Layer geometry type is non-linear, but "
++ "Inconsistent driver: Layer geometry type is non-linear, but "
+ "TestCapability(OLCCurveGeometries) returns FALSE." );
}
- if (nTreOffset < nTRESize)
---- a/frmts/ozi/ozidataset.cpp
-+++ b/frmts/ozi/ozidataset.cpp
-@@ -601,7 +601,7 @@ GDALDataset *OZIDataset::Open( GDALOpenI
- short nTileY = ReadShort(fp, bOzi3, nKeyInit);
- if (i == 0 && (nW != poDS->nRasterXSize || nH != poDS->nRasterYSize))
- {
-- CPLDebug("OZI", "zoom[%d] inconsistant dimensions for zoom level 0 : nW=%d, nH=%d, nTileX=%d, nTileY=%d, nRasterXSize=%d, nRasterYSize=%d",
-+ CPLDebug("OZI", "zoom[%d] inconsistent dimensions for zoom level 0 : nW=%d, nH=%d, nTileX=%d, nTileY=%d, nRasterXSize=%d, nRasterYSize=%d",
- i, nW, nH, nTileX, nTileY, poDS->nRasterXSize, poDS->nRasterYSize);
- delete poDS;
- return NULL;
---- a/frmts/pds/pdsdataset.cpp
-+++ b/frmts/pds/pdsdataset.cpp
-@@ -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 */
--/* values are used inconsistantly. Thus we have included */
-+/* values are used inconsistently. Thus we have included */
- /* conversion options to allow the user to override the */
- /* documented PDS3 default. Jan. 2011, for known mapping issues */
- /* see GDAL PDS page or mapping within ISIS3 source (USGS) */
---- a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
-+++ b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
-@@ -109,7 +109,7 @@ OGRShapeLayer::OGRShapeLayer( OGRShapeDa
- nTotalShapeCount = hSHP->nRecords;
- if( hDBF != NULL && hDBF->nRecords != nTotalShapeCount )
+ #endif
+--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
++++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagetablelayer.cpp
+@@ -1130,7 +1130,7 @@ OGRErr OGRGeoPackageTableLayer::ICreateF
+ poFeature->GetFieldAsInteger64(m_iFIDAsRegularColumnIndex) != poFeature->GetFID() )
+ {
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Inconsistant values of FID and field of same name");
++ "Inconsistent values of FID and field of same name");
+ return CE_Failure;
+ }
+ }
+@@ -1251,7 +1251,7 @@ OGRErr OGRGeoPackageTableLayer::ISetFeat
+ poFeature->GetFieldAsInteger64(m_iFIDAsRegularColumnIndex) != poFeature->GetFID() )
{
-- CPLDebug("Shape", "Inconsistant record number in .shp (%d) and in .dbf (%d)",
-+ CPLDebug("Shape", "Inconsistent record number in .shp (%d) and in .dbf (%d)",
- hSHP->nRecords, hDBF->nRecords);
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Inconsistant values of FID and field of same name");
++ "Inconsistent values of FID and field of same name");
+ return CE_Failure;
}
}
---- a/ogr/ogrsf_frmts/shape/sbnsearch.c
-+++ b/ogr/ogrsf_frmts/shape/sbnsearch.c
-@@ -328,7 +328,7 @@ SBNSearchHandle SBNOpenDiskTree( const c
- if ((nBinStart > 0 && nNodeShapeCount == 0) ||
- nNodeShapeCount < 0 || nNodeShapeCount > nShapeCount)
+--- a/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp
++++ b/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp
+@@ -1105,7 +1105,7 @@ OGRErr OGRPGTableLayer::ISetFeature( OGR
+ poFeature->GetFieldAsInteger64(iFIDAsRegularColumnIndex) != poFeature->GetFID() )
{
-- hSBN->sHooks.Error( "Inconsistant shape count in bin" );
-+ hSBN->sHooks.Error( "Inconsistent shape count in bin" );
- SBNCloseDiskTree(hSBN);
- return NULL;
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Inconsistant values of FID and field of same name");
++ "Inconsistent values of FID and field of same name");
+ return CE_Failure;
}
-@@ -637,7 +637,7 @@ static int SBNSearchDiskInternal( Search
+ }
+@@ -1319,7 +1319,7 @@ OGRErr OGRPGTableLayer::ICreateFeature(
+ poFeature->GetFieldAsInteger64(iFIDAsRegularColumnIndex) != poFeature->GetFID() )
{
- free(psNode->pabyShapeDesc);
- psNode->pabyShapeDesc = NULL;
-- hSBN->sHooks.Error( "Inconsistant shape count for bin" );
-+ hSBN->sHooks.Error( "Inconsistent shape count for bin" );
- return FALSE;
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Inconsistant values of FID and field of same name");
++ "Inconsistent values of FID and field of same name");
+ return CE_Failure;
}
+ }
+--- a/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
++++ b/ogr/ogrsf_frmts/pgdump/ogrpgdumplayer.cpp
+@@ -158,7 +158,7 @@ OGRErr OGRPGDumpLayer::ICreateFeature( O
+ poFeature->GetFieldAsInteger64(iFIDAsRegularColumnIndex) != poFeature->GetFID() )
+ {
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Inconsistant values of FID and field of same name");
++ "Inconsistent values of FID and field of same name");
+ return CE_Failure;
+ }
+ }
+--- a/ogr/ogrsf_frmts/shape/shpopen.c
++++ b/ogr/ogrsf_frmts/shape/shpopen.c
+@@ -1792,7 +1792,7 @@ SHPReadObject( SHPHandle psSHP, int hEnt
+ {
+ char str[128];
+ sprintf( str,
+- "Sanity check failed when trying to recover from inconsistant .shx/.shp with shape %d",
++ "Sanity check failed when trying to recover from inconsistent .shx/.shp with shape %d",
+ hEntity );
-@@ -737,7 +737,7 @@ static int SBNSearchDiskInternal( Search
+ psSHP->sHooks.Error( str );
+--- a/ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp
++++ b/ogr/ogrsf_frmts/sqlite/ogrsqlitetablelayer.cpp
+@@ -2585,7 +2585,7 @@ OGRErr OGRSQLiteTableLayer::ISetFeature(
+ poFeature->GetFieldAsInteger64(iFIDAsRegularColumnIndex) != poFeature->GetFID() )
{
- free(psNode->pabyShapeDesc);
- psNode->pabyShapeDesc = NULL;
-- hSBN->sHooks.Error( "Inconsistant shape count for bin" );
-+ hSBN->sHooks.Error( "Inconsistent shape count for bin" );
- return FALSE;
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Inconsistant values of FID and field of same name");
++ "Inconsistent values of FID and field of same name");
+ return CE_Failure;
}
-
---- a/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
-+++ b/ogr/ogrsf_frmts/wfs/ogrwfslayer.cpp
-@@ -2458,7 +2458,7 @@ OGRErr OGRWFSLayer::CommitTransaction()
- if ((int)aosFIDList.size() != nGotInserted)
+ }
+@@ -2946,7 +2946,7 @@ OGRErr OGRSQLiteTableLayer::ICreateFeatu
+ poFeature->GetFieldAsInteger64(iFIDAsRegularColumnIndex) != poFeature->GetFID() )
{
CPLError(CE_Failure, CPLE_AppDefined,
-- "Inconsistant InsertResults: did not get expected FID count");
-+ "Inconsistent InsertResults: did not get expected FID count");
- CPLDestroyXMLNode( psXML );
- CPLHTTPDestroyResult(psResult);
- return OGRERR_FAILURE;
---- a/port/cpl_csv.cpp
-+++ b/port/cpl_csv.cpp
-@@ -464,7 +464,7 @@ char CSVDetectSeperator (const char* psz
- else if (chDelimiter != *pszLine)
- {
- /* The separator is not consistant on the line. */
-- CPLDebug("CSV", "Inconsistant separator. '%c' and '%c' found. Using ',' as default",
-+ CPLDebug("CSV", "Inconsistent separator. '%c' and '%c' found. Using ',' as default",
- chDelimiter, *pszLine);
- chDelimiter = ',';
- break;
---- a/port/cpl_vsisimple.cpp
-+++ b/port/cpl_vsisimple.cpp
-@@ -512,7 +512,7 @@ void VSICheckMarkerBegin(char* ptr)
- if (memcmp(ptr, "VSIM", 4) != 0)
- {
- CPLError(CE_Fatal, CPLE_AppDefined,
-- "Inconsistant use of VSI memory allocation primitives for %p : %c%c%c%c",
-+ "Inconsistent use of VSI memory allocation primitives for %p : %c%c%c%c",
- ptr, ptr[0], ptr[1], ptr[2], ptr[3]);
- }
- }
---- a/swig/include/cpl.i
-+++ b/swig/include/cpl.i
-@@ -479,7 +479,7 @@ int wrapper_VSIFWriteL( int nLen, char *
- {
- if (nLen < size * memb)
- {
-- CPLError(CE_Failure, CPLE_AppDefined, "Inconsistant buffer size with 'size' and 'memb' values");
-+ CPLError(CE_Failure, CPLE_AppDefined, "Inconsistent buffer size with 'size' and 'memb' values");
- return 0;
- }
- return VSIFWriteL(pBuf, size, memb, f);
---- a/swig/python/extensions/gdal_wrap.cpp
-+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -3505,7 +3505,7 @@ int wrapper_VSIFWriteL( int nLen, char *
- {
- if (nLen < size * memb)
- {
-- CPLError(CE_Failure, CPLE_AppDefined, "Inconsistant buffer size with 'size' and 'memb' values");
-+ CPLError(CE_Failure, CPLE_AppDefined, "Inconsistent buffer size with 'size' and 'memb' values");
- return 0;
- }
- return VSIFWriteL(pBuf, size, memb, f);
+- "Inconsistant values of FID and field of same name");
++ "Inconsistent values of FID and field of same name");
+ return CE_Failure;
+ }
+ }
+--- a/swig/python/samples/validate_jp2.py
++++ b/swig/python/samples/validate_jp2.py
+@@ -291,7 +291,7 @@ def check_geojp2_gmljp2_consistency(file
+ if abs(geojp2_gt[i] - gmljp2_gt[i] > 1e-8):
+ diff = True
+ if diff:
+- error_report.EmitError('GENERAL', 'Inconsistant geotransform between GeoJP2 (%s) and GMLJP2 (%s)' % (str(geojp2_gt), str(gmljp2_gt)))
++ error_report.EmitError('GENERAL', 'Inconsistent geotransform between GeoJP2 (%s) and GMLJP2 (%s)' % (str(geojp2_gt), str(gmljp2_gt)))
+
+ geojp2_sr = osr.SpatialReference()
+ geojp2_sr.ImportFromWkt(geojp2_wkt)
+@@ -303,7 +303,7 @@ def check_geojp2_gmljp2_consistency(file
+ geojp2_proj4 = geojp2_sr.ExportToProj4()
+ gmljp2_proj4 = gmljp2_sr.ExportToProj4()
+ if geojp2_proj4 != gmljp2_proj4:
+- error_report.EmitError('GENERAL', 'Inconsistant SRS between GeoJP2 (wkt=%s, proj4=%s) and GMLJP2 (wkt=%s, proj4=%s)' % (geojp2_wkt, geojp2_proj4, gmljp2_wkt, gmljp2_proj4))
++ error_report.EmitError('GENERAL', 'Inconsistent SRS between GeoJP2 (wkt=%s, proj4=%s) and GMLJP2 (wkt=%s, proj4=%s)' % (geojp2_wkt, geojp2_proj4, gmljp2_wkt, gmljp2_proj4))
+
+
+ # Check consistency of georeferencing of OrthoimageCoverage with the one embedded in the JPEG2000 file
+@@ -363,7 +363,7 @@ def check_oi_rg_consistency(filename, se
+ if abs(oi_gt[i] - gt[i] > 1e-8):
+ diff = True
+ if diff:
+- error_report.EmitError('INSPIRE_TG', 'Inconsistant geotransform between OrthoImagery (%s) and GMLJP2/GeoJP2 (%s)' % (str(oi_gt), str(gt)), conformance_class = 'A.8.8')
++ error_report.EmitError('INSPIRE_TG', 'Inconsistent geotransform between OrthoImagery (%s) and GMLJP2/GeoJP2 (%s)' % (str(oi_gt), str(gt)), conformance_class = 'A.8.8')
+
+ sr = osr.SpatialReference()
+ sr.ImportFromWkt(wkt)
+@@ -375,7 +375,7 @@ def check_oi_rg_consistency(filename, se
+ proj4 = sr.ExportToProj4()
+ oi_proj4 = oi_sr.ExportToProj4()
+ if proj4 != oi_proj4:
+- error_report.EmitError('INSPIRE_TG', 'Inconsistant SRS between OrthoImagery (wkt=%s, proj4=%s) and GMLJP2/GeoJP2 (wkt=%s, proj4=%s)' % (wkt, proj4, oi_wkt, oi_proj4), conformance_class = 'A.8.8')
++ error_report.EmitError('INSPIRE_TG', 'Inconsistent SRS between OrthoImagery (wkt=%s, proj4=%s) and GMLJP2/GeoJP2 (wkt=%s, proj4=%s)' % (wkt, proj4, oi_wkt, oi_proj4), conformance_class = 'A.8.8')
+
+ def validate(filename, oidoc, inspire_tg, expected_gmljp2, ogc_schemas_location, datatype = 'imagery', error_report = None):
+
diff --git a/debian/patches/initalize-typo b/debian/patches/initalize-typo
index 2a7e7fc..014a53e 100644
--- a/debian/patches/initalize-typo
+++ b/debian/patches/initalize-typo
@@ -1,49 +1,24 @@
Description: Fix 'initialized' typo, replace with 'initialized'.
Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
---- a/apps/gdal_utilities.dox
-+++ b/apps/gdal_utilities.dox
-@@ -1416,7 +1416,7 @@ Create an image with the pixels in all b
- \endverbatim
+--- a/gcore/rasterio.cpp
++++ b/gcore/rasterio.cpp
+@@ -459,7 +459,7 @@ CPLErr GDALRasterBand::IRasterIO( GDALRW
- Create an RGB image that shows blue in pixels with no data. The first two bands
--will be initialized to 0 and the third band will be initalized to 255.
-+will be initialized to 0 and the third band will be initialized to 255.
+ // FIXME: this code likely doesn't work if the dirty block gets flushed
+ // to disk before being completely written.
+- // In the meantime, bJustInitalize should probably be set to FALSE
++ // In the meantime, bJustInitialize should probably be set to FALSE
+ // even if it is not ideal performance wise, and for lossy compression
- \verbatim
- % gdal_merge.py -init "0 0 255" -o out.tif in1.tif in2.tif
---- a/man/man1/gdal_merge.1
-+++ b/man/man1/gdal_merge.1
-@@ -67,7 +67,7 @@ Create an image with the pixels in all b
- .fi
- .PP
- .PP
--Create an RGB image that shows blue in pixels with no data. The first two bands will be initialized to 0 and the third band will be initalized to 255.
-+Create an RGB image that shows blue in pixels with no data. The first two bands will be initialized to 0 and the third band will be initialized to 255.
- .PP
- .PP
- .nf
---- a/ogr/ogrsf_frmts/ili/ili2reader.cpp
-+++ b/ogr/ogrsf_frmts/ili/ili2reader.cpp
-@@ -511,7 +511,7 @@ int ILI2Reader::SetupParser() {
- {
- 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 );
- CPLFree(msg);
+ /* -------------------------------------------------------------------- */
+@@ -3165,7 +3165,7 @@ GDALDataset::BlockBasedRasterIO( GDALRWF
---- a/ogr/ogrsf_frmts/tiger/ogr_tiger.h
-+++ b/ogr/ogrsf_frmts/tiger/ogr_tiger.h
-@@ -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 */
--/* there are statically initalized variables of these types that describe */
-+/* there are statically initialized variables of these types that describe */
- /* the record types associated with that layer. In the case where different */
- /* TIGER versions have different schemas, there is a */
- /* TigerFieldInfo/TigerRecordInfo for each version, and the constructor */
+ // FIXME: this code likely doesn't work if the dirty block gets flushed
+ // to disk before being completely written.
+- // In the meantime, bJustInitalize should probably be set to FALSE
++ // In the meantime, bJustInitialize should probably be set to FALSE
+ // even if it is not ideal performance wise, and for lossy compression
+
+ /* -------------------------------------------------------------------- */
diff --git a/debian/patches/ogdi b/debian/patches/ogdi
index e33d9c9..f60220a 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
-@@ -372,7 +372,7 @@ endif
+@@ -386,7 +386,7 @@ endif
# PCRaster support
PCRASTER_SETTING = @PCRASTER_SETTING@
diff --git a/debian/patches/paramters-typo b/debian/patches/paramters-typo
index b613129..0179d26 100644
--- a/debian/patches/paramters-typo
+++ b/debian/patches/paramters-typo
@@ -1,31 +1,10 @@
Description: Fix 'paramters' typo, replace with 'parameters'.
Author: Bas Couwenger <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
---- a/frmts/georaster/georaster_wrapper.cpp
-+++ b/frmts/georaster/georaster_wrapper.cpp
-@@ -718,7 +718,7 @@ bool GeoRasterWrapper::Create( char* psz
- nBandBlockSize = nBandBlockSize == 0 ? 1 : nBandBlockSize;
-
- // -----------------------------------------------------------
-- // Blocking storage paramters
-+ // Blocking storage parameters
- // -----------------------------------------------------------
-
- CPLString sBlocking;
-@@ -789,7 +789,7 @@ bool GeoRasterWrapper::Create( char* psz
- }
-
- // -----------------------------------------------------------
-- // Complete format paramters
-+ // Complete format parameters
- // -----------------------------------------------------------
-
- if( poConnection->GetVersion() > 10 )
--- a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
-@@ -1178,7 +1178,7 @@ CPLXMLNode* XMLSpatialReference(OGRSpati
+@@ -1247,7 +1247,7 @@ CPLXMLNode* XMLSpatialReference(OGRSpati
const char* gridvalues[7];
/*
@@ -34,14 +13,3 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
Try and use ArcGIS 10 default values.
*/
// default tolerance is 1mm in the units of the coordinate system
---- a/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp
-+++ b/frmts/pcidsk/sdk/segment/cpcidskgeoref.cpp
-@@ -317,7 +317,7 @@ void CPCIDSKGeoref::WriteParameters( std
- Load();
-
- if( parms.size() < 17 )
-- ThrowPCIDSKException( "Did not get expected number of paramters in WriteParameters()" );
-+ ThrowPCIDSKException( "Did not get expected number of parameters in WriteParameters()" );
-
- unsigned int i;
-
diff --git a/debian/patches/recommanded-typo b/debian/patches/recommanded-typo
index e750cce..cbb25ec 100644
--- a/debian/patches/recommanded-typo
+++ b/debian/patches/recommanded-typo
@@ -1,91 +1,15 @@
Description: Fix 'recommanded' typo, replace with 'recommended'.
Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
---- a/ogr/ogr_geocoding.cpp
-+++ b/ogr/ogr_geocoding.cpp
-@@ -202,7 +202,7 @@ int OGRGeocodeHasStringValidFormat(const
- * <a href="http://msdn.microsoft.com/en-us/library/ff701714.aspx">"BING"</a> or
- * other value.
- * Note: "YAHOO" is no longer available as a free service.
-- * <li> "EMAIL": used by OSM_NOMINATIM. Optional, but recommanded.
-+ * <li> "EMAIL": used by OSM_NOMINATIM. Optional, but recommended.
- * <li> "USERNAME": used by GEONAMES. Compulsory in that case.
- * <li> "KEY": used by BING. Compulsory in that case.
- * <li> "APPLICATION": used to set the User-Agent MIME header. Defaults
---- a/ogr/ogrsf_frmts/gml/drv_gml.html
-+++ b/ogr/ogrsf_frmts/gml/drv_gml.html
-@@ -372,7 +372,7 @@ the prefix of the application target nam
- <ul>
- <li><i>GML3</i> in order to write GML files that follow GML 3.1.1 SF-0 profile.</li>
- <li><i>GML3Deegree</i> (OGR >= 1.9.0) in order to produce a GML 3.1.1 .XSD schema,
--with a few variations with respect to what is recommanded by GML3 SF-0 profile,
-+with a few variations with respect to what is recommended by GML3 SF-0 profile,
- but that will be better accepted by some software (such as Deegree 3).</li>
- <li><i>GML3.2</i>(OGR >= 1.9.0) in order to write GML files that follow GML 3.2.1 SF-0 profile.</li>
- </ul><br>
---- a/ogr/ogrsf_frmts/libkml/drv_libkml.html
-+++ b/ogr/ogrsf_frmts/libkml/drv_libkml.html
-@@ -318,7 +318,7 @@
- camera_latitude, camera_altitude, camera_altitudemode, head and/or tilt and/or roll,
- leftfov, rightfov, bottomfov, topfov, near fields are also set. The shape field is optional.
- </p>
-- <p>In case the PhotoOverlay is a big image, it is highly recommanded to tile it and
-+ <p>In case the PhotoOverlay is a big image, it is highly recommended to tile it and
- generate overview levels, as explained in the <a href="https://developers.google.com/kml/documentation/photos">
- PhotoOverlay tutorial</a>. In which case, the URL should contain the "$[level]", "$[x]" and "$[y]"
- sub-strings in the photooverlay field, and the imagepyramid_tilesize,
---- a/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
-+++ b/ogr/ogrsf_frmts/libkml/ogrlibkmllayer.cpp
-@@ -571,7 +571,7 @@ OGRErr OGRLIBKMLLayer::CreateFeature (
- {
- bAlreadyWarned = TRUE;
- CPLError(CE_Warning, CPLE_AppDefined,
-- "It is recommanded to define a FID when calling CreateFeature() in a update document");
-+ "It is recommended to define a FID when calling CreateFeature() in a update document");
- }
- }
- else
---- a/ogr/ogrsf_frmts/osm/osm_parser.cpp
-+++ b/ogr/ogrsf_frmts/osm/osm_parser.cpp
-@@ -1908,7 +1908,7 @@ static void XMLCALL OSM_XML_startElement
- else if( psCtxt->bInRelation &&
- strcmp(pszName, "member") == 0 )
- {
-- /* 300 is the recommanded value, but there are files with more than 2000 so we should be able */
-+ /* 300 is the recommended value, but there are files with more than 2000 so we should be able */
- /* to realloc over that value */
- if (psCtxt->sRelation.nMembers >= psCtxt->nMembersAllocated)
- {
-@@ -2249,7 +2249,7 @@ OSMContext* OSM_Open( const char* pszFil
- psCtxt->nTagsAllocated = 256;
- psCtxt->pasTags = (OSMTag*) VSIMalloc(sizeof(OSMTag) * psCtxt->nTagsAllocated);
+--- a/NEWS
++++ b/NEWS
+@@ -5019,7 +5019,7 @@ XPlane/Flightgear driver:
+ == SWIG Language Bindings ==
-- /* 300 is the recommanded value, but there are files with more than 2000 so we should be able */
-+ /* 300 is the recommended value, but there are files with more than 2000 so we should be able */
- /* to realloc over that value */
- psCtxt->nMembersAllocated = 2000;
- psCtxt->pasMembers = (OSMMember*) VSIMalloc(sizeof(OSMMember) * psCtxt->nMembersAllocated);
---- a/ogr/ogrsf_frmts/vrt/drv_vrt.html
-+++ b/ogr/ogrsf_frmts/vrt/drv_vrt.html
-@@ -120,7 +120,7 @@ If set to FALSE, the source geometry fie
- <p>
- Starting with OGR 1.11, the GeometryField element can be repeated as many times
- as necessary to create multiple geometry fields. It accepts a <b>name</b>
--attribute (recommanded) that will be used to define the VRT geometry field name. When <b>encoding</b> is
-+attribute (recommended) that will be used to define the VRT geometry field name. When <b>encoding</b> is
- not specified, the <b>field</b> attribute will be used to determine the corresponding
- geometry field name in the source layer. If neither <b>encoding</b> nor <b>field</b>
- are specified, it is assumed that the name of source geometry field is the value
---- a/swig/java/javadoc.java
-+++ b/swig/java/javadoc.java
-@@ -11773,7 +11773,7 @@ public class CoordinateTransformation
- * Caution: the coordinate transformation object returned can be in a non
- * working state if no coordinate transformation can be established between
- * src and dst, and calling other methods on it can result in the process
-- * termination. If using GDAL 1.10 or above, it is recommanded to use the
-+ * termination. If using GDAL 1.10 or above, it is recommended to use the
- * <a href="#CreateCoordinateTransformation(org.gdal.osr.SpatialReference,%20org.gdal.osr.SpatialReference)">
- * CreateCoordinateTransformation(org.gdal.osr.SpatialReference, org.gdal.osr.SpatialReference)</a> method instead.
- * <p>
+ General:
+- * Recommanded SWIG version is 1.3.39
++ * Recommended SWIG version is 1.3.39
+ * Added API :
+ - GDAL :
+ gdal.FilldoData(), gdal.FileFromMemBuffer(), gdal.Unlink()
diff --git a/debian/patches/ressource-typo b/debian/patches/ressource-typo
index 1ac3f28..3a5fffd 100644
--- a/debian/patches/ressource-typo
+++ b/debian/patches/ressource-typo
@@ -1,37 +1,7 @@
Description: Fix 'ressources' typo, replace with 'resources'.
Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
---- a/NEWS
-+++ b/NEWS
-@@ -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()
-- * GetFileList(): for /vsicurl/ ressources, don't actually test their existence as it can be excruciating slow
-+ * GetFileList(): for /vsicurl/ resources, don't actually test their existence as it can be excruciating slow
- * 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)
-@@ -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()
-- even if it not a real filename. Usefull for opening ressources expressed as
-+ even if it not a real filename. Usefull for opening resources expressed as
- 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().
-@@ -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()
-- even if it not a real filename. Usefull for opening ressources expressed as
-+ even if it not a real filename. Usefull for opening resources expressed as
- GDAL virtual filenames in software offering only file explorers (#3902)
- * Expat based XML readers : add support for reading files with Windows-1252
- encoding
--- a/frmts/ecw/ecwasyncreader.cpp
+++ b/frmts/ecw/ecwasyncreader.cpp
@@ -282,7 +282,7 @@ NCSEcwReadStatus ECWAsyncReader::Refresh
@@ -43,196 +13,3 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
if( poReader->bComplete )
CPLCleanupTLS();
---- a/frmts/ecw/ecwdataset.cpp
-+++ b/frmts/ecw/ecwdataset.cpp
-@@ -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;
-- // 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.
- //
- // 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
-@@ -2205,7 +2205,7 @@ static char** NITFGenericMetadataReadTRE
- {
- *pbError = TRUE;
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid item construct in %s TRE in XML ressource",
-+ "Invalid item construct in %s TRE in XML resource",
- pszTREName );
- break;
- }
-@@ -2229,7 +2229,7 @@ static char** NITFGenericMetadataReadTRE
- if (nIterations < 0)
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid loop construct in %s TRE in XML ressource : "
-+ "Invalid loop construct in %s TRE in XML resource : "
- "invalid 'counter' %s",
- pszTREName, pszCounter );
- *pbError = TRUE;
-@@ -2250,7 +2250,7 @@ static char** NITFGenericMetadataReadTRE
- if (NPART < 0)
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid loop construct in %s TRE in XML ressource : "
-+ "Invalid loop construct in %s TRE in XML resource : "
- "invalid 'counter' %s",
- pszTREName, "NPART" );
- *pbError = TRUE;
-@@ -2268,7 +2268,7 @@ static char** NITFGenericMetadataReadTRE
- if (NUMOPG < 0)
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid loop construct in %s TRE in XML ressource : "
-+ "Invalid loop construct in %s TRE in XML resource : "
- "invalid 'counter' %s",
- pszTREName, "NUMOPG" );
- *pbError = TRUE;
-@@ -2290,7 +2290,7 @@ static char** NITFGenericMetadataReadTRE
- if (NPAR < 0)
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid loop construct in %s TRE in XML ressource : "
-+ "Invalid loop construct in %s TRE in XML resource : "
- "invalid 'counter' %s",
- pszTREName, "NPAR" );
- *pbError = TRUE;
-@@ -2299,7 +2299,7 @@ static char** NITFGenericMetadataReadTRE
- if (NPARO < 0)
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid loop construct in %s TRE in XML ressource : "
-+ "Invalid loop construct in %s TRE in XML resource : "
- "invalid 'counter' %s",
- pszTREName, "NPAR0" );
- *pbError = TRUE;
-@@ -2317,7 +2317,7 @@ static char** NITFGenericMetadataReadTRE
- if (NPLN < 0)
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid loop construct in %s TRE in XML ressource : "
-+ "Invalid loop construct in %s TRE in XML resource : "
- "invalid 'counter' %s",
- pszTREName, "NPLN" );
- *pbError = TRUE;
-@@ -2339,7 +2339,7 @@ static char** NITFGenericMetadataReadTRE
- if (NXPTS < 0)
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid loop construct in %s TRE in XML ressource : "
-+ "Invalid loop construct in %s TRE in XML resource : "
- "invalid 'counter' %s",
- pszTREName, "NXPTS" );
- *pbError = TRUE;
-@@ -2348,7 +2348,7 @@ static char** NITFGenericMetadataReadTRE
- if (NYPTS < 0)
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid loop construct in %s TRE in XML ressource : "
-+ "Invalid loop construct in %s TRE in XML resource : "
- "invalid 'counter' %s",
- pszTREName, "NYPTS" );
- *pbError = TRUE;
-@@ -2359,7 +2359,7 @@ static char** NITFGenericMetadataReadTRE
- else
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid loop construct in %s TRE in XML ressource : "
-+ "Invalid loop construct in %s TRE in XML resource : "
- "missing or invalid 'counter' or 'iterations' or 'formula'",
- pszTREName );
- *pbError = TRUE;
-@@ -2544,7 +2544,7 @@ static char** NITFGenericMetadataReadTRE
- else
- {
- CPLError( CE_Warning, CPLE_AppDefined,
-- "Invalid if construct in %s TRE in XML ressource : "
-+ "Invalid if construct in %s TRE in XML resource : "
- "missing or invalid 'cond' attribute",
- pszTREName );
- *pbError = TRUE;
---- a/frmts/vrt/vrtsources.cpp
-+++ b/frmts/vrt/vrtsources.cpp
-@@ -217,7 +217,7 @@ CPLXMLNode *VRTSimpleSource::SerializeTo
- if ( strstr(poDS->GetDescription(), "/vsicurl/http") != NULL ||
- strstr(poDS->GetDescription(), "/vsicurl/ftp") != NULL )
- {
-- /* Testing the existence of remote ressources can be excruciating */
-+ /* Testing the existence of remote resources can be excruciating */
- /* slow, so let's just suppose they exist */
- pszRelativePath = poDS->GetDescription();
- bRelativeToVRT = FALSE;
-@@ -571,7 +571,7 @@ void VRTSimpleSource::GetFileList(char**
- if ( strstr(pszFilename, "/vsicurl/http") != NULL ||
- strstr(pszFilename, "/vsicurl/ftp") != NULL )
- {
-- /* Testing the existence of remote ressources can be excruciating */
-+ /* Testing the existence of remote resources can be excruciating */
- /* slow, so let's just suppose they exist */
- }
- else
---- a/ogr/ogrsf_frmts/edigeo/drv_edigeo.html
-+++ b/ogr/ogrsf_frmts/edigeo/drv_edigeo.html
-@@ -22,7 +22,7 @@ The driver must be provided with the .TH
- read the associated .DIC, .GEO, .SCD, .QAL and .VEC files.<p>
-
- In order the SRS of the layers to be correctly built, the IGNF file that contains
--the defintion of IGN SRS must be placed in the directory of PROJ.4 ressource files.<p>
-+the defintion of IGN SRS must be placed in the directory of PROJ.4 resource files.<p>
-
- The whole set of files will be parsed into memory. This may be a limitation if dealing with
- big EDIGEO exchanges.<p>
-@@ -56,7 +56,7 @@ according to the value of xxx=OBJ_OBJ_LN
- <ul>
- <li> <a href="http://georezo.net/wiki/main/donnees/edigeo">Introduction to the EDIGEO standard</a> (in French)
- <li> <a href="http://georezo.net/wiki/_media/main/geomatique/norme_edigeo.zip">EDIGEO standard - AFNOR NF Z 52000</a> (in French)
--<li> <a href="http://www.craig.fr/contenu/ressources/dossiers/pci/pdf/EDIGeO_PCI.pdf">Standard d'échange des objets du PCI selon la norme EDIGEO</a> (in French)
-+<li> <a href="http://www.craig.fr/contenu/resources/dossiers/pci/pdf/EDIGeO_PCI.pdf">Standard d'échange des objets du PCI selon la norme EDIGEO</a> (in French)
- <li> <a href="http://www.cadastre.gouv.fr">Homepage of the French Digital Cadastral Plan</a> (in French)
- <li> <a href="http://docs.codehaus.org/pages/viewpage.action?pageId=77692976">Geotools EDIGEO module description</a> (in English)
- <li> <a href="http://svn.geotools.org/trunk/modules/unsupported/edigeo/src/test/resources/org/geotools/data/edigeo/test-data/">Sample of EDIGEO data</a>
---- a/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp
-+++ b/ogr/ogrsf_frmts/edigeo/ogredigeodatasource.cpp
-@@ -270,7 +270,7 @@ int OGREDIGEODataSource::ReadGEO()
- poSRS->importFromProj4("+proj=lcc +lat_1=44 +lat_2=49 +lat_0=46.5 +lon_0=3 +x_0=700000 +y_0=6600000 +ellps=GRS81 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs");
- else
- {
-- CPLDebug("EDIGEO", "Cannot resolve %s SRS. Check that the IGNF file is in the directory of PROJ.4 ressource files", osREL.c_str());
-+ CPLDebug("EDIGEO", "Cannot resolve %s SRS. Check that the IGNF file is in the directory of PROJ.4 resource files", osREL.c_str());
- delete poSRS;
- poSRS = NULL;
- }
---- a/port/cpl_vsil_curl.cpp
-+++ b/port/cpl_vsil_curl.cpp
-@@ -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.
- *
-- * Recognized filenames are of the form /vsicurl/http://path/to/remote/ressource or
-- * /vsicurl/ftp://path/to/remote/ressource where path/to/remote/ressource is the
-- * URL of a remote ressource.
-+ * Recognized filenames are of the form /vsicurl/http://path/to/remote/resource or
-+ * /vsicurl/ftp://path/to/remote/resource where path/to/remote/resource is the
-+ * URL of a remote resource.
- *
- * Partial downloads (requires the HTTP server to support random reading) are done
- * with a 16 KB granularity by default. If the driver detects sequential reading
---- a/port/cpl_vsil_curl_streaming.cpp
-+++ b/port/cpl_vsil_curl_streaming.cpp
-@@ -1440,9 +1440,9 @@ int VSICurlStreamingFSHandler::Stat( con
- * be efficient. If you need efficient random access and that the server supports range
- * dowloading, you should use the /vsicurl/ file system handler instead.
- *
-- * Recognized filenames are of the form /vsicurl_streaming/http://path/to/remote/ressource or
-- * /vsicurl_streaming/ftp://path/to/remote/ressource where path/to/remote/ressource is the
-- * URL of a remote ressource.
-+ * Recognized filenames are of the form /vsicurl_streaming/http://path/to/remote/resource or
-+ * /vsicurl_streaming/ftp://path/to/remote/resource where path/to/remote/resource is the
-+ * URL of a remote resource.
- *
- * The GDAL_HTTP_PROXY, GDAL_HTTP_PROXYUSERPWD and GDAL_PROXY_AUTH configuration options can be
- * used to define a proxy server. The syntax to use is the one of Curl CURLOPT_PROXY,
diff --git a/debian/patches/series b/debian/patches/series
index 391702a..3e3fe56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,19 +10,13 @@ spatialite
java.opt
java-make
paramters-typo
-accomodate-typo
inconsistant-typo
consistant-typo
explicitely-typo
ressource-typo
transfered-typo
initalize-typo
-transfering-typo
-bandwith-typo
usefull-typo
-developement-typo
-algoritm-typo
-allows-typo
supress-typo
doc-brief
hardening
diff --git a/debian/patches/spatialite b/debian/patches/spatialite
index 425ac75..76231da 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
-@@ -25265,7 +25265,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25662,7 +25662,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. */
-@@ -25319,7 +25319,7 @@ if ${ac_cv_lib_spatialite_spatialite_ini
+@@ -25716,7 +25716,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. */
-@@ -25411,7 +25411,7 @@ if ${ac_cv_lib_spatialite_spatialite_tar
+@@ -25808,7 +25808,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 1766a70..c306944 100644
--- a/debian/patches/supress-typo
+++ b/debian/patches/supress-typo
@@ -1,260 +1,7 @@
Description: Fix 'supress' typo, replace with 'suppress'.
Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
---- a/apps/ogr_utilities.dox
-+++ b/apps/ogr_utilities.dox
-@@ -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>
--<dt> <b>-so</b>:</dt><dd> Summary Only: supress listing of features, show only the
-+<dt> <b>-so</b>:</dt><dd> Summary Only: suppress listing of features, show only the
- summary information like projection, schema, feature count and
- extents.</dd>
- <dt> <b>-q</b>:</dt><dd> Quiet verbose reporting of various information, including
-@@ -473,7 +473,7 @@ format. Also some information writed to
- <dl>
- <dt><b>--help-general</b>:</dt><dd> Show the usage.</dd>
- <dt><b>-progress</b>:</dt><dd> Show progress.</dd>
--<dt><b>-quiet</b>:</dt><dd> Supress all messages except errors and results.</dd>
-+<dt><b>-quiet</b>:</dt><dd> Suppress all messages except errors and results.</dd>
- <dt><b>-f</b> <em>format_name</em>:</dt><dd> Select an output format name.
- The default is to create a shapefile.</dd>
- <dt> <b>-dsco</b> <em>NAME=VALUE</em>:</dt><dd> Dataset creation option
---- a/NEWS
-+++ b/NEWS
-@@ -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
-- * gdallocationinfo: do not let one off-db pixel cause all the rest to be supressed (#4181)
-+ * gdallocationinfo: do not let one off-db pixel cause all the rest to be suppressed (#4181)
- * 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)
-@@ -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
-- * Avoid supressing warnings and errors when exceptions are used (#3632)
-+ * Avoid suppressing warnings and errors when exceptions are used (#3632)
- * Add gdalinfo.py, ogrinfo.py and ogr2ogr.py as sample scripts, direct ports
- of corresponding C/C++ utilities
- * Allow manipulating buffer > 2 GB on 64bit builds for ReadRaster() and WriteRaster()
---- a/apps/gdalsrsinfo.cpp
-+++ b/apps/gdalsrsinfo.cpp
-@@ -336,7 +336,7 @@ int FindSRS( const char *pszInput, OGRSp
- OGRErr eErr = CE_None;
- int bDebug = FALSE;
-
-- /* temporarily supress error messages we may get from xOpen() */
-+ /* temporarily suppress error messages we may get from xOpen() */
- bDebug = CSLTestBoolean(CPLGetConfigOption("CPL_DEBUG", "OFF"));
- if ( ! bDebug )
- oErrorHandler = CPLSetErrorHandler ( CPLQuietErrorHandler );
---- a/frmts/aigrid/aitest.c
-+++ b/frmts/aigrid/aitest.c
-@@ -115,7 +115,7 @@ int main( int argc, char ** argv )
- AIGInfo_t *psInfo;
- GInt32 *panRaster;
- int i, j;
-- int bMagic = FALSE, bSupressMagic = FALSE;
-+ int bMagic = FALSE, bSuppressMagic = FALSE;
- int iTestTileX = 0, iTestTileY = 0;
-
- /* -------------------------------------------------------------------- */
-@@ -127,7 +127,7 @@ int main( int argc, char ** argv )
- bMagic = TRUE;
-
- else if( EQUAL(argv[1],"-nomagic") )
-- bSupressMagic = TRUE;
-+ bSuppressMagic = TRUE;
-
- else if( EQUAL(argv[1],"-t") && argc > 2 )
- {
-@@ -184,7 +184,7 @@ int main( int argc, char ** argv )
- /* Do we want a dump of all the ``magic'' numbers for */
- /* instantated blocks? */
- /* -------------------------------------------------------------------- */
-- if( !bSupressMagic )
-+ if( !bSuppressMagic )
- DumpMagic( psInfo, bMagic );
-
- /* -------------------------------------------------------------------- */
---- a/frmts/ecw/ecwcreatecopy.cpp
-+++ b/frmts/ecw/ecwcreatecopy.cpp
-@@ -817,7 +817,7 @@ CPLErr GDALECWCompressor::Initialize(
-
- pszOption = CSLFetchNameValue(papszOptions, "GEODATA_USAGE");
- if( pszOption == NULL )
-- // Default to supressing ECW SDK geodata, just use our own stuff.
-+ // Default to suppressing ECW SDK geodata, just use our own stuff.
- SetGeodataUsage( JP2_GEODATA_USE_NONE );
- else if( EQUAL(pszOption,"NONE") )
- SetGeodataUsage( JP2_GEODATA_USE_NONE );
---- a/frmts/gdalallregister.cpp
-+++ b/frmts/gdalallregister.cpp
-@@ -532,7 +532,7 @@ void CPL_STDCALL GDALAllRegister()
- GDALRegister_IRIS();
- #endif
- /* -------------------------------------------------------------------- */
--/* Deregister any drivers explicitly marked as supressed by the */
-+/* Deregister any drivers explicitly marked as suppressed by the */
- /* GDAL_SKIP environment variable. */
- /* -------------------------------------------------------------------- */
- GetGDALDriverManager()->AutoSkipDrivers();
---- a/frmts/zlib/deflate.h
-+++ b/frmts/zlib/deflate.h
-@@ -188,7 +188,7 @@ typedef struct internal_state {
- int nice_match; /* Stop searching when current match exceeds this */
-
- /* used by trees.c: */
-- /* Didn't use ct_data typedef below to supress compiler warning */
-+ /* Didn't use ct_data typedef below to suppress compiler warning */
- struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
- struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
- struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
---- a/gcore/gdaljp2metadata.cpp
-+++ b/gcore/gdaljp2metadata.cpp
-@@ -900,7 +900,7 @@ int GDALJP2Metadata::ParseGMLCoverageDes
- "FALSE" ) ) )
- {
- bNeedAxisFlip = FALSE;
-- CPLDebug( "GMLJP2", "Supressed axis flipping based on GDAL_IGNORE_AXIS_ORIENTATION." );
-+ CPLDebug( "GMLJP2", "Suppressed axis flipping based on GDAL_IGNORE_AXIS_ORIENTATION." );
- }
-
- if( bNeedAxisFlip )
-@@ -1119,7 +1119,7 @@ GDALJP2Box *GDALJP2Metadata::CreateGMLJP
- "FALSE" ) ) )
- {
- bNeedAxisFlip = FALSE;
-- CPLDebug( "GMLJP2", "Supressed axis flipping on write based on GDAL_IGNORE_AXIS_ORIENTATION." );
-+ CPLDebug( "GMLJP2", "Suppressed axis flipping on write based on GDAL_IGNORE_AXIS_ORIENTATION." );
- }
-
- if( bNeedAxisFlip )
---- a/gcore/gdalpamdataset.cpp
-+++ b/gcore/gdalpamdataset.cpp
-@@ -859,7 +859,7 @@ CPLErr GDALPamDataset::CloneInfo( GDALDa
- PamInitialize();
-
- /* -------------------------------------------------------------------- */
--/* Supress NotImplemented error messages - mainly needed if PAM */
-+/* Suppress NotImplemented error messages - mainly needed if PAM */
- /* disabled. */
- /* -------------------------------------------------------------------- */
- SetMOFlags( nSavedMOFlags | GMO_IGNORE_UNIMPLEMENTED );
---- a/gcore/gdalpamrasterband.cpp
-+++ b/gcore/gdalpamrasterband.cpp
-@@ -485,7 +485,7 @@ CPLErr GDALPamRasterBand::CloneInfo( GDA
- PamInitialize();
-
- /* -------------------------------------------------------------------- */
--/* Supress NotImplemented error messages - mainly needed if PAM */
-+/* Suppress NotImplemented error messages - mainly needed if PAM */
- /* disabled. */
- /* -------------------------------------------------------------------- */
- SetMOFlags( nSavedMOFlags | GMO_IGNORE_UNIMPLEMENTED );
---- a/man/man1/gdal_fillnodata.1
-+++ b/man/man1/gdal_fillnodata.1
-@@ -24,7 +24,7 @@ The gdal_fillnodata.py script fills sele
- Additional details on the algorithm are available in the GDALFillNodata() docs.
- .PP
- .IP "\fB\fB-q\fP:\fP" 1c
--The script runs in quiet mode. The progress monitor is supressed and routine messages are not displayed.
-+The script runs in quiet mode. The progress monitor is suppressed and routine messages are not displayed.
- .PP
- .IP "\fB\fB-md\fP \fImax_distance\fP:\fP" 1c
- The maximum distance (in pixels) that the algorithm will search out for values to interpolate.
---- a/man/man1/gdal_polygonize.1
-+++ b/man/man1/gdal_polygonize.1
-@@ -52,7 +52,7 @@ The name of the layer created to hold th
- The name of the field to create (defaults to 'DN').
- .PP
- .IP "\fB\fB-q\fP:\fP" 1c
--The script runs in quiet mode. The progress monitor is supressed and routine messages are not displayed.
-+The script runs in quiet mode. The progress monitor is suppressed and routine messages are not displayed.
- .PP
- .PP
- .PP
---- a/man/man1/gdal_sieve.1
-+++ b/man/man1/gdal_sieve.1
-@@ -23,7 +23,7 @@ The gdal_sieve.py script removes raster
- Additional details on the algorithm are available in the GDALSieveFilter() docs.
- .PP
- .IP "\fB\fB-q\fP:\fP" 1c
--The script runs in quiet mode. The progress monitor is supressed and routine messages are not displayed.
-+The script runs in quiet mode. The progress monitor is suppressed and routine messages are not displayed.
- .PP
- .IP "\fB\fB-st\fP \fIthreshold\fP:\fP" 1c
- Set the size threshold in pixels. Only raster polygons smaller than this size will be removed.
---- a/man/man1/ogrinfo.1
-+++ b/man/man1/ogrinfo.1
-@@ -30,7 +30,7 @@ Open the data source in read-only mode.
- .IP "\fB\fB-al\fP:\fP" 1c
- List all features of all layers (used instead of having to give layer names as arguments).
- .IP "\fB\fB-so\fP:\fP" 1c
--Summary Only: supress listing of features, show only the summary information like projection, schema, feature count and extents.
-+Summary Only: suppress listing of features, show only the summary information like projection, schema, feature count and extents.
- .IP "\fB\fB-q\fP:\fP" 1c
- Quiet verbose reporting of various information, including coordinate system, layer schema, extents, and feature count.
- .IP "\fB\fB-where\fP \fIrestricted_where\fP:\fP" 1c
---- a/man/man1/ogrlineref.1
-+++ b/man/man1/ogrlineref.1
-@@ -43,7 +43,7 @@ Show the usage.
- .IP "\fB\fB-progress\fP:\fP" 1c
- Show progress.
- .IP "\fB\fB-quiet\fP:\fP" 1c
--Supress all messages except errors and results.
-+Suppress all messages except errors and results.
- .IP "\fB\fB-f\fP \fIformat_name\fP:\fP" 1c
- Select an output format name. The default is to create a shapefile.
- .IP "\fB\fB-dsco\fP \fINAME=VALUE\fP:\fP" 1c
---- a/nmake.opt
-+++ b/nmake.opt
-@@ -141,7 +141,7 @@ OPTFLAGS= $(CXX_PDB_FLAGS) /nologo /MD /
- !ENDIF # OPTFLAGS
-
- #
--# Set flags controlling warnings level, and supression of some warnings.
-+# Set flags controlling warnings level, and suppression of some warnings.
- #
- !IFNDEF WARNFLAGS
- WARNFLAGS = /W4 /wd4127 /wd4251 /wd4275 /wd4786 /wd4100 /wd4245 /wd4206 /wd4018 /wd4389
---- a/ogr/ogr_core.h
-+++ b/ogr/ogr_core.h
-@@ -158,7 +158,7 @@ typedef struct
- * Simple container for a bounding region in 3D.
- */
-
--#if defined(__cplusplus) && !defined(CPL_SUPRESS_CPLUSPLUS)
-+#if defined(__cplusplus) && !defined(CPL_SURESS_CPLUSPLUS)
- class CPL_DLL OGREnvelope3D : public OGREnvelope
- {
- public:
---- a/ogr/ogrct.cpp
-+++ b/ogr/ogrct.cpp
-@@ -941,7 +941,7 @@ int OGRProj4CT::TransformEx( int nCount,
- /* -------------------------------------------------------------------- */
- /* Try to report an error through CPL. Get proj.4 error string */
- /* if possible. Try to avoid reporting thousands of error */
--/* ... supress further error reporting on this OGRProj4CT if we */
-+/* ... suppress further error reporting on this OGRProj4CT if we */
- /* have already reported 20 errors. */
- /* -------------------------------------------------------------------- */
- if( err != 0 )
-@@ -973,7 +973,7 @@ int OGRProj4CT::TransformEx( int nCount,
- else if( nErrorCount == 20 )
- {
- CPLError( CE_Failure, CPLE_AppDefined,
-- "Reprojection failed, err = %d, further errors will be supressed on the transform object.",
-+ "Reprojection failed, err = %d, further errors will be suppressed on the transform object.",
- err );
- }
-
--- a/ogr/ogrsf_frmts/arcobjects/aolayer.cpp
+++ b/ogr/ogrsf_frmts/arcobjects/aolayer.cpp
@@ -37,7 +37,7 @@
@@ -295,50 +42,6 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
bool m_forceMulti;
};
---- a/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp
-+++ b/ogr/ogrsf_frmts/avc/ogravcbindatasource.cpp
-@@ -75,7 +75,7 @@ int OGRAVCBinDataSource::Open( const cha
-
- {
- /* -------------------------------------------------------------------- */
--/* Open the source file. Supress error reporting if we are in */
-+/* Open the source file. Suppress error reporting if we are in */
- /* TestOpen mode. */
- /* -------------------------------------------------------------------- */
- if( bTestOpen )
---- a/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp
-+++ b/ogr/ogrsf_frmts/avc/ogravce00datasource.cpp
-@@ -73,7 +73,7 @@ int OGRAVCE00DataSource::Open( const cha
-
- {
- /* -------------------------------------------------------------------- */
--/* Open the source file. Supress error reporting if we are in */
-+/* Open the source file. Suppress error reporting if we are in */
- /* TestOpen mode. */
- /* -------------------------------------------------------------------- */
- int bCompressed = FALSE;
---- a/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp
-+++ b/ogr/ogrsf_frmts/dwg/ogrdwg_dimension.cpp
-@@ -297,7 +297,7 @@ the approach is as above in all these ca
- /* feature for the next feature read. */
- /* -------------------------------------------------------------------- */
-
-- // a single space supresses labelling.
-+ // a single space suppresses labelling.
- if( osText == " " )
- return poFeature;
-
---- a/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp
-+++ b/ogr/ogrsf_frmts/dxf/ogrdxf_dimension.cpp
-@@ -307,7 +307,7 @@ the approach is as above in all these ca
- /* feature for the next feature read. */
- /* -------------------------------------------------------------------- */
-
-- // a single space supresses labelling.
-+ // a single space suppresses labelling.
- if( osText == " " )
- return poFeature;
-
--- a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
@@ -47,7 +47,7 @@ using std::wstring;
@@ -350,7 +53,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
{
}
-@@ -2360,7 +2360,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
+@@ -2537,7 +2537,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
default:
{
@@ -359,7 +62,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
{
foundBadColumn = true;
CPLError( CE_Warning, CPLE_AppDefined,
-@@ -2372,7 +2372,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
+@@ -2549,7 +2549,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
}
if (foundBadColumn)
@@ -370,7 +73,7 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
*ppFeature = pOutFeature;
--- a/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp
+++ b/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp
-@@ -47,7 +47,7 @@ FGdbResultLayer::FGdbResultLayer(FGdbDat
+@@ -48,7 +48,7 @@ FGdbResultLayer::FGdbResultLayer(FGdbDat
m_pDS = pParentDataSource;
osSQL = pszSQL;
@@ -390,102 +93,14 @@ Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
bool m_forceMulti;
bool OGRFeatureFromGdbRow(Row* pRow, OGRFeature** ppFeature);
---- a/port/cpl_error.cpp
-+++ b/port/cpl_error.cpp
-@@ -139,7 +139,7 @@ void* CPL_STDCALL CPLGetErrorHandlerUser
- *
- * The default behaviour of CPLError() is to report errors to stderr,
- * and to abort() after reporting a CE_Fatal error. It is expected that
-- * some applications will want to supress error reporting, and will want to
-+ * some applications will want to suppress error reporting, and will want to
- * install a C++ exception, or longjmp() approach to no local fatal error
- * recovery.
- *
---- a/swig/include/python/python_exceptions.i
-+++ b/swig/include/python/python_exceptions.i
-@@ -11,7 +11,7 @@ void CPL_STDCALL
- PythonBindingErrorHandler(CPLErr eclass, int code, const char *msg )
- {
- /*
-- ** Generally we want to supress error reporting if we have exceptions
-+ ** Generally we want to suppress error reporting if we have exceptions
- ** enabled as the error message will be in the exception thrown in
- ** Python.
- */
---- a/swig/java/javadoc.java
-+++ b/swig/java/javadoc.java
-@@ -195,7 +195,7 @@ public class gdal:public static int SetE
- * <p>
- * The default behaviour of Error() is to report errors to stderr,
- * and to abort() after reporting a gdalconst.CE_Fatal error. It is expected that
-- * some applications will want to supress error reporting, and will want to
-+ * some applications will want to suppress error reporting, and will want to
- * install a C++ exception, or longjmp() approach to no local fatal error
- * recovery.
- * <p>
---- a/swig/python/extensions/gdal_wrap.cpp
-+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -2883,7 +2883,7 @@ void CPL_STDCALL
- PythonBindingErrorHandler(CPLErr eclass, int code, const char *msg )
- {
- /*
-- ** Generally we want to supress error reporting if we have exceptions
-+ ** Generally we want to suppress error reporting if we have exceptions
- ** enabled as the error message will be in the exception thrown in
- ** Python.
- */
---- a/swig/python/extensions/ogr_wrap.cpp
-+++ b/swig/python/extensions/ogr_wrap.cpp
-@@ -2937,7 +2937,7 @@ void CPL_STDCALL
- PythonBindingErrorHandler(CPLErr eclass, int code, const char *msg )
- {
- /*
-- ** Generally we want to supress error reporting if we have exceptions
-+ ** Generally we want to suppress error reporting if we have exceptions
- ** enabled as the error message will be in the exception thrown in
- ** Python.
- */
---- a/swig/python/extensions/osr_wrap.cpp
-+++ b/swig/python/extensions/osr_wrap.cpp
-@@ -2900,7 +2900,7 @@ void CPL_STDCALL
- PythonBindingErrorHandler(CPLErr eclass, int code, const char *msg )
- {
- /*
-- ** Generally we want to supress error reporting if we have exceptions
-+ ** Generally we want to suppress error reporting if we have exceptions
- ** enabled as the error message will be in the exception thrown in
- ** Python.
- */
---- a/swig/python/scripts/gdal_fillnodata.dox
-+++ b/swig/python/scripts/gdal_fillnodata.dox
-@@ -22,7 +22,7 @@ docs.
- <dl>
-
- <dt> <b>-q</b>:</dt><dd>
--The script runs in quiet mode. The progress monitor is supressed and routine
-+The script runs in quiet mode. The progress monitor is suppressed and routine
- messages are not displayed.
-
- <dt> <b>-md</b> <i>max_distance</i>:</dt><dd>
---- a/swig/python/scripts/gdal_polygonize.dox
-+++ b/swig/python/scripts/gdal_polygonize.dox
-@@ -60,7 +60,7 @@ file to be created. Default is GML.
- </dd>
-
- <dt> <b>-q</b>:</dt><dd>
--The script runs in quiet mode. The progress monitor is supressed and routine
-+The script runs in quiet mode. The progress monitor is suppressed and routine
- messages are not displayed.
- </dd>
-
---- a/swig/python/scripts/gdal_sieve.dox
-+++ b/swig/python/scripts/gdal_sieve.dox
-@@ -23,7 +23,7 @@ docs.
- <dl>
-
- <dt> <b>-q</b>:</dt><dd>
--The script runs in quiet mode. The progress monitor is supressed and routine
-+The script runs in quiet mode. The progress monitor is suppressed and routine
- messages are not displayed.
-
- <dt> <b>-st</b> <i>threshold</i>:</dt><dd>
+--- a/NEWS
++++ b/NEWS
+@@ -204,7 +204,7 @@ Utilities:
+ * pct2rgb.py: make it work with color tables with less than 256 entries (#5555)
+ * gdal_fillnodata.py: FillNodata: copy no data value to destination band when creating a dataset (if available) (#4625)
+ * gdal_proximity.py: add a -use_input_nodata flag
+- * gdalcompare.py: add options to supress selected comparisons
++ * gdalcompare.py: add options to suppress selected comparisons
+ * gdalcompare.py: takes into account differences in overview bands
+ * gdalcompare.py: compute difference on float to avoid integer underflow
+ * epsg_tr.py: change to make it possible to export GEOCCS and COMPD_CS to proj.4 epsg and PostGIS spatial_ref_sys.sql files
diff --git a/debian/patches/symver b/debian/patches/symver
index 18a91e2..ea7afb4 100644
--- a/debian/patches/symver
+++ b/debian/patches/symver
@@ -3,7 +3,7 @@ Author: Francesco Paolo Lovergine <frankie at debian.org>
Last-Update: 2011-09-27
--- a/GNUmakefile
+++ b/GNUmakefile
-@@ -41,7 +41,8 @@ $(LIBGDAL): $(GDAL_OBJ:.o=.lo)
+@@ -39,7 +39,8 @@ $(LIBGDAL): $(GDAL_OBJ:.o=.lo)
$(LD) $(LDFLAGS) $(LIBS) -o $@ $(GDAL_OBJ:.o=.lo) \
-rpath $(INST_LIB) \
-no-undefined \
diff --git a/debian/patches/transfered-typo b/debian/patches/transfered-typo
index ed20dcd..beffb9b 100644
--- a/debian/patches/transfered-typo
+++ b/debian/patches/transfered-typo
@@ -1,49 +1,37 @@
Description: Fix 'transfered' typo, replace with 'transferred'.
Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
---- a/ogr/ogrsf_frmts/generic/ogrunionlayer.h
-+++ b/ogr/ogrsf_frmts/generic/ogrunionlayer.h
-@@ -102,7 +102,7 @@ class OGRUnionLayer : public OGRLayer
- public:
- OGRUnionLayer( const char* pszName,
- int nSrcLayers, /* must be >= 1 */
-- OGRLayer** papoSrcLayers, /* array itself ownership always transfered, layer ownership depending on bTakeLayerOwnership */
-+ OGRLayer** papoSrcLayers, /* array itself ownership always transferred, layer ownership depending on bTakeLayerOwnership */
- int bTakeLayerOwnership);
+--- a/MIGRATION_GUIDE.TXT
++++ b/MIGRATION_GUIDE.TXT
+@@ -24,7 +24,7 @@ C++ API:
- virtual ~OGRUnionLayer();
---- a/ogr/ogrsf_frmts/pg/drv_pg.html
-+++ b/ogr/ogrsf_frmts/pg/drv_pg.html
-@@ -140,7 +140,7 @@ Ignored by CreateLayer() that uses the F
- <!-- Little interest to advertize PG_USE_TEXT... Just to keep it mind it exists for example for debugging -->
- <!-- <li><b>PG_USE_TEXT</b>: (GDAL >= 1.8.0) If set to "YES", geometries will be fetched as text instead of their default HEXEWKB form.</li></p> -->
- <li><b>PG_USE_BASE64</b>: (GDAL >= 1.8.0) If set to "YES", geometries will be fetched as BASE64 encoded EWKB instead of canonical HEX encoded EWKB.
--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>
- <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
-@@ -205,7 +205,7 @@ bool VSIMemFile::SetLength( vsi_l_offset
- if( !bOwnData )
- {
- CPLError(CE_Failure, CPLE_NotSupported,
-- "Cannot extended in-memory file whose ownership was not transfered");
-+ "Cannot extended in-memory file whose ownership was not transferred");
- return false;
- }
-
---- a/swig/python/samples/README
-+++ b/swig/python/samples/README
-@@ -28,7 +28,7 @@ gdalfilter.py Example script for applyi
- files as an intermediate representation.
+ * OGRLayer::GetInfo() has been removed.
- gdal_retile.py Script for restructuring data in a tree of regular tiles.
-- (transfered in swig/python/scripts)
-+ (transferred in swig/python/scripts)
+- * All methods of OGRDataSource have been transfered to GDALDataset, except
++ * All methods of OGRDataSource have been transferred to GDALDataset, except
+ SyncToDisk() that should now be implemented as FlushCache() in drivers.
- get_soundg.py Script to copy the SOUNDG layer from an S-57 file to
- a Shapefile, splitting up features with MULTIPOINT
+ * GDALOpenInfo::papszSiblingFiles member is now private. Use the new
+--- a/ogr/ogrsf_frmts/cartodb/drv_cartodb.html
++++ b/ogr/ogrsf_frmts/cartodb/drv_cartodb.html
+@@ -93,7 +93,7 @@ can cause performance penalties when iss
+
+ So, on a newly created layer, the INSERT of CreateFeature() operations are grouped together
+ in chunks until they reach 15 MB (can be changed with the CARTODB_MAX_CHUNK_SIZE
+-configuration option, with a value in MB), at which point they are transfered
++configuration option, with a value in MB), at which point they are transferred
+ to the server. By setting CARTODB_MAX_CHUNK_SIZE to 0, immediate transfer occurs.<p>
+
+ <h2>SQL</h2>
+--- a/ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html
++++ b/ogr/ogrsf_frmts/gpkg/drv_geopackage_raster.html
+@@ -125,7 +125,7 @@ lossy compression (JPEG, WebP). To avoid
+ database next to the main GeoPackage file to store partial GeoPackage tiles in a
+ lossless (and uncompressed) way. Once a tile has received data for its four quadrants
+ and for all the bands (or the dataset is closed or explicitly flushed with FlushCache()),
+-those uncompressed tiles are definitely transfered to the GeoPackage file with
++those uncompressed tiles are definitely transferred to the GeoPackage file with
+ the appropriate compression. All of this is transparent to the user of GDAL API/utilities</p>
+
+ <h3><a id="tile_formats">Tile formats</a></h3>
diff --git a/debian/patches/transfering-typo b/debian/patches/transfering-typo
deleted file mode 100644
index bf86240..0000000
--- a/debian/patches/transfering-typo
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix 'transfering' typo, replace with 'transferring'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
-
---- a/frmts/grib/degrib18/degrib/grib2api.c
-+++ b/frmts/grib/degrib18/degrib/grib2api.c
-@@ -1083,7 +1083,7 @@ void unpk_g2ncep (CPL_UNUSED sInt4 * kfi
- *ibitmap = 0;
- }
-
-- /* Check type of original field, before transfering the memory. */
-+ /* Check type of original field, before transferring the memory. */
- myAssert (*ns5 > 20);
- /* Check if NCEP had problems expanding the data. If so we currently
- * abort. May need to revisit this behavior. */
---- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-@@ -3648,7 +3648,7 @@ int OGROSMDataSource::TransferToDiskIfNe
- CPLString osNewTmpDBName;
- osNewTmpDBName = CPLGenerateTempFilename("osm_tmp_nodes");
-
-- CPLDebug("OSM", "%s too big for RAM. Transfering it onto disk in %s",
-+ CPLDebug("OSM", "%s too big for RAM. Transferring it onto disk in %s",
- osNodesFilename.c_str(), osNewTmpDBName.c_str());
-
- if( CPLCopyFile( osNewTmpDBName, osNodesFilename ) != 0 )
-@@ -3727,7 +3727,7 @@ int OGROSMDataSource::TransferToDiskIfNe
-
- osNewTmpDBName = CPLGenerateTempFilename("osm_tmp");
-
-- CPLDebug("OSM", "%s too big for RAM. Transfering it onto disk in %s",
-+ CPLDebug("OSM", "%s too big for RAM. Transferring it onto disk in %s",
- osTmpDBName.c_str(), osNewTmpDBName.c_str());
-
- if( CPLCopyFile( osNewTmpDBName, osTmpDBName ) != 0 )
diff --git a/debian/patches/usefull-typo b/debian/patches/usefull-typo
index 1fb9104..306cb1a 100644
--- a/debian/patches/usefull-typo
+++ b/debian/patches/usefull-typo
@@ -1,20 +1,48 @@
Description: Fix 'usefull' typo, replace with 'useful'.
Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5756
-Applied-Upstream: 2.0, http://trac.osgeo.org/gdal/changeset/28039
+Forwarded: http://trac.osgeo.org/gdal/ticket/5995
--- a/NEWS
+++ b/NEWS
-@@ -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/
-- * Add VSIBufferedReaderHandle class that is usefull to improve performance when
-+ * Add VSIBufferedReaderHandle class that is useful to improve performance when
- 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
-@@ -2938,7 +2938,7 @@ Port:
+@@ -818,7 +818,7 @@ Shapefile driver:
+ * make REPACK compact .shp if SetFeature() is called and changes one geometry size (#5706)
+ * add check not to cut unicode character while cut the string lengnt for field max length during SetFeature
+ * avoid reading whole .shx at open time for /vsicurl/
+- * add SHAPE_REWIND_ON_WRITE configuration option that can be set to NO to disable correction of ring winding order on write. Usefull when dealing with MultiPolygon that are MultiPatch objects in fact (#5888)
++ * add SHAPE_REWIND_ON_WRITE configuration option that can be set to NO to disable correction of ring winding order on write. Useful when dealing with MultiPolygon that are MultiPatch objects in fact (#5888)
+ * Make ENCODING layer creation option prioritary over SHAPE_ENCODING config. option
+
+ SOSI driver:
+@@ -1064,8 +1064,8 @@ Utilities:
+ * gdal_translate: fix output file naming scheme in gdal_translate -sds (#5119)
+ * gdal_translate: fix logic in detection non-gray color table level (#5245)
+ * gdal_translate: add a -norat option
+- * gdal_translate: don't add 0.1 when -scale is used with a dstmin equal to dstmax (usefull to generate a raster with uniform color, i.e. scaleRatio = 0)
+- * gdal_translate: use floor() to compute image coordinates from world coordinates when specifying -projwin (usefull when extracting from left or top of upper-left corner, which generate negative image coordinates) (#5367)
++ * gdal_translate: don't add 0.1 when -scale is used with a dstmin equal to dstmax (useful to generate a raster with uniform color, i.e. scaleRatio = 0)
++ * gdal_translate: use floor() to compute image coordinates from world coordinates when specifying -projwin (useful when extracting from left or top of upper-left corner, which generate negative image coordinates) (#5367)
+ * gdaltindex: remove annoying warning 'Warning 1: Field location of width 255 truncated to 254' (#5121)
+ * gdaltindex: add -src_srs_name and -src_srs_format to go with MapServer RFC100; add also a -f and -lyr_name options to be able to create a non-shapefile tileindex
+ * gdalwarp: Fix segfault where metadata values weren't being nullchecked properly during conflict resolution (#5069)
+@@ -1354,7 +1354,7 @@ Core:
+ * introduce OGRLayer::FindFieldIndex() / OGR_L_FindFieldIndex() to lookup potentially laundered field names (RFC 42)
+ * OGR SQL: upgrade to support RFC 41 (multiple geometry fields)
+ * OGR SQL: more stricter checks
+- * OGR SQL: make parsing error report a usefull hint where the syntax error occured
++ * OGR SQL: make parsing error report a useful hint where the syntax error occured
+ * OGR SQL: fix thread-safety of swq_op_registrar::GetOperator() (#5196)
+ * OGR SQL: support not explicitly specifying AS keyword for aliasing a column spec
+ * OGR SQL: don't call CONCAT(a_column ...) or SUBSTR(a_column ...) as a_column
+@@ -1513,7 +1513,7 @@ LIBKML driver:
+ * when writing a .kmz file, put layers .kml docs into a layers/ subdirectory
+ * fix mem leaks, and use after free in kml2FeatureDef() (#5240)
+ * create document with default namespace set to http://www.opengis.net/kml/2.2
+- * when writing, consider empty strings as unset (usefull when converting from CSV)
++ * when writing, consider empty strings as unset (useful when converting from CSV)
+ * don't write empty <Style /> element if OGR_STYLE is empty string
+ * transform multigeometry with one single component into single geometry
+ * create libkml/ subdirectory entry in .kmz
+@@ -3511,7 +3511,7 @@ Port:
Core:
* RFC 24: progressive/async raster reading
* On Unix, add capability of opening the target of a symlink through GDALOpen()
@@ -23,7 +51,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().
-@@ -3358,7 +3358,7 @@ Core:
+@@ -3931,7 +3931,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,559 +60,89 @@ 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
-@@ -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.
-- (usefull when bandwidth is the limiting factor)
-+ (useful when bandwidth is the limiting factor)
- * Don't instanciate layer defn at layer creation. This can speed up
- significantly database opening when they are many tables and the user just
- needs to fetch one with GetLayerByName().
--- a/apps/ogr_utilities.dox
+++ b/apps/ogr_utilities.dox
-@@ -246,7 +246,7 @@ GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOL
+@@ -266,7 +266,7 @@ types.
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
+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.
-@@ -319,7 +319,7 @@ We can use the 'identity' setting to spe
- This setting should be used along with the -append setting.</dd>
- <dt> <b>-addfields</b>:</dt><dd>(starting with GDAL 1.11) This is a specialized version of
- -append. Contrary to -append, -addfields has the effect of adding, to existing target layers,
--the new fields found in source layers. This option is usefull when merging files that have non-strictly
-+the new fields found in source layers. This option is useful when merging files that have non-strictly
- identical structures.
- This might not work for output formats that don't support adding fields to existing non-empty layers.</dd>
- </dl>
-@@ -527,4 +527,4 @@ Dmitry Baryshnikov <polimax at mail.ru>
-
- \endif
-
--*/
-\ No newline at end of file
-+*/
---- a/doc/gdal_drivertut.dox
-+++ b/doc/gdal_drivertut.dox
-@@ -447,7 +447,7 @@ void GDALRegister_JDEM()
-
- Note the use of GDAL_CHECK_VERSION macro (starting with GDAL 1.5.0).
- This is an optional macro for drivers inside GDAL tree that don't depend on external libraries,
--but that can be very usefull if you compile your driver as a plugin (that is to say, an out-of-tree
-+but that can be very useful if you compile your driver as a plugin (that is to say, an out-of-tree
- driver). As the GDAL C++ ABI may, and will, change between GDAL releases (for example from GDAL 1.5.0 to 1.6.0),
- it may be necessary to recompile your driver against the header files of the GDAL version with
- 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
-@@ -277,7 +277,7 @@ class GTiffDataset : public GDALPamDatas
-
- toff_t nDirOffset;
- int bBase;
-- int bCloseTIFFHandle; /* usefull for closing TIFF handle opened by GTIFF_DIR: */
-+ int bCloseTIFFHandle; /* useful for closing TIFF handle opened by GTIFF_DIR: */
-
- uint16 nPlanarConfig;
- uint16 nSamplesPerPixel;
-@@ -776,7 +776,7 @@ GTiffRasterBand::~GTiffRasterBand()
-
- /* Reads directly bytes from the file using ReadMultiRange(), and by-pass */
- /* block reading. Restricted to simple TIFF configurations (un-tiled, */
--/* uncompressed data, standard data types). Particularly usefull to extract */
-+/* uncompressed data, standard data types). Particularly useful to extract */
- /* sub-windows of data on a large /vsicurl dataset). */
-
- CPLErr GTiffRasterBand::DirectIO( GDALRWFlag eRWFlag,
-@@ -8667,7 +8667,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 );
-
-@@ -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 */
-+ /* useful for debugging purposes */
- #ifdef JPEG_DIRECT_COPY
- if (CSLFetchBoolean(papszCreateOptions, "JPEG_DIRECT_COPY", FALSE) &&
- GTIFF_CanDirectCopyFromJPEG(poSrcDS, papszCreateOptions))
---- a/frmts/gtiff/gt_jpeg_copy.cpp
-+++ b/frmts/gtiff/gt_jpeg_copy.cpp
-@@ -31,7 +31,7 @@
- #include "gt_jpeg_copy.h"
-
- /* Note: JPEG_DIRECT_COPY is not defined by default, because it is mainly */
--/* usefull for debugging purposes */
-+/* useful for debugging purposes */
-
- 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
-@@ -314,8 +314,8 @@ CSF_VS GDALType2ValueScale(
- complex.
-
- If exact is false, conversion to CSF2.0 types will take place. This is
-- usefull for in file cell representations. If exact is true, and exact match
-- is made. This is usefull for in app cell representations.
-+ useful for in file cell representations. If exact is true, and exact match
-+ is made. This is useful for in app cell representations.
-
- If exact is false, this function always returns one of CR_UINT1, CR_INT4
- or CR_REAL4.
---- a/frmts/pdf/frmt_pdf.html
-+++ b/frmts/pdf/frmt_pdf.html
-@@ -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
--to retrieve layer names that can be turned ON or OFF. This is usefull to know which values to specify for the
-+to retrieve layer names that can be turned ON or OFF. This is useful to know which values to specify for the
- <i>GDAL_PDF_LAYERS</i> or <i>GDAL_PDF_LAYERS_OFF</i> configuration options.<p>
-
- For example :
-@@ -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
--the page as extra content. This is usefull to insert logos, legends, etc...
-+the page as extra content. This is useful to insert logos, legends, etc...
- x and y are in user units from the lower left corner of the page, and the anchor point is the lower left pixel of the image.
- scale is a magnifying ratio (use 1 if unsure). If link=some_url is specified, the image will be selectable and its selection
- will cause a web browser to be opened on the specified URL.</p></li>
---- a/frmts/sdts/sdtslinereader.cpp
-+++ b/frmts/sdts/sdtslinereader.cpp
-@@ -73,7 +73,7 @@ SDTSRawLine::~SDTSRawLine()
- int SDTSRawLine::Read( SDTS_IREF * poIREF, DDFRecord * poRecord )
-
- {
-- // E.Rouault: Not sure if this test is really usefull
-+ // E.Rouault: Not sure if this test is really useful
- if( poRecord->GetStringSubfield( "LINE", 0, "MODN", 0 ) == NULL )
- return FALSE;
-
---- a/frmts/vrt/vrtsources.cpp
-+++ b/frmts/vrt/vrtsources.cpp
-@@ -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 */
-- /* instead. This is particularly usefull when dealing with huge VRT */
-+ /* instead. This is particularly useful when dealing with huge VRT */
- /* For example, a VRT with the world coverage of DTED0 (25594 files) */
- CPLXMLNode* psSrcProperties = CPLGetXMLNode(psSrc,"SourceProperties");
- int nRasterXSize = 0, nRasterYSize =0;
---- a/gcore/gdalrasterband.cpp
-+++ b/gcore/gdalrasterband.cpp
-@@ -4766,7 +4766,7 @@ CPLErr CPL_STDCALL GDALCreateMaskBand( G
- /**
- * \brief Compute translation table for color tables.
- *
-- * When the raster band has a palette index, it may be usefull to compute
-+ * When the raster band has a palette index, it may be useful to compute
- * the "translation" of this palette to the palette of another band.
- * The translation tries to do exact matching first, and then approximate
- * matching if no exact matching is possible.
+ (and other target drivers) that implements strict checks for geometry type.
+ Starting with GDAL 2.0, CONVERT_TO_LINEAR can be used to to convert non-linear geometries
+ types into linear geometries by approximating them.</dd>
--- a/man/man1/ogr2ogr.1
+++ b/man/man1/ogr2ogr.1
-@@ -89,7 +89,7 @@ Layer creation option (format specific)
+@@ -97,7 +97,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 [...]
+-Define the geometry type for the created layer. One of NONE, GEOMETRY, POINT, LINESTRING, POLYGON, GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOLYGON or MULTILINESTRING. And CIRCULARSTRING, COMPOUNDCURVE, CURVEPOLYGON, MULTICURVE and MULTISURFACE for GDAL 2.0 non-linear geometry types. 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 linestri [...]
++Define the geometry type for the created layer. One of NONE, GEOMETRY, POINT, LINESTRING, POLYGON, GEOMETRYCOLLECTION, MULTIPOINT, MULTIPOLYGON or MULTILINESTRING. And CIRCULARSTRING, COMPOUNDCURVE, CURVEPOLYGON, MULTICURVE and MULTISURFACE for GDAL 2.0 non-linear geometry types. 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 linestri [...]
.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.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
-@@ -155,7 +155,7 @@ To be combined with -splitlistfields to
- .IP "\fB\fB-fieldmap\fP:\fP" 1c
- (starting with GDAL 1.10.0) Specifies the list of field indexes to be copied from the source to the destination. The (n)th value specified in the list is the index of the field in the target layer definition in which the n(th) field of the source layer must be copied. Index count starts at zero. There must be exactly as many values in the list as the count of the fields in the source layer. We can use the 'identity' setting to specify that the fields should be transferred by using the s [...]
- .IP "\fB\fB-addfields\fP:\fP" 1c
--(starting with GDAL 1.11) This is a specialized version of -append. Contrary to -append, -addfields has the effect of adding, to existing target layers, the new fields found in source layers. This option is usefull when merging files that have non-strictly identical structures. This might not work for output formats that don't support adding fields to existing non-empty layers.
-+(starting with GDAL 1.11) This is a specialized version of -append. Contrary to -append, -addfields has the effect of adding, to existing target layers, the new fields found in source layers. This option is useful when merging files that have non-strictly identical structures. This might not work for output formats that don't support adding fields to existing non-empty layers.
- .PP
- .SH "PERFORMANCE HINTS"
- .PP
---- a/ogr/ogrgeometryfactory.cpp
-+++ b/ogr/ogrgeometryfactory.cpp
-@@ -1039,7 +1039,7 @@ typedef enum
- * with care.
+--- a/frmts/openjpeg/frmt_jp2openjpeg.html
++++ b/frmts/openjpeg/frmt_jp2openjpeg.html
+@@ -110,7 +110,7 @@ are unable to open such files. And regar
+ </p></li>
+
+ <li><p><b>ALPHA=YES/NO</b>: (GDAL >= 2.0) Whether to force encoding last
+-channel as alpha channel. Only usefull if the color interpretation of that channel
++channel as alpha channel. Only useful if the color interpretation of that channel
+ is not already Alpha. Defaults to NO.</p></li>
+
+ <li><p><b>PROFILE=AUTO/UNRESTRICTED/PROFILE_1</b>: (GDAL >= 2.0) Determine
+@@ -205,7 +205,7 @@ be written. Defaults to NO.
+ (EXPERIMENTAL!) When source dataset is JPEG2000, whether to reuse the codestream
+ of the source dataset unmodified. Defaults to NO. Note that enabling that feature might result
+ in inconsistent content of the JP2 boxes w.r.t. to the content of the source codestream.
+-Most other creation options will be ignored in that mode. Can be usefull in some
++Most other creation options will be ignored in that mode. Can be useful in some
+ use cases when adding/correcting georeferencing, metadata, ... INSPIRE_TG and
+ PROFILE options will be ignored, and the profile of the codestream will be overriden
+ with the one specified/implied by the options (which may be inconsistent with
+--- a/gcore/gdalrasterblock.cpp
++++ b/gcore/gdalrasterblock.cpp
+@@ -393,7 +393,7 @@ int GDALRasterBlock::FlushCacheBlock(int
+ * \brief Flush all dirty blocks from cache.
*
- * 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
-+ * the value of the METHOD option of papszOptions (useful to modify the behaviour of the
- * shapefile driver)
+ * This static method is normally used to recover memory and is especially
+- * usefull when doing multi-threaded code that can trigger the block cache.
++ * useful when doing multi-threaded code that can trigger the block cache.
*
- * @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
-@@ -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() */
-- /* on the source array. Very usefull for layers where random access */
-+ /* on the source array. Very useful for layers where random access */
- /* is slow. */
- /* Use case: the GML result of a WFS GetFeature with a SORTBY */
- if (bAlreadySorted)
---- a/ogr/ogrsf_frmts/georss/drv_georss.html
-+++ b/ogr/ogrsf_frmts/georss/drv_georss.html
-@@ -61,7 +61,7 @@ Attributes of first level elements will
-
- Complex content (elements inside first level elements) will be returned as an XML blob.<p>
-
--When a same element is repeated, a number will be appended at the end of the attribute name for the repetitions. This is usefull for the <category> element in RSS and Atom documents for example.<p>
-+When a same element is repeated, a number will be appended at the end of the attribute name for the repetitions. This is useful for the <category> element in RSS and Atom documents for example.<p>
-
- <p>
- The following content :
---- a/ogr/ogrsf_frmts/gml/drv_gml.html
-+++ b/ogr/ogrsf_frmts/gml/drv_gml.html
-@@ -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
--are polygons or multipolygons). This can be usefull when reading some GML application profiles.
-+are polygons or multipolygons). This can be useful when reading some GML application profiles.
- If a <GeometryElementPath> element is specified in the .gfs, the fetching will be limited
- to paths that match the value of <GeometryElementPath>.<p>
- -->
---- a/ogr/ogrsf_frmts/null/ogrnulldriver.cpp
-+++ b/ogr/ogrsf_frmts/null/ogrnulldriver.cpp
-@@ -27,7 +27,7 @@
- * DEALINGS IN THE SOFTWARE.
- ****************************************************************************/
-
--/* NOTE: this driver is only usefull for debugging and is not included in the build process */
-+/* NOTE: this driver is only useful for debugging and is not included in the build process */
- /* To compile it as a pluing under Linux :
- g++ -Wall -DDEBUG -fPIC -g ogr/ogrsf_frmts/null/ogrnulldriver.cpp -shared -o ogr_NULL.so -L. -lgdal -Iport -Igcore -Iogr -Iogr/ogrsf_frmts
- */
---- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-+++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
-@@ -2679,7 +2679,7 @@ int OGROSMDataSource::Open( const char *
- return FALSE;
- }
-
-- /* The following 4 config options are only usefull for debugging */
-+ /* The following 4 config options are only useful for debugging */
- bIndexPoints = CSLTestBoolean(CPLGetConfigOption("OSM_INDEX_POINTS", "YES"));
- bUsePointsIndex = CSLTestBoolean(CPLGetConfigOption("OSM_USE_POINTS_INDEX", "YES"));
- bIndexWays = CSLTestBoolean(CPLGetConfigOption("OSM_INDEX_WAYS", "YES"));
---- a/ogr/ogrsf_frmts/pdf/drv_pdf.html
-+++ b/ogr/ogrsf_frmts/pdf/drv_pdf.html
-@@ -65,7 +65,7 @@ Set the DPI to use. Default to 72.</p></
- 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
--the page as extra content. This is usefull to insert logos, legends, etc...
-+the page as extra content. This is useful to insert logos, legends, etc...
- x and y are in user units from the lower left corner of the page, and the anchor point is the lower left pixel of the image.
- scale is a magnifying ratio (use 1 if unsure). If link=some_url is specified, the image will be selectable and its selection
- 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
-@@ -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 */
-- /* cached. This can be usefull when several SQL layers */
-+ /* cached. This can be useful when several SQL layers */
- /* rely on the same table layer, and use the same spatial */
- /* filters. But as there is in the destructor of OGRGenSQLResultsLayer */
- /* 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
-@@ -774,7 +774,7 @@ OGRLayer * OGRSQLiteExecuteSQL( OGRDataS
- }
- }
-
-- /* The following configuration option is usefull mostly for debugging/testing */
-+ /* The following configuration option is useful mostly for debugging/testing */
- if( pabyEmptyDB != NULL && CSLTestBoolean(CPLGetConfigOption("OGR_SQLITE_DIALECT_USE_SPATIALITE", "YES")) )
- {
- GByte* pabyEmptyDBClone = (GByte*)VSIMalloc(nEmptyDBSize);
---- a/ogr/ogrsf_frmts/vrt/drv_vrt.html
-+++ b/ogr/ogrsf_frmts/vrt/drv_vrt.html
-@@ -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).
--This can be usefull on static data, when getting the feature count from the source layer is slow.</li>
-+This can be useful on static data, when getting the feature count from the source layer is slow.</li>
-
- <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>
-@@ -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>
-
-@@ -292,7 +292,7 @@ the layer as a point layer, and as being
-
- <h2>Example: Renaming attributes</h2>
-
--It can be usefull in some circumstances to be able to rename the field names
-+It can be useful in some circumstances to be able to rename the field names
- from a source layer to other names. This is particularly true when you want
- to transcode to a format whose schema is fixed, such as GPX
- (<name>, <desc>, etc.). This can be accomplished using
---- a/port/cpl_conv.cpp
-+++ b/port/cpl_conv.cpp
-@@ -1531,7 +1531,7 @@ static void CPLAccessConfigOption(const
- * char* pszOldVal = pszOldValTmp ? CPLStrdup(pszOldValTmp) : NULL;
- * // override with new value
- * CPLSetConfigOption(pszKey, pszNewVal);
-- * // do something usefull
-+ * // do something useful
- * // restore old value
- * CPLSetConfigOption(pszKey, pszOldVal);
- * CPLFree(pszOldVal);
---- a/port/cpl_http.cpp
-+++ b/port/cpl_http.cpp
-@@ -522,7 +522,7 @@ void CPLHTTPSetOptions(CURL *http_handle
- /************************************************************************/
-
- /**
-- * \brief Return if CPLHTTP services can be usefull
-+ * \brief Return if CPLHTTP services can be useful
- *
- * Those services depend on GDAL being build with libcurl support.
- *
---- a/swig/java/javadoc.java
-+++ b/swig/java/javadoc.java
-@@ -5062,7 +5062,7 @@ public class org.gdal.gdal.Driver:public
- * Class used to report progression of long operations.
- * <p>
- * This class will not do anything by itself, but it can be subclassed, like <a href="TermProgressCallback.html">TermProgressCallback</a> class.
-- * to do more usefull things.
-+ * to do more useful things.
- *
- * @since Java bindings 1.7.0
- */
---- a/swig/python/scripts/gdal2tiles.py
-+++ b/swig/python/scripts/gdal2tiles.py
-@@ -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
--or find it usefull for your project please let me know.
-+or find it useful for your project please let me know.
- My email: klokan at klokan dot cz.
- I would like to know where it was used.
-
---- a/swig/python/scripts/gdal_retile.py
-+++ b/swig/python/scripts/gdal_retile.py
-@@ -46,7 +46,7 @@ import os
- import math
-
- class AffineTransformDecorator:
-- """ A class providing some usefull methods for affine Transformations """
-+ """ A class providing some useful methods for affine Transformations """
- def __init__(self, transform ):
- self.geotransform=transform
- self.scaleX=self.geotransform[1]
---- a/alg/gdal_rpc.cpp
-+++ b/alg/gdal_rpc.cpp
-@@ -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.
-- * Usefull when elevation offsets of the DEM are not expressed in meters. (GDAL >= 1.8.0)
-+ * Useful when elevation offsets of the DEM are not expressed in meters. (GDAL >= 1.8.0)
- *
- * <li> RPC_DEM: the name of a GDAL dataset (a DEM file typically) used to
- * extract elevation offsets from. In this situation the Z passed into the
---- a/apps/gdaladdo.cpp
-+++ b/apps/gdaladdo.cpp
-@@ -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"
-- "Usefull configuration variables :\n"
-+ "Useful configuration variables :\n"
- " --config USE_RRD YES : Use Erdas Imagine format (.aux) as overview format.\n"
- "Below, only for external overviews in GeoTIFF format:\n"
- " --config COMPRESS_OVERVIEW {JPEG,LZW,PACKBITS,DEFLATE} : TIFF compression\n"
---- a/frmts/wms/frmt_wms.html
-+++ b/frmts/wms/frmt_wms.html
-@@ -188,7 +188,7 @@
- </tr>
- <tr>
- <td class="xml"> <OfflineMode><span class="value">true</span></OfflineMode></td>
-- <td class="desc">Do not download any new images, use only what is in cache. Usefull only with cache enabled. (optional, defaults to false)</td>
-+ <td class="desc">Do not download any new images, use only what is in cache. Useful only with cache enabled. (optional, defaults to false)</td>
- </tr>
- <tr>
- <td class="xml"> <AdviseRead><span class="value">true</span></AdviseRead></td>
---- a/gcore/gdal_priv.h
-+++ b/gcore/gdal_priv.h
-@@ -955,7 +955,7 @@ int CPL_DLL GDALCheckDatasetDimensions(
- int CPL_DLL GDALCheckBandCount( int nBands, int bIsZeroAllowed );
-
-
--// Test if 2 floating point values match. Usefull when comparing values
-+// Test if 2 floating point values match. Useful when comparing values
- // stored as a string at some point. See #3573, #4183, #4506
- #define ARE_REAL_EQUAL(dfVal1, dfVal2) \
- (dfVal1 == dfVal2 || fabs(dfVal1 - dfVal2) < 1e-10 || (dfVal2 != 0 && fabs(1 - dfVal1 / dfVal2) < 1e-10 ))
---- a/gcore/gdaldataset.cpp
-+++ b/gcore/gdaldataset.cpp
-@@ -1870,7 +1870,7 @@ void CPL_STDCALL GDALGetOpenDatasets( GD
- /* GDALCleanOpenDatasetsList() */
- /************************************************************************/
-
--/* Usefull when called from the child of a fork(), to avoid closing */
-+/* Useful when called from the child of a fork(), to avoid closing */
- /* the datasets of the parent at the child termination */
- void GDALNullifyOpenDatasetsList()
- {
---- a/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
-+++ b/ogr/ogrsf_frmts/gpx/ogrgpxlayer.cpp
-@@ -1076,7 +1076,7 @@ OGRFeature *OGRGPXLayer::GetNextFeature(
- static char* OGRGPX_GetXMLCompatibleTagName(const char* pszExtensionsNS,
- const char* pszName)
- {
-- /* Skip "ogr_" for example if NS is "ogr". Usefull for GPX -> GPX roundtrip */
-+ /* Skip "ogr_" for example if NS is "ogr". Useful for GPX -> GPX roundtrip */
- if (strncmp(pszName, pszExtensionsNS, strlen(pszExtensionsNS)) == 0 &&
- pszName[strlen(pszExtensionsNS)] == '_')
- {
---- a/port/cpl_string.cpp
-+++ b/port/cpl_string.cpp
-@@ -2170,7 +2170,7 @@ size_t CPLStrlcat(char* pszDest, const c
- * the specified number of bytes.
- *
- * The CPLStrnlen() function returns MIN(strlen(pszStr), nMaxLen).
-- * Only the first nMaxLen bytes of the string will be read. Usefull to
-+ * Only the first nMaxLen bytes of the string will be read. Useful to
- * 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
-@@ -818,7 +818,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
-
+ * Due to the current design of the block cache, dirty blocks belonging to a same
+ * dataset could be pushed simultanously to the IWriteBlock() method of that
+--- a/ogr/ogrsf_frmts/csv/drv_csv.html
++++ b/ogr/ogrsf_frmts/csv/drv_csv.html
+@@ -148,7 +148,7 @@ Starting with GDAL 2.0, the following op
+ (typically with the -oo name=value parameters of ogrinfo or ogr2ogr):
<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.
+ <li><b>MERGE_SEPARATOR</b>=YES/NO (defaults to NO). Setting it to YES will
+-enable merging consecutive separators. Mostly usefull when it is the space
++enable merging consecutive separators. Mostly useful when it is the space
+ character.</li>
+ <li><b>AUTODETECT_TYPE</b>=YES/NO (defaults to NO). Setting it to YES will
+ enable auto-detection of field data types. If while reading the records
+--- a/ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp
++++ b/ogr/ogrsf_frmts/gpkg/ogrgeopackagelayer.cpp
+@@ -356,7 +356,7 @@ void OGRGeoPackageLayer::BuildFeatureDef
+ const char * pszDeclType = sqlite3_column_decltype(hStmt, iCol);
+
+ // Recognize a geometry column from trying to build the geometry
+- // Usefull for OGRSQLiteSelectLayer
++ // Useful for OGRSQLiteSelectLayer
+ if( nColType == SQLITE_BLOB && m_poFeatureDefn->GetGeomFieldCount() == 0 )
+ {
+ const int nBytes = sqlite3_column_bytes( hStmt, iCol );
+--- a/port/cpl_error.cpp
++++ b/port/cpl_error.cpp
+@@ -537,7 +537,7 @@ void CPL_STDCALL CPLErrorReset()
+ /**
+ * Restore an error state, without emitting an error.
*
-- * 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.
+- * Can be usefull if a routine might call CPLErrorReset() and one wants to
++ * Can be useful if a routine might call CPLErrorReset() and one wants to
+ * preserve the previous error state.
*
---- 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>
-
---- a/man/man1/gdal_edit.1
-+++ b/man/man1/gdal_edit.1
-@@ -27,7 +27,7 @@ It works only with raster formats that s
- Gives a brief usage message for the generic GDAL commandline options and exit.
- .PP
- .IP "\fB\fB-ro\fP:\fP" 1c
--(GDAL >= 1.11) Open the dataset in read-only. Might be usefull for drivers refusing to use the dataset in update-mode. In which case, updated information will go into PAM .aux.xml files.
-+(GDAL >= 1.11) 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.
- .PP
- .IP "\fB\fB-a_srs\fP \fIsrs_def\fP:\fP" 1c
- .PP
+ * @since GDAL 2.0
--
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