[gdal] 29/29: Drop patches applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Jun 14 20:19:47 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 56f8c5e727d58068909fba947e7216ced24f255e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Jun 14 21:14:21 2015 +0200
Drop patches applied upstream.
---
debian/patches/allows-to-typo | 203 ------------------
debian/patches/consistant-typo | 208 ------------------
debian/patches/doc-brief | 24 ---
debian/patches/explicitely-typo | 445 ---------------------------------------
debian/patches/inconsistant-typo | 174 ---------------
debian/patches/java-make | 26 ---
debian/patches/paramater-typo | 49 -----
debian/patches/paramters-typo | 16 --
debian/patches/recommanded-typo | 16 --
debian/patches/ressource-typo | 16 --
debian/patches/series | 13 --
debian/patches/supress-typo | 107 ----------
debian/patches/transfered-typo | 38 ----
debian/patches/usefull-typo | 149 -------------
14 files changed, 1484 deletions(-)
diff --git a/debian/patches/allows-to-typo b/debian/patches/allows-to-typo
deleted file mode 100644
index 8b0057c..0000000
--- a/debian/patches/allows-to-typo
+++ /dev/null
@@ -1,203 +0,0 @@
-Description: Fix 'allows to' typo, replace with 'allows <verb>ing'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29336/
-
---- a/NEWS
-+++ b/NEWS
-@@ -2006,7 +2006,7 @@ NetCDF driver:
- * Fix SetNoDataValue() - do not update when already set to new value (#4484)
- * Convert longitude values in [180,360] interval to [-180,180] (#4512) - override with config option GDAL_NETCDF_CENTERLONG_180=0
- * Support 2D GEOLOCATION arrays when a projected variable has coordinates attribute and supporting lon/at arrays (#4513)
-- * Ignore coordinate and bounds variables (CF sections 5.2, 5.6 and 7.1) as raster bands, but expose them as subdatasets - this allows to open files with projected SRS (or dimension bounds) directly, without specifying the variable as a subdataset
-+ * Ignore coordinate and bounds variables (CF sections 5.2, 5.6 and 7.1) as raster bands, but expose them as subdatasets - this allows opening files with projected SRS (or dimension bounds) directly, without specifying the variable as a subdataset
- * Better support for Gaussian grids - store original latitude values in special Y_VALUES geolocation metadata item and use it for netcdf export (#4514)
- * Write multi-dimensional variables to a single variable (not one for each unrolled band) in CreateCopy() (#2581)
- * Fix handling of km units in netcdf driver and importFromProj4() (#4769)
---- a/configure.in
-+++ b/configure.in
-@@ -1671,7 +1671,7 @@ dnl Not found... again, with -lsz.
- fi
-
- dnl HDF4 library newer than 4.2.5 has a SDreset_maxopenfiles/SDget_maxopenfiles interface
-- dnl which allows to open many HDF files simultaneously (the max number of files was previously
-+ dnl which allows opening many HDF files simultaneously (the max number of files was previously
- dnl hardcoded and too low, smth. like 32). Search for it and use if available.
- AC_CHECK_LIB(mfhdfalt,SDget_maxopenfiles,HDF4_HAS_MAXOPENFILES=yes,HDF4_HAS_MAXOPENFILES=no,$HDF_LIB_NAME)
- if test "$HDF4_HAS_MAXOPENFILES" = "no" ; then
---- a/frmts/e00grid/e00read.c
-+++ b/frmts/e00grid/e00read.c
-@@ -243,7 +243,7 @@ void E00ReadClose(E00ReadPtr psInfo)
- /**********************************************************************
- * E00ReadRewind()
- *
-- * Rewind the E00ReadPtr. Allows to start another read pass on the
-+ * Rewind the E00ReadPtr. Allows starting another read pass on the
- * input file.
- **********************************************************************/
- void E00ReadRewind(E00ReadPtr psInfo)
---- a/frmts/mbtiles/frmt_mbtiles.html
-+++ b/frmts/mbtiles/frmt_mbtiles.html
-@@ -9,7 +9,7 @@
-
- <h1>MBTiles</h1>
-
--<p>Starting with GDAL 1.10, the MBTiles driver allows to read rasters in the MBTiles format,
-+<p>Starting with GDAL 1.10, the MBTiles driver allows reading rasters in the MBTiles format,
- which is a specification for storing tiled map data in SQLite databases.</p>
-
- <p>GDAL/OGR must be compiled with OGR SQLite driver support, and JPEG and PNG drivers.</p>
---- a/frmts/rasdaman/frmt_rasdaman.html
-+++ b/frmts/rasdaman/frmt_rasdaman.html
-@@ -15,7 +15,7 @@ consideration for OSGeo incubation.</p>
-
- <p>In our driver implementation, GDAL connects to rasdaman by defining a
- query template which is instantiated with the concrete subsetting box
--upon every access. This allows to deliver 2-D cutouts from n-D data sets
-+upon every access. This allows delivering 2-D cutouts from n-D data sets
- (such as hyperspectral satellite time series, multi-variable climate
- simulation data, ocean model data, etc.). In particular, virtual imagery
- can be offered which is derived on demand from ground truth data. Some
---- a/nmake.opt
-+++ b/nmake.opt
-@@ -352,7 +352,7 @@ JPEG12_SUPPORTED = 1
- #HDF4_DIR = D:\warmerda\HDF41r5
- #HDF4_LIB = /LIBPATH:$(HDF4_DIR)\lib Ws2_32.lib
- # HDF4 library newer than 4.2.5 has a SDreset_maxopenfiles/SDget_maxopenfiles
--# interface which allows to open many HDF files simultaneously (the max
-+# interface which allows opening many HDF files simultaneously (the max
- # number of files was previously hardcoded and too low, smth. like 32).
- # Uncomment following if your library is newer than 4.2.5.
- #HDF4_HAS_MAXOPENFILES = YES
---- a/ogr/ogrsf_frmts/selafin/drv_selafin.html
-+++ b/ogr/ogrsf_frmts/selafin/drv_selafin.html
-@@ -195,7 +195,7 @@ Numbers can also be negative. In this ca
- <dt>TITLE</dt>
- <dd>Title of the datasource, stored in the Selafin file. The title must not hold more than 72 characters. If it is longer, it will be truncated to fit in the file.</dd>
- <dt>DATE</dt>
-- <dd>Starting date of the simulation. Each layer in a Selafin file is characterized by a date, counted in seconds since a reference date. This option allows to provide the reference date. The format of this field must be YYYY-MM-DD_hh:mm:ss. The format does not mention the time zone.</dd>
-+ <dd>Starting date of the simulation. Each layer in a Selafin file is characterized by a date, counted in seconds since a reference date. This option allows providing the reference date. The format of this field must be YYYY-MM-DD_hh:mm:ss. The format does not mention the time zone.</dd>
- </dl>
-
- <p>An example of datasource creation option is: <tt>-dsco TITLE="My simulation" -dsco DATE=2014-05-01_10:00:00</tt>.
---- a/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp
-+++ b/ogr/ogrsf_frmts/selafin/ogrselafindriver.cpp
-@@ -182,7 +182,7 @@ void RegisterOGRSelafin() {
- poDriver->SetMetadataItem( GDAL_DMD_CREATIONOPTIONLIST,
- "<CreationOptionList>"
- " <Option name='TITLE' type='string' description='Title of the datasource, stored in the Selafin file. The title must not hold more than 72 characters.'/>"
--" <Option name='DATE' type='string' description='Starting date of the simulation. Each layer in a Selafin file is characterized by a date, counted in seconds since a reference date. This option allows to provide the reference date. The format of this field must be YYYY-MM-DD_hh:mm:ss'/>"
-+" <Option name='DATE' type='string' description='Starting date of the simulation. Each layer in a Selafin file is characterized by a date, counted in seconds since a reference date. This option allows providing the reference date. The format of this field must be YYYY-MM-DD_hh:mm:ss'/>"
- "</CreationOptionList>");
- poDriver->SetMetadataItem( GDAL_DS_LAYER_CREATIONOPTIONLIST,
- "<LayerCreationOptionList>"
---- a/ogr/ogrsf_frmts/sqlite/drv_sqlite.html
-+++ b/ogr/ogrsf_frmts/sqlite/drv_sqlite.html
-@@ -309,7 +309,7 @@ appropriately in order to get optimal pe
- The default OGR behavior is to COMMIT a transaction every 200 inserted rows. This
- value is surely too low for SQLite; and closing too much frequently the current
- transaction causes severe performance degradation.
--The <b>-gt</b> argument allows to explicitly set the number of rows for each transaction.
-+The <b>-gt</b> argument allows explicitly setting the number of rows for each transaction.
- Explicitly defining <b>-gt 1024</b> usually ensures a noticeable performance boost;
- defining an even bigger <b>-gt 65536</b> ensures optimal performance while
- populating some table containing many hundredth thousand or million rows.<p>
---- a/swig/php/gdal_wrap.cpp
-+++ b/swig/php/gdal_wrap.cpp
-@@ -259,7 +259,7 @@ template <typename T> T SwigValueInit()
- SWIG errors code.
-
- Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-- allows to return the 'cast rank', for example, if you have this
-+ allows returning the 'cast rank', for example, if you have this
-
- int food(double)
- int fooi(int);
---- a/swig/php/gdalconst_wrap.c
-+++ b/swig/php/gdalconst_wrap.c
-@@ -235,7 +235,7 @@
- SWIG errors code.
-
- Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-- allows to return the 'cast rank', for example, if you have this
-+ allows returning the 'cast rank', for example, if you have this
-
- int food(double)
- int fooi(int);
---- a/swig/php/ogr_wrap.cpp
-+++ b/swig/php/ogr_wrap.cpp
-@@ -259,7 +259,7 @@ template <typename T> T SwigValueInit()
- SWIG errors code.
-
- Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-- allows to return the 'cast rank', for example, if you have this
-+ allows returning the 'cast rank', for example, if you have this
-
- int food(double)
- int fooi(int);
---- a/swig/php/osr_wrap.cpp
-+++ b/swig/php/osr_wrap.cpp
-@@ -259,7 +259,7 @@ template <typename T> T SwigValueInit()
- SWIG errors code.
-
- Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-- allows to return the 'cast rank', for example, if you have this
-+ allows returning the 'cast rank', for example, if you have this
-
- int food(double)
- int fooi(int);
---- a/swig/python/extensions/gdal_array_wrap.cpp
-+++ b/swig/python/extensions/gdal_array_wrap.cpp
-@@ -264,7 +264,7 @@ template <typename T> T SwigValueInit()
- SWIG errors code.
-
- Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-- allows to return the 'cast rank', for example, if you have this
-+ allows returning the 'cast rank', for example, if you have this
-
- int food(double)
- int fooi(int);
---- a/swig/python/extensions/gdal_wrap.cpp
-+++ b/swig/python/extensions/gdal_wrap.cpp
-@@ -264,7 +264,7 @@ template <typename T> T SwigValueInit()
- SWIG errors code.
-
- Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-- allows to return the 'cast rank', for example, if you have this
-+ allows returning the 'cast rank', for example, if you have this
-
- int food(double)
- int fooi(int);
---- a/swig/python/extensions/gdalconst_wrap.c
-+++ b/swig/python/extensions/gdalconst_wrap.c
-@@ -240,7 +240,7 @@
- SWIG errors code.
-
- Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-- allows to return the 'cast rank', for example, if you have this
-+ allows returning the 'cast rank', for example, if you have this
-
- int food(double)
- int fooi(int);
---- a/swig/python/extensions/ogr_wrap.cpp
-+++ b/swig/python/extensions/ogr_wrap.cpp
-@@ -264,7 +264,7 @@ template <typename T> T SwigValueInit()
- SWIG errors code.
-
- Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-- allows to return the 'cast rank', for example, if you have this
-+ allows returning the 'cast rank', for example, if you have this
-
- int food(double)
- int fooi(int);
---- a/swig/python/extensions/osr_wrap.cpp
-+++ b/swig/python/extensions/osr_wrap.cpp
-@@ -264,7 +264,7 @@ template <typename T> T SwigValueInit()
- SWIG errors code.
-
- Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
-- allows to return the 'cast rank', for example, if you have this
-+ allows returning the 'cast rank', for example, if you have this
-
- int food(double)
- int fooi(int);
diff --git a/debian/patches/consistant-typo b/debian/patches/consistant-typo
deleted file mode 100644
index 49f72d8..0000000
--- a/debian/patches/consistant-typo
+++ /dev/null
@@ -1,208 +0,0 @@
-Description: Fix 'consistant' typo, replace with 'consistent'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29330
-
---- a/apps/commonutils.cpp
-+++ b/apps/commonutils.cpp
-@@ -36,7 +36,7 @@ CPL_CVSID("$Id: commonutils.cpp 27384 20
- /* -------------------------------------------------------------------- */
- /* CheckExtensionConsistency() */
- /* */
--/* Check that the target file extension is consistant with the */
-+/* Check that the target file extension is consistent with the */
- /* 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/port/cpl_csv.cpp
-+++ b/port/cpl_csv.cpp
-@@ -464,7 +464,7 @@ char CSVDetectSeperator (const char* psz
- chDelimiter = *pszLine;
- else if (chDelimiter != *pszLine)
- {
-- /* The separator is not consistant on the line. */
-+ /* The separator is not consistent on the line. */
- CPLDebug("CSV", "Inconsistent separator. '%c' and '%c' found. Using ',' as default",
- chDelimiter, *pszLine);
- chDelimiter = ',';
---- 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
-@@ -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:
-- 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,
---- 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/doc-brief b/debian/patches/doc-brief
deleted file mode 100644
index 6601a72..0000000
--- a/debian/patches/doc-brief
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Add a brief summary to the GDAL and OGR utilities pages.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=421653
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Last-Update: 2013-10-13
-Forwarded: https://trac.osgeo.org/gdal/ticket/5996
-
---- a/apps/gdal_utilities.dox
-+++ b/apps/gdal_utilities.dox
-@@ -4,6 +4,7 @@
-
- /*!
- \page gdal_utilities GDAL Utilities
-+\brief A collection of GDAL related programs.
-
- The following utility programs are distributed with GDAL.
-
---- a/apps/ogr_utilities.dox
-+++ b/apps/ogr_utilities.dox
-@@ -1,4 +1,5 @@
- /*! \page ogr_utilities OGR Utility Programs
-+\brief A collection of OGR related programs.
-
- The following utilities are distributed as part of the OGR Simple Features
- toolkit:
diff --git a/debian/patches/explicitely-typo b/debian/patches/explicitely-typo
deleted file mode 100644
index 46fa4ac..0000000
--- a/debian/patches/explicitely-typo
+++ /dev/null
@@ -1,445 +0,0 @@
-Description: Fix 'explicitely' typo, replace with 'explicitly'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29330
-
---- a/NEWS
-+++ b/NEWS
-@@ -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
- poReader->bComplete = TRUE;
- }
-
-- /* Call CPLCleanupTLS explicitely since this thread isn't managed */
-+ /* Call CPLCleanupTLS explicitly since this thread isn't managed */
- /* by CPL. This will free the ressources taken by the above CPLDebug */
- if( poReader->bComplete )
- CPLCleanupTLS();
---- a/gcore/gdaldataset.cpp
-+++ b/gcore/gdaldataset.cpp
-@@ -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
-+unless OGRSQL is explicitly passed as the dialect. Starting with OGR 1.10, the SQLITE dialect
- can also be used.
-
- @return an OGRLayer containing the results of the query. Deallocate with
-@@ -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 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).
-
---- a/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
-+++ b/ogr/ogrsf_frmts/sqlite/ogr_sqlite.h
-@@ -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. */
-
- int OpenOrCreateDB(int flags, int bRegisterOGR2SQLiteExtensions);
- int SetSynchronous();
---- a/ogr/ogrsf_frmts/vrt/drv_vrt.html
-+++ b/ogr/ogrsf_frmts/vrt/drv_vrt.html
-@@ -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 )
- {
- GDALDriverH hDriver;
- const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
-- int bFormatExplicitelySet = FALSE;
-+ int bFormatExplicitlySet = FALSE;
- char **papszLayers = NULL;
- const char *pszBurnAttribute = NULL;
- double dfIncreaseBurnValue = 0.0;
-@@ -665,7 +665,7 @@ int main( int argc, char ** argv )
- {
- CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
- pszFormat = argv[++i];
-- bFormatExplicitelySet = TRUE;
-+ bFormatExplicitlySet = TRUE;
- }
-
- else if( EQUAL(argv[i],"-q") || EQUAL(argv[i],"-quiet") )
-@@ -1021,7 +1021,7 @@ int main( int argc, char ** argv )
- if ( nYSize == 0 )
- nYSize = 256;
-
-- if (!bQuiet && !bFormatExplicitelySet)
-+ if (!bQuiet && !bFormatExplicitlySet)
- CheckExtensionConsistency(pszDest, pszFormat);
-
- hDstDS = GDALCreate( hDriver, pszDest, nXSize, nYSize, nBands,
---- a/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:
-
- * 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.
-
- H) RFC 55: Refined SetFeature() and DeleteFeature() semantics
-
---- 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);
-- //bFormatExplicitelySet = TRUE;
-+ //bFormatExplicitlySet = TRUE;
- pszFormat = papszArgv[++iArg];
- }
- 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;
- }
-
-- /* 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 )
- {
- 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 )
- {
- 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");
- }
-
-@@ -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 */
- }
-
- 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
- }
- }
-
-- /* 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" ));
-
- /* -------------------------------------------------------------------- */
--/* Guess geometry type if not explicitely provided (or computed) */
-+/* Guess geometry type if not explicitly provided (or computed) */
- /* -------------------------------------------------------------------- */
- if( pszGType == NULL && poProps->eGeomType == wkbUnknown )
- {
-@@ -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/inconsistant-typo b/debian/patches/inconsistant-typo
deleted file mode 100644
index ed681ae..0000000
--- a/debian/patches/inconsistant-typo
+++ /dev/null
@@ -1,174 +0,0 @@
-Description: Fix 'inconsistant' typo, replace with 'inconsistent'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29330
-
---- a/MIGRATION_GUIDE.TXT
-+++ b/MIGRATION_GUIDE.TXT
-@@ -227,7 +227,7 @@ OGR drivers :
-
- * 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.
-
---- 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_NotSupported,
-- "Inconsistant NBITS value with data type. Using %d",
-+ "Inconsistent NBITS value with data type. Using %d",
- GDALGetDataTypeSize(eDataType));
- }
-
---- 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 driver: Layer geometry type is non-linear, but "
-+ "Inconsistent driver: Layer geometry type is non-linear, but "
- "TestCapability(OLCCurveGeometries) returns FALSE." );
- }
- #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() )
- {
- 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/pg/ogrpgtablelayer.cpp
-+++ b/ogr/ogrsf_frmts/pg/ogrpgtablelayer.cpp
-@@ -1105,7 +1105,7 @@ OGRErr OGRPGTableLayer::ISetFeature( OGR
- 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;
- }
- }
-@@ -1319,7 +1319,7 @@ OGRErr OGRPGTableLayer::ICreateFeature(
- 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/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 );
-
- 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() )
- {
- 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;
- }
- }
-@@ -2946,7 +2946,7 @@ OGRErr OGRSQLiteTableLayer::ICreateFeatu
- 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/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/java-make b/debian/patches/java-make
deleted file mode 100644
index 77ecd7e..0000000
--- a/debian/patches/java-make
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Force removal of object files.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628022
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Last-Update: 2013-07-01
-Forwarded: https://trac.osgeo.org/gdal/ticket/5997
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29340
-
---- a/swig/java/GNUmakefile
-+++ b/swig/java/GNUmakefile
-@@ -38,11 +38,11 @@ JAVA_OBJECTS = gdalconst_wrap.$(OBJ_EXT)
-
- clean:
- -rm -f ${JAVA_MODULES}
-- -rm *.$(OBJ_EXT)
-- -rm .libs/*.so
-- -rm .libs/*.dylib
-- -rm *.so
-- -rm *.dylib
-+ -rm -f *.$(OBJ_EXT)
-+ -rm -f .libs/*.so
-+ -rm -f .libs/*.dylib
-+ -rm -f *.so
-+ -rm -f *.dylib
-
- ant clean
-
diff --git a/debian/patches/paramater-typo b/debian/patches/paramater-typo
deleted file mode 100644
index 3221267..0000000
--- a/debian/patches/paramater-typo
+++ /dev/null
@@ -1,49 +0,0 @@
-Description: Fix 'paramater' typo, replace with 'parameter'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29336/
-
---- a/frmts/hdf4/hdf-eos/GDapi.c
-+++ b/frmts/hdf4/hdf-eos/GDapi.c
-@@ -3959,7 +3959,7 @@ GDwrrdfield(int32 gridID, char *fieldnam
-
-
- /*
-- * If strideOne is true use NULL paramater for stride. This
-+ * If strideOne is true use NULL parameter for stride. This
- * is a work-around to HDF compression problem
- */
- if (strideOne == 1)
---- a/frmts/hdf4/hdf-eos/SWapi.c
-+++ b/frmts/hdf4/hdf-eos/SWapi.c
-@@ -4922,7 +4922,7 @@ SWwrrdfield(int32 swathID, const char *f
-
-
- /*
-- * If strideOne is true use NULL paramater for stride. This
-+ * If strideOne is true use NULL parameter for stride. This
- * is a work-around to HDF compression problem
- */
- if (strideOne == 1)
---- a/frmts/zlib/zlib.h
-+++ b/frmts/zlib/zlib.h
-@@ -869,7 +869,7 @@ ZEXTERN int ZEXPORT inflateBackInit OF((
- See inflateBack() for the usage of these routines.
-
- inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of
-- the paramaters are invalid, Z_MEM_ERROR if the internal state could not
-+ the parameters are invalid, Z_MEM_ERROR if the internal state could not
- be allocated, or Z_VERSION_ERROR if the version of the library does not
- match the version of the header file.
- */
---- a/ogr/ogrsf_frmts/mitab/mitab_bounds.cpp
-+++ b/ogr/ogrsf_frmts/mitab/mitab_bounds.cpp
-@@ -1265,7 +1265,7 @@ int MITABLoadCoordSysTable(const char *p
- }
- if( strstr(pszLine, "Bounds") != NULL )
- {
-- CPLError(CE_Warning, CPLE_IllegalArg, "Unexpected Bounds paramater at line %d",
-+ CPLError(CE_Warning, CPLE_IllegalArg, "Unexpected Bounds parameter at line %d",
- iLine);
- }
- bHasProjIn = TRUE;
diff --git a/debian/patches/paramters-typo b/debian/patches/paramters-typo
deleted file mode 100644
index 21fe40b..0000000
--- a/debian/patches/paramters-typo
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'paramters' typo, replace with 'parameters'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29330
-
---- a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
-+++ b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
-@@ -1247,7 +1247,7 @@ CPLXMLNode* XMLSpatialReference(OGRSpati
- const char* gridvalues[7];
-
- /*
-- Need different default paramters for geographic and projected coordinate systems.
-+ Need different default parameters for geographic and projected coordinate systems.
- Try and use ArcGIS 10 default values.
- */
- // default tolerance is 1mm in the units of the coordinate system
diff --git a/debian/patches/recommanded-typo b/debian/patches/recommanded-typo
deleted file mode 100644
index c8a0c40..0000000
--- a/debian/patches/recommanded-typo
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'recommanded' typo, replace with 'recommended'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29330
-
---- a/NEWS
-+++ b/NEWS
-@@ -5019,7 +5019,7 @@ XPlane/Flightgear driver:
- == SWIG Language Bindings ==
-
- 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
deleted file mode 100644
index f01080b..0000000
--- a/debian/patches/ressource-typo
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'ressources' typo, replace with 'resources'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29330
-
---- a/frmts/ecw/ecwasyncreader.cpp
-+++ b/frmts/ecw/ecwasyncreader.cpp
-@@ -282,7 +282,7 @@ NCSEcwReadStatus ECWAsyncReader::Refresh
- }
-
- /* Call CPLCleanupTLS explicitly since this thread isn't managed */
-- /* by CPL. This will free the ressources taken by the above CPLDebug */
-+ /* by CPL. This will free the resources taken by the above CPLDebug */
- if( poReader->bComplete )
- CPLCleanupTLS();
-
diff --git a/debian/patches/series b/debian/patches/series
index b9edd2f..4b73070 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,19 +8,6 @@ mrsid-plugin
symver
spatialite
java.opt
-java-make
-paramters-typo
-inconsistant-typo
-consistant-typo
-explicitely-typo
-ressource-typo
-transfered-typo
initalize-typo
-usefull-typo
-supress-typo
-doc-brief
hardening
-recommanded-typo
perl-vendor
-paramater-typo
-allows-to-typo
diff --git a/debian/patches/supress-typo b/debian/patches/supress-typo
deleted file mode 100644
index 453c458..0000000
--- a/debian/patches/supress-typo
+++ /dev/null
@@ -1,107 +0,0 @@
-Description: Fix 'supress' typo, replace with 'suppress'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29330
-
---- a/ogr/ogrsf_frmts/arcobjects/aolayer.cpp
-+++ b/ogr/ogrsf_frmts/arcobjects/aolayer.cpp
-@@ -37,7 +37,7 @@
- /************************************************************************/
- AOLayer::AOLayer():
- OGRLayer(),m_pFeatureDefn(NULL),m_pSRS(NULL), m_ipQF(CLSID_QueryFilter),
--m_pBuffer(NULL), m_bufferSize(0), m_supressColumnMappingError(false),m_forceMulti(false)
-+m_pBuffer(NULL), m_bufferSize(0), m_suppressColumnMappingError(false),m_forceMulti(false)
- {
- }
-
-@@ -419,7 +419,7 @@ bool AOLayer::OGRFeatureFromAORow(IRow*
- */
- default:
- {
-- if (!m_supressColumnMappingError)
-+ if (!m_suppressColumnMappingError)
- {
- foundBadColumn = true;
- CPLError( CE_Warning, CPLE_AppDefined, "Row id: %d col:%d has unhandled col type (%d). Setting to NULL.", oid, i, m_pFeatureDefn->GetFieldDefn(i)->GetType());
-@@ -429,7 +429,7 @@ bool AOLayer::OGRFeatureFromAORow(IRow*
- }
-
- if (foundBadColumn)
-- m_supressColumnMappingError = true;
-+ m_suppressColumnMappingError = true;
-
-
- *ppFeature = pOutFeature;
---- a/ogr/ogrsf_frmts/arcobjects/ogr_ao.h
-+++ b/ogr/ogrsf_frmts/arcobjects/ogr_ao.h
-@@ -115,7 +115,7 @@ protected:
- //buffers are used for avoiding constant reallocation of temp memory
- unsigned char* m_pBuffer;
- long m_bufferSize; //in bytes
-- bool m_supressColumnMappingError;
-+ bool m_suppressColumnMappingError;
- bool m_forceMulti;
- };
-
---- a/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
-+++ b/ogr/ogrsf_frmts/filegdb/FGdbLayer.cpp
-@@ -47,7 +47,7 @@ using std::wstring;
- /************************************************************************/
- FGdbBaseLayer::FGdbBaseLayer() :
- m_pFeatureDefn(NULL), m_pSRS(NULL), m_pEnumRows(NULL),
-- m_supressColumnMappingError(false), m_forceMulti(false)
-+ m_suppressColumnMappingError(false), m_forceMulti(false)
- {
- }
-
-@@ -2537,7 +2537,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
-
- default:
- {
-- if (!m_supressColumnMappingError)
-+ if (!m_suppressColumnMappingError)
- {
- foundBadColumn = true;
- CPLError( CE_Warning, CPLE_AppDefined,
-@@ -2549,7 +2549,7 @@ bool FGdbBaseLayer::OGRFeatureFromGdbRow
- }
-
- if (foundBadColumn)
-- m_supressColumnMappingError = true;
-+ m_suppressColumnMappingError = true;
-
-
- *ppFeature = pOutFeature;
---- a/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp
-+++ b/ogr/ogrsf_frmts/filegdb/FGdbResultLayer.cpp
-@@ -48,7 +48,7 @@ FGdbResultLayer::FGdbResultLayer(FGdbDat
- m_pDS = pParentDataSource;
- osSQL = pszSQL;
-
-- m_supressColumnMappingError = false;
-+ m_suppressColumnMappingError = false;
-
- FieldInfo fieldInfo;
- m_pEnumRows->GetFieldInformation(fieldInfo);
---- a/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
-+++ b/ogr/ogrsf_frmts/filegdb/ogr_fgdb.h
-@@ -82,7 +82,7 @@ protected:
- std::vector<std::wstring> m_vOGRFieldToESRIField; //OGR Field Index to ESRI Field Name Mapping
- std::vector<std::string> m_vOGRFieldToESRIFieldType; //OGR Field Index to ESRI Field Type Mapping
-
-- bool m_supressColumnMappingError;
-+ bool m_suppressColumnMappingError;
- bool m_forceMulti;
-
- bool OGRFeatureFromGdbRow(Row* pRow, OGRFeature** ppFeature);
---- 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/transfered-typo b/debian/patches/transfered-typo
deleted file mode 100644
index 5719458..0000000
--- a/debian/patches/transfered-typo
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Fix 'transfered' typo, replace with 'transferred'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29330
-
---- a/MIGRATION_GUIDE.TXT
-+++ b/MIGRATION_GUIDE.TXT
-@@ -24,7 +24,7 @@ C++ API:
-
- * OGRLayer::GetInfo() has been removed.
-
-- * 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.
-
- * 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/usefull-typo b/debian/patches/usefull-typo
deleted file mode 100644
index cd660a2..0000000
--- a/debian/patches/usefull-typo
+++ /dev/null
@@ -1,149 +0,0 @@
-Description: Fix 'usefull' typo, replace with 'useful'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/gdal/ticket/5995
-Applied-Upstream: https://trac.osgeo.org/gdal/changeset/29330
-
---- a/NEWS
-+++ b/NEWS
-@@ -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()
-- even if it not a real filename. Usefull for opening resources expressed as
-+ even if it not a real filename. Useful 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().
-@@ -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()
-- even if it not a real filename. Usefull for opening resources expressed as
-+ even if it not a real filename. Useful 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/apps/ogr_utilities.dox
-+++ b/apps/ogr_utilities.dox
-@@ -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.
- 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
-@@ -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. 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
---- 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.
- *
- * 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.
- *
- * 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><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.
- *
-- * 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.
- *
- * @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