Skip to content

Commit 2a3037c

Browse files
author
rouault
committed
Fix various typos found by Debian lintian tool (patch by Bas Couwenger, #5756)
git-svn-id: https://svn.osgeo.org/gdal/trunk/gdal@28039 f0d54148-0727-0410-94bb-9a71ac55c965
1 parent d9fc821 commit 2a3037c

File tree

139 files changed

+272
-272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+272
-272
lines changed

NEWS

+18-18
Original file line numberDiff line numberDiff line change
@@ -783,7 +783,7 @@ Build(Unix):
783783
* New optional dependencies : libpcre (for regular expressions support in SQLite), libxml2 (validation of GML files)
784784
* --with-python: make it work with python3, and also accept path to python binary as argument of --with-python (#4725)
785785
* Use nc-config to detect netcdf compilation and linking parameters (#4424)
786-
* Add frmts/vrt to CONFIG_CFLAGS for developement version of gdal-config (needed for postgis 2.0 compilation)
786+
* Add frmts/vrt to CONFIG_CFLAGS for development version of gdal-config (needed for postgis 2.0 compilation)
787787
* Fix compilation failure with iconv on FreeBSD (#4525)
788788
* Make FileGDBAPI detection work with FileGDBAPI v1.1 and v1.2 (#4570)
789789
* Fix build on Gentoo with its custom zlib 1.2.6 with the OF macro removed
@@ -1311,7 +1311,7 @@ GML driver:
13111311
* Allow reading srsDimension attribute when set on LineString element, and not on posList (#4663)
13121312
* Partial support for reading GML 3.3 compat encoding profile, limited to <gmlce:SimplePolygon>, <gmlce:SimpleRectangle>, <gmlce:SimpleTriangle>, <gmlce:SimpleMultiPoint> elements
13131313
* Support WFS GetFeature response document to be piped and opened with /vsistdin/
1314-
* Support specifying connection string as 'filename.gml,xsd=some_filename.xsd' to explicitely provide a XSD
1314+
* Support specifying connection string as 'filename.gml,xsd=some_filename.xsd' to explicitly provide a XSD
13151315
* Improve detection of extent and srs for WFS 2.0
13161316
* Allow ISO-8859-15 encoded files to be used by Expat parser (#4829)
13171317
* Handle CompositeCurve like MultiCurve (for NAS)
@@ -1694,7 +1694,7 @@ Utilities:
16941694
* gdalwarp: speed-up when using -tps with large number of GCPs
16951695
* gdalwarp: add support for optional use of libarmadillo to speed-up matrix inversion in -tps mode
16961696
* gdalwarp: detect situations where the user will override the source file
1697-
* gdallocationinfo: do not let one off-db pixel cause all the rest to be supressed (#4181)
1697+
* gdallocationinfo: do not let one off-db pixel cause all the rest to be suppressed (#4181)
16981698
* 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)
16991699
* gdal_rasterize: when source datasource has a single layer, use it implicitely if none of -l or -sql is specified
17001700
* nearblack: add -color option (#4085)
@@ -1708,7 +1708,7 @@ Utilities:
17081708
* Add gdal_ls.py and gdal_cp.py as Python samples
17091709
* Add new sample utility, gdal_edit.py, to edit in place various information of an existing GDAL dataset (projection, geotransform, nodata, metadata) (#4220)
17101710
* gdalcopyproj.py: make it copy GCPs too
1711-
* Add warning if a target filename extension isn't consistant with the output driver
1711+
* Add warning if a target filename extension isn't consistent with the output driver
17121712
* Add --pause for convenient debugging, document it and --locale
17131713

17141714
Multi-driver topics:
@@ -2057,7 +2057,7 @@ USGSDEM driver:
20572057
VRT driver:
20582058
* Implement VRTDataset::IRasterIO() that can delegate to source Dataset::RasterIO() in particular cases
20592059
* Implement GetMinimum() and GetMaximum()
2060-
* GetFileList(): for /vsicurl/ ressources, don't actually test their existence as it can be excruciating slow
2060+
* GetFileList(): for /vsicurl/ resources, don't actually test their existence as it can be excruciating slow
20612061
* VRTComplexSource: correctly deal with complex data type (#3977)
20622062
* Fix 2 segfaults related to using '<VRTDataset', but with invalid XML, as the target filename of VRTDataset::Create()
20632063
* Fix 'VRTDerivedRasterBand with ComplexSource and nodata value yields potentially uninitialized buffer' (#4045)
@@ -2112,7 +2112,7 @@ Core:
21122112
* OGR SQL: recognize optional ESCAPE escape_char clause
21132113
* OGR SQL: allow NULL to be used as a value, so that 'SELECT *, NULL FROM foo works'
21142114
* OGR SQL: Accept doublequoting of column_name in 'SELECT DISTINCT "column_name" FROM table_name' (#3966)
2115-
* 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)
2115+
* 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)
21162116
* OGR SQL: Avoid error emission on requests such as 'SELECT MIN(EAS_ID), COUNT(*) FROM POLY'
21172117
* OGR SQL: Avoid setting width/precision for AVG column
21182118
* OGR SQL: Add a mechanism to delete a layer (DROP TABLE x)
@@ -2166,7 +2166,7 @@ Utilities:
21662166
* 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)
21672167
* 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
21682168
* ogr2ogr: add -simplify option to simplify geometries
2169-
* 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
2169+
* 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
21702170
* ogrinfo/ogr2ogr: exit when SetAttributeFilter() fails, instead of silently going on (#4261)
21712171

21722172
Multi driver topics:
@@ -2561,7 +2561,7 @@ Port:
25612561
- /vsitar/ : to read in .tar or .tgz/.tar.gz files
25622562
* Add C API to create ZIP files
25632563
* Add support for writable /vsizip/
2564-
* Add VSIBufferedReaderHandle class that is usefull to improve performance when
2564+
* Add VSIBufferedReaderHandle class that is useful to improve performance when
25652565
doing backward seeks by a few bytes on underlying file handles for which
25662566
backwardseeks are very slow, such as GZip handle
25672567
* Add service for base64 decoding
@@ -2579,7 +2579,7 @@ Port:
25792579
Core:
25802580
* RFC 24: progressive/async raster reading
25812581
* On Unix, add capability of opening the target of a symlink through GDALOpen()
2582-
even if it not a real filename. Usefull for opening ressources expressed as
2582+
even if it not a real filename. Usefull for opening resources expressed as
25832583
GDAL virtual filenames in software offering only file explorers (#3902)
25842584
* Assume anything less than 100000 for GDAL_CACHEMAX is measured in metabytes.
25852585
* Read cartesian coordinates if applicable in GDALLoadOziMapFile().
@@ -2672,7 +2672,7 @@ Utilities :
26722672
to align on a standard grid (#3772)
26732673

26742674
AAIGRID driver:
2675-
* Cast nodata value to float to be consistant with precision of pixel data in
2675+
* Cast nodata value to float to be consistent with precision of pixel data in
26762676
GDT_Float32 case; small optimization to avoid reading the first 100K when
26772677
we know that the datatype is already Float32
26782678
* Allow reading files where decimal separator is comma (#3668)
@@ -2779,7 +2779,7 @@ GTX driver:
27792779
* Read NOAA .gtx vertical datum shift files.
27802780

27812781
GXF driver:
2782-
* Cast nodata value to float to be consistant with precision of pixel data in
2782+
* Cast nodata value to float to be consistent with precision of pixel data in
27832783
GDT_Float32 case
27842784
* Introduce a GXF_DATATYPE configuration option that can be set to Float64
27852785
* Use GDALGetScanline() instead of GDALGetRawScanline() so that #SENS
@@ -2999,7 +2999,7 @@ Core:
29992999
* Add OGRLayer::GetName() and OGRLayer::GetGeomType() virtual methods,
30003000
and their C and SWIG mappings (#3719)
30013001
* On Unix, add capability of opening the target of a symlink through OGROpen()
3002-
even if it not a real filename. Usefull for opening ressources expressed as
3002+
even if it not a real filename. Usefull for opening resources expressed as
30033003
GDAL virtual filenames in software offering only file explorers (#3902)
30043004
* Expat based XML readers : add support for reading files with Windows-1252
30053005
encoding
@@ -3012,7 +3012,7 @@ Core:
30123012
OGR_G_SymDifference() and OGR_G_UnionCascaded()
30133013
* Add C function: OGR_F_StealGeometry()
30143014
* Move Centroid() method from OGRPolygon to OGRGeometry base class to be able
3015-
to operate on various geometry types, and to be consistant with PostGIS
3015+
to operate on various geometry types, and to be consistent with PostGIS
30163016
ST_Centroid() capabilities and the underlying GEOS method
30173017
* Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
30183018
datasources and layers virtual (#2978)
@@ -3269,7 +3269,7 @@ PostgreSQL driver:
32693269
is set to YES
32703270
* If the PG_USE_BASE64 configuration option is set to YES, geometries will be
32713271
requested as BASE64 encoded EWKB instead of canonical HEX encoded EWKB.
3272-
(usefull when bandwidth is the limiting factor)
3272+
(useful when bandwidth is the limiting factor)
32733273
* Don't instanciate layer defn at layer creation. This can speed up
32743274
significantly database opening when they are many tables and the user just
32753275
needs to fetch one with GetLayerByName().
@@ -3388,7 +3388,7 @@ Python bindings:
33883388
when used and set to True, None is returned when GDALGetGeoTransform()
33893389
returns CE_Failure (instead of the fake (0,1,0,0,0,1)); backward
33903390
compatibility preserved when the parameter isn't specified
3391-
* Avoid supressing warnings and errors when exceptions are used (#3632)
3391+
* Avoid suppressing warnings and errors when exceptions are used (#3632)
33923392
* Add gdalinfo.py, ogrinfo.py and ogr2ogr.py as sample scripts, direct ports
33933393
of corresponding C/C++ utilities
33943394
* Allow manipulating buffer > 2 GB on 64bit builds for ReadRaster() and WriteRaster()
@@ -3665,7 +3665,7 @@ GeoTIFF driver :
36653665
* Use official value for inverse flattening of the WGS84 ellipsoid (#2787)
36663666
* Add metadata domain for XML documents (#2786)
36673667
* Make GTiff driver friendly with files with huge number of bands and pixel interleaving (#2838)
3668-
* Avoid precaching other bands if block cache size is not big enough to accomodate them (#2838)
3668+
* Avoid precaching other bands if block cache size is not big enough to accommodate them (#2838)
36693669
* Internal libtiff (4.0.0beta5) and libgeotiff (1.3.0beta) upgraded
36703670
* use the SetCitationToSRS call for the PCSCitationGeoKey in a similar fashion to the GTCitationGeoKey (#2933)
36713671
* NBITS set for GTiffOddBits. YCbCr JPEG added as a compression type.
@@ -4103,7 +4103,7 @@ General:
41034103
osr.ImportFromMICoordSys(), osr.ExportToMICoordSys(), SpatialReference.Clone()
41044104
osr.EPSGTreatsAsLatLong(), osr.ImportFromEPSGA()
41054105
* Make resampling an optionnal parameter for gdal.RegenerateOverview(),
4106-
to be consistant with gdal.RegenerateOverviews()
4106+
to be consistent with gdal.RegenerateOverviews()
41074107
* NONNULL checks have been added to check various arguments of methods
41084108
* add missing constants : DCAP_VIRTUALIO, color interpretations, OGR constants
41094109

@@ -4282,7 +4282,7 @@ Utilities:
42824282
* gdalinfo: Display checksums on overviews when -checksum is specified
42834283
* gdalinfo: Display whether the mask band has overviews
42844284
* ogr2ogr: reset -gt to 1 with -skipfailures, document -gt (#2409)
4285-
* 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)
4285+
* 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)
42864286
* nearblack: Add support for scanning from top and bottom as well as from the sides.
42874287
* Prevent crash in gdalwarpsimple utility and in GDALSimpleImageWarp() when source dataset has no raster band
42884288
* gdal_rasterize: check that coordinates systems match (Ticket #1937)

alg/gdal_rpc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ void* GDALCreateSimilarRPCTransformer( void *hTransformArg, double dfRatioX, dou
400400
* an average height above sea level for ground in the target scene.
401401
*
402402
* <li> RPC_HEIGHT_SCALE: a factor used to multiply heights above ground.
403-
* Usefull when elevation offsets of the DEM are not expressed in meters. (GDAL >= 1.8.0)
403+
* Useful when elevation offsets of the DEM are not expressed in meters. (GDAL >= 1.8.0)
404404
*
405405
* <li> RPC_DEM: the name of a GDAL dataset (a DEM file typically) used to
406406
* extract elevation offsets from. In this situation the Z passed into the

alg/gdalgrid.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -1831,17 +1831,17 @@ GDALGridCreate( GDALGridAlgorithm eAlgorithm, const void *poOptions,
18311831
/* defaults. */
18321832
/************************************************************************/
18331833

1834-
CPLErr ParseAlgorithmAndOptions( const char *pszAlgoritm,
1834+
CPLErr ParseAlgorithmAndOptions( const char *pszAlgorithm,
18351835
GDALGridAlgorithm *peAlgorithm,
18361836
void **ppOptions )
18371837
{
1838-
CPLAssert( pszAlgoritm );
1838+
CPLAssert( pszAlgorithm );
18391839
CPLAssert( peAlgorithm );
18401840
CPLAssert( ppOptions );
18411841

18421842
*ppOptions = NULL;
18431843

1844-
char **papszParms = CSLTokenizeString2( pszAlgoritm, ":", FALSE );
1844+
char **papszParms = CSLTokenizeString2( pszAlgorithm, ":", FALSE );
18451845

18461846
if ( CSLCount(papszParms) < 1 )
18471847
return CE_Failure;

alg/gdaltransformer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ GDALSuggestedWarpOutput2( GDALDatasetH hSrcDS,
800800

801801

802802
/* -------------------------------------------------------------------- */
803-
/* Recompute some bounds so that all return values are consistant */
803+
/* Recompute some bounds so that all return values are consistent */
804804
/* -------------------------------------------------------------------- */
805805
dfMaxXOut = dfMinXOut + (*pnPixels) * dfPixelSizeX;
806806
dfMinYOut = dfMaxYOut - (*pnLines) * dfPixelSizeY;

apps/gdal_rasterize.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ GDALDatasetH CreateOutputDataset(std::vector<OGRLayerH> ahLayers,
341341
}
342342

343343
/* When rasterizing point layers and that the bounds have */
344-
/* not been explicitely set, voluntary increase the extent by */
344+
/* not been explicitly set, voluntary increase the extent by */
345345
/* a half-pixel size to avoid missing points on the border */
346346
if (wkbFlatten(OGR_L_GetGeomType(hLayer)) == wkbPoint &&
347347
!bTargetAlignedPixels && dfXRes != 0 && dfYRes != 0)
@@ -479,7 +479,7 @@ int main( int argc, char ** argv )
479479
double dfXRes = 0, dfYRes = 0;
480480
int bCreateOutput = FALSE;
481481
const char* pszFormat = "GTiff";
482-
int bFormatExplicitelySet = FALSE;
482+
int bFormatExplicitlySet = FALSE;
483483
char **papszCreateOptions = NULL;
484484
GDALDriverH hDriver = NULL;
485485
GDALDataType eOutputType = GDT_Float64;
@@ -618,7 +618,7 @@ int main( int argc, char ** argv )
618618
else if( EQUAL(argv[i],"-of") && i < argc-1 )
619619
{
620620
pszFormat = argv[++i];
621-
bFormatExplicitelySet = TRUE;
621+
bFormatExplicitlySet = TRUE;
622622
bCreateOutput = TRUE;
623623
}
624624
else if( EQUAL(argv[i],"-init") && i < argc - 1 )
@@ -870,7 +870,7 @@ int main( int argc, char ** argv )
870870
exit( 1 );
871871
}
872872

873-
if (!bQuiet && !bFormatExplicitelySet)
873+
if (!bQuiet && !bFormatExplicitlySet)
874874
CheckExtensionConsistency(pszDstFilename, pszFormat);
875875
}
876876
else

apps/gdal_translate.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ static int ProxyMain( int argc, char ** argv )
279279
int i;
280280
int nRasterXSize, nRasterYSize;
281281
const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
282-
int bFormatExplicitelySet = FALSE;
282+
int bFormatExplicitlySet = FALSE;
283283
GDALDriverH hDriver;
284284
int *panBandList = NULL; /* negative value of panBandList[i] means mask band of ABS(panBandList[i]) */
285285
int nBandCount = 0, bDefBands = TRUE;
@@ -364,7 +364,7 @@ static int ProxyMain( int argc, char ** argv )
364364
else if( EQUAL(argv[i],"-of") && i < argc-1 )
365365
{
366366
pszFormat = argv[++i];
367-
bFormatExplicitelySet = TRUE;
367+
bFormatExplicitlySet = TRUE;
368368
}
369369

370370
else if( EQUAL(argv[i],"-q") || EQUAL(argv[i],"-quiet") )
@@ -760,7 +760,7 @@ static int ProxyMain( int argc, char ** argv )
760760
pfnProgress = GDALDummyProgress;
761761
}
762762

763-
if (!bQuiet && !bFormatExplicitelySet)
763+
if (!bQuiet && !bFormatExplicitlySet)
764764
CheckExtensionConsistency(pszDest, pszFormat);
765765

766766
/* -------------------------------------------------------------------- */

apps/gdal_utilities.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -1419,7 +1419,7 @@ Create an image with the pixels in all bands initialized to 255.
14191419
\endverbatim
14201420

14211421
Create an RGB image that shows blue in pixels with no data. The first two bands
1422-
will be initialized to 0 and the third band will be initalized to 255.
1422+
will be initialized to 0 and the third band will be initialized to 255.
14231423

14241424
\verbatim
14251425
% gdal_merge.py -init "0 0 255" -o out.tif in1.tif in2.tif

apps/gdaladdo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static void Usage(const char* pszErrorMsg = NULL)
5252
" filename: The file to build overviews for (or whose overviews must be removed).\n"
5353
" levels: A list of integral overview levels to build. Ignored with -clean option.\n"
5454
"\n"
55-
"Usefull configuration variables :\n"
55+
"Useful configuration variables :\n"
5656
" --config USE_RRD YES : Use Erdas Imagine format (.aux) as overview format.\n"
5757
"Below, only for external overviews in GeoTIFF format:\n"
5858
" --config COMPRESS_OVERVIEW {JPEG,LZW,PACKBITS,DEFLATE} : TIFF compression\n"

apps/gdaldem.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2237,7 +2237,7 @@ int main( int argc, char ** argv )
22372237
const char *pszDstFilename = NULL;
22382238
const char *pszColorFilename = NULL;
22392239
const char *pszFormat = "GTiff";
2240-
int bFormatExplicitelySet = FALSE;
2240+
int bFormatExplicitlySet = FALSE;
22412241
char **papszCreateOptions = NULL;
22422242

22432243
GDALDatasetH hSrcDataset = NULL;
@@ -2430,7 +2430,7 @@ int main( int argc, char ** argv )
24302430
{
24312431
CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
24322432
pszFormat = argv[++i];
2433-
bFormatExplicitelySet = TRUE;
2433+
bFormatExplicitlySet = TRUE;
24342434
}
24352435
else if( argv[i][0] == '-' )
24362436
{
@@ -2522,7 +2522,7 @@ int main( int argc, char ** argv )
25222522
exit( 1 );
25232523
}
25242524

2525-
if (!bQuiet && !bFormatExplicitelySet)
2525+
if (!bQuiet && !bFormatExplicitlySet)
25262526
CheckExtensionConsistency(pszDstFilename, pszFormat);
25272527

25282528
double dfDstNoDataValue = 0;

apps/gdalenhance.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ int main( int argc, char ** argv )
8989
GDALDatasetH hDataset, hOutDS;
9090
int i;
9191
const char *pszSource=NULL, *pszDest=NULL, *pszFormat = "GTiff";
92-
int bFormatExplicitelySet = FALSE;
92+
int bFormatExplicitlySet = FALSE;
9393
GDALDriverH hDriver;
9494
GDALDataType eOutputType = GDT_Unknown;
9595
char **papszCreateOptions = NULL;
@@ -130,7 +130,7 @@ int main( int argc, char ** argv )
130130
else if( EQUAL(argv[i],"-of") && i < argc-1 )
131131
{
132132
pszFormat = argv[++i];
133-
bFormatExplicitelySet = TRUE;
133+
bFormatExplicitlySet = TRUE;
134134
}
135135

136136
else if( EQUAL(argv[i],"-ot") && i < argc-1 )
@@ -265,7 +265,7 @@ int main( int argc, char ** argv )
265265
Usage();
266266
}
267267

268-
if (!bQuiet && pszDest != NULL && !bFormatExplicitelySet)
268+
if (!bQuiet && pszDest != NULL && !bFormatExplicitlySet)
269269
CheckExtensionConsistency(pszDest, pszFormat);
270270

271271
/* -------------------------------------------------------------------- */

apps/gdalsrsinfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ int FindSRS( const char *pszInput, OGRSpatialReference &oSRS )
271271
OGRErr eErr = CE_None;
272272
int bDebug = FALSE;
273273

274-
/* temporarily supress error messages we may get from xOpen() */
274+
/* temporarily suppress error messages we may get from xOpen() */
275275
bDebug = CSLTestBoolean(CPLGetConfigOption("CPL_DEBUG", "OFF"));
276276
if ( ! bDebug )
277277
oErrorHandler = CPLSetErrorHandler ( CPLQuietErrorHandler );

0 commit comments

Comments
 (0)