From d4ab8af3c9efe8305927e5ad3010fe341224923f Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Thu, 15 Aug 2024 21:53:12 +0200 Subject: [PATCH] Fix various typos found by 'make spelling' --- alg/gdalproximity.cpp | 2 +- alg/gdaltransformer.cpp | 12 +++--- alg/gdalwarper.cpp | 2 +- .../development/rfc/rfc19_safememalloc.rst | 2 +- .../rfc/rfc39_ogr_layer_algebra.rst | 2 +- .../rfc/rfc41_multiple_geometry_fields.rst | 6 +-- .../rfc/rfc46_gdal_ogr_unification.rst | 18 ++++----- .../development/rfc/rfc47_dataset_caching.rst | 2 +- .../rfc/rfc52_strict_sql_quoting.rst | 2 +- .../rfc/rfc54_dataset_transactions.rst | 36 +++++++++--------- .../rfc/rfc59.1_utilities_as_a_library.rst | 16 ++++---- doc/source/development/rfc/rfc5_unicode.rst | 2 +- .../rfc/rfc69_cplusplus_formatting.rst | 8 ++-- doc/source/development/rfc/rfc6_sqlgeom.rst | 38 +++++++++---------- .../rfc/rfc73_proj6_wkt2_srsbarn.rst | 2 +- .../rfc/rfc75_multidimensional_arrays.rst | 2 +- doc/source/development/rfc/rfc7_vsilapi.rst | 4 +- .../rfc/rfc96_deferred_plugin_loading.rst | 4 +- doc/source/drivers/raster/fits.rst | 8 ++-- doc/source/drivers/raster/georaster.rst | 2 +- doc/source/drivers/raster/isis3.rst | 4 +- doc/source/drivers/raster/jpipkak.rst | 2 +- doc/source/drivers/raster/netcdf.rst | 2 +- doc/source/drivers/raster/safe.rst | 2 +- doc/source/drivers/raster/vrt.rst | 2 +- doc/source/drivers/vector/amigocloud.rst | 2 +- doc/source/drivers/vector/elasticsearch.rst | 20 +++++----- .../drivers/vector/plscenes_data_v1.rst | 2 +- doc/source/programs/gdal_calc.rst | 2 +- doc/source/programs/gdalmdimtranslate.rst | 2 +- doc/source/programs/ogrmerge.rst | 2 +- doc/source/programs/sozip.rst | 2 +- frmts/grib/gribcreatecopy.cpp | 8 ++-- gcore/gdalmultidim.cpp | 14 +++---- ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd | 6 +-- port/cpl_odbc.h | 2 +- swig/include/python/docs/ogr_feature_docs.i | 2 +- swig/include/python/docs/ogr_layer_docs.i | 2 +- swig/include/python/docs/osr_docs.i | 2 +- swig/include/python/gdal_python.i | 4 +- 40 files changed, 127 insertions(+), 127 deletions(-) diff --git a/alg/gdalproximity.cpp b/alg/gdalproximity.cpp index 8b4109605137..9f9adf8e97de 100644 --- a/alg/gdalproximity.cpp +++ b/alg/gdalproximity.cpp @@ -103,7 +103,7 @@ the proximity output. FIXED_BUF_VAL=n -If this option is set, all pixels within the MAXDIST threadhold are +If this option is set, all pixels within the MAXDIST threshold are set to this fixed value instead of to a proximity distance. */ diff --git a/alg/gdaltransformer.cpp b/alg/gdaltransformer.cpp index 263fbc2fa08d..4cee18948698 100644 --- a/alg/gdaltransformer.cpp +++ b/alg/gdaltransformer.cpp @@ -1765,13 +1765,13 @@ static void GDALGCPAntimeridianUnwrap(int nGCPCount, GDAL_GCP *pasGCPList, * a PROJ or WKT string, used as an override over the normally computed * pipeline. The pipeline must take into account the axis order of the source * and target SRS.
  • COORDINATE_EPOCH: (GDAL >= 3.0) Coordinate epoch, - * expressed as a decimal year. Useful for time-dependant coordinate operations. + * expressed as a decimal year. Useful for time-dependent coordinate operations. *
    • *
  • SRC_COORDINATE_EPOCH: (GDAL >= 3.4) Coordinate epoch of source CRS, - * expressed as a decimal year. Useful for time-dependant coordinate operations. + * expressed as a decimal year. Useful for time-dependent coordinate operations. *
    • *
  • DST_COORDINATE_EPOCH: (GDAL >= 3.4) Coordinate epoch of target CRS, - * expressed as a decimal year. Useful for time-dependant coordinate operations. + * expressed as a decimal year. Useful for time-dependent coordinate operations. *
    • *
  • GCPS_OK: If false, GCPs will not be used, default is TRUE. *
    • @@ -3366,11 +3366,11 @@ void *GDALCreateReprojectionTransformer(const char *pszSrcWKT, *
  • COORDINATE_OPERATION=string: PROJ or WKT string representing a * coordinate operation, overriding the default computed transformation.
    • *
  • COORDINATE_EPOCH=decimal_year: Coordinate epoch, expressed as a - * decimal year. Useful for time-dependant coordinate operations.
    • + * decimal year. Useful for time-dependent coordinate operations. *
  • SRC_COORDINATE_EPOCH: (GDAL >= 3.4) Coordinate epoch of source CRS, - * expressed as a decimal year. Useful for time-dependant coordinate + * expressed as a decimal year. Useful for time-dependent coordinate *operations.
  • DST_COORDINATE_EPOCH: (GDAL >= 3.4) Coordinate epoch - *of target CRS, expressed as a decimal year. Useful for time-dependant + *of target CRS, expressed as a decimal year. Useful for time-dependent *coordinate operations.
    • * * diff --git a/alg/gdalwarper.cpp b/alg/gdalwarper.cpp index 129e8d54a855..d061cadb8736 100644 --- a/alg/gdalwarper.cpp +++ b/alg/gdalwarper.cpp @@ -1221,7 +1221,7 @@ CPLErr GDALWarpDstAlphaMasker(void *pMaskFuncArg, int nBandCount, * is sufficient. Depending on the transformation in effect, the source * window may be a bit too small, or even missing large areas. Problem * situations are those where the transformation is very non-linear or - * "inside out". Examples are transforming from WGS84 to Polar Steregraphic + * "inside out". Examples are transforming from WGS84 to Polar Stereographic * for areas around the pole, or transformations where some of the image is * untransformable. The following options provide some additional control * to deal with errors in computing the source window: diff --git a/doc/source/development/rfc/rfc19_safememalloc.rst b/doc/source/development/rfc/rfc19_safememalloc.rst index a5e1e6ed034e..3f87189dce54 100644 --- a/doc/source/development/rfc/rfc19_safememalloc.rst +++ b/doc/source/development/rfc/rfc19_safememalloc.rst @@ -26,7 +26,7 @@ scanlines, whole image buffers, etc.. Currently no overflow checking is done, thus leading to potential allocation of not large enough buffers. Overflow can occur when raster dimensions are very large (this can be the case with a WMS raster source for example) or when a dataset is -corrupted, intentionnaly or unintentionnaly. This can lead to latter +corrupted, intentionally or unintentionally. This can lead to latter crash. This RFC introduces new API to allocate memory when the computation of diff --git a/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst b/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst index 9ff04717b88a..b43204430492 100644 --- a/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst +++ b/doc/source/development/rfc/rfc39_ogr_layer_algebra.rst @@ -19,7 +19,7 @@ for commonly needed overlay analysis methods. The basic functionality for spatial analysis with GDAL is provided by GEOS. However, GEOS operates on geometries and typically people work with geospatial data layers. Vector data layers are represented in GDAL -by OGRLayer objects. Thus, there is a need for spatial analaysis +by OGRLayer objects. Thus, there is a need for spatial analysis operations that work on layers. Unfortunately there is no standard for spatial analysis operations API, diff --git a/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst b/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst index 4153ecb1949b..7eb801f26eac 100644 --- a/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst +++ b/doc/source/development/rfc/rfc41_multiple_geometry_fields.rst @@ -122,7 +122,7 @@ The OGRFeatureDefn class will be extended as the following : virtual void AddGeomFieldDefn( OGRGeomFieldDefn * ); virtual OGRErr DeleteGeomFieldDefn( int iGeomField ); - // Route OGRwkbGeometryType GetGeomType() and void SetGeomType() + // Route OGRwkbGeometryType GetGeomType() and void SetGeomType() // on the first geometry field definition. // Same for IsGeometryIgnored() and SetGeometryIgnored() @@ -179,7 +179,7 @@ The OGRFeature class will be extended as following : OGRErr SetGeomFieldDirectly( int iField, OGRGeometry * ); OGRErr SetGeomField( int iField, OGRGeometry * ); - // Route SetGeometryDirectly(), SetGeometry(), GetGeometryRef(), + // Route SetGeometryDirectly(), SetGeometry(), GetGeometryRef(), // StealGeometry() on the first geometry field in the array // Modify implementation of SetFrom() to replicate all geometries @@ -343,7 +343,7 @@ different in most use cases. (On the other side, if we introduce 64bit integer as a OGR type (this is an RFC that is waiting for implementation...), the above code would -still produce a meaningful result. The string reprentation of a 64bit +still produce a meaningful result. The string representation of a 64bit integer is not that bad as a default behavior.) GetFieldCount() would also take into account geometry fields, but in diff --git a/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst b/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst index 84690691bb6f..7c7dbba22985 100644 --- a/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst +++ b/doc/source/development/rfc/rfc46_gdal_ogr_unification.rst @@ -264,7 +264,7 @@ Drivers and driver registration driver level because, in practice, layer creation options do not depend on the dataset instance. The value of this item is an XML snippet with a format similar to dataset creation - options. + options. If specified, the passed creation options to CreateLayer() are validated against that authorized creation option list. Below an example of such an authorized open option list in the Shapefile driver. @@ -305,17 +305,17 @@ Datasets / Datasources virtual int TestCapability( const char * ) { return FALSE; } - virtual OGRLayer *CreateLayer( const char *pszName, + virtual OGRLayer *CreateLayer( const char *pszName, OGRSpatialReference *poSpatialRef = NULL, OGRwkbGeometryType eGType = wkbUnknown, char ** papszOptions = NULL ); - virtual OGRLayer *CopyLayer( OGRLayer *poSrcLayer, - const char *pszNewName, + virtual OGRLayer *CopyLayer( OGRLayer *poSrcLayer, + const char *pszNewName, char **papszOptions = NULL ); virtual OGRStyleTable *GetStyleTable(); virtual void SetStyleTableDirectly( OGRStyleTable *poStyleTable ); - + virtual void SetStyleTable(OGRStyleTable *poStyleTable); virtual OGRLayer * ExecuteSQL( const char *pszStatement, @@ -337,7 +337,7 @@ Datasets / Datasources OGRLayerH CPL_DLL GDALDatasetGetLayer( GDALDatasetH, int ); OGRLayerH CPL_DLL GDALDatasetGetLayerByName( GDALDatasetH, const char * ); OGRErr CPL_DLL GDALDatasetDeleteLayer( GDALDatasetH, int ); - OGRLayerH CPL_DLL GDALDatasetCreateLayer( GDALDatasetH, const char *, + OGRLayerH CPL_DLL GDALDatasetCreateLayer( GDALDatasetH, const char *, OGRSpatialReferenceH, OGRwkbGeometryType, char ** ); OGRLayerH CPL_DLL GDALDatasetCopyLayer( GDALDatasetH, OGRLayerH, const char *, @@ -383,7 +383,7 @@ Datasets / Datasources :: - virtual OGRLayer *ICreateLayer( const char *pszName, + virtual OGRLayer *ICreateLayer( const char *pszName, OGRSpatialReference *poSpatialRef = NULL, OGRwkbGeometryType eGType = wkbUnknown, char ** papszOptions = NULL ); @@ -397,7 +397,7 @@ Datasets / Datasources creation option list (GDAL_DS_LAYER_CREATIONOPTIONLIST), before calling ICreateLayer() (this is similar to RasterIO() / IRasterIO() ) A global pass on all in-tree OGR drivers has been made to rename CreateLayer() - as ICreateLayer(). + as ICreateLayer(). - GDALOpenEx() is added to be able to open raster-only, vector-only, or raster-vector datasets. It accepts read-only/update mode, @@ -533,7 +533,7 @@ Changes in drivers a file to determine if they recognize it. They have been converted to GDALDriver to accept a GDALOpenInfo argument and they now use its pabyHeader field to examine the first bytes of files. The number of - system calls realated to file access (open/stat), in order to + system calls related to file access (open/stat), in order to determine that a file is not recognized by any OGR driver, has now dropped from 46 in GDAL 1.11 to 1. The converted drivers are : AeronavFAA, ArcGEN, AVCBin, AVCE00, BNA, CSV, DGN, EDIGEO, ESRI diff --git a/doc/source/development/rfc/rfc47_dataset_caching.rst b/doc/source/development/rfc/rfc47_dataset_caching.rst index a84c74ceb814..1c2191079a7f 100644 --- a/doc/source/development/rfc/rfc47_dataset_caching.rst +++ b/doc/source/development/rfc/rfc47_dataset_caching.rst @@ -70,7 +70,7 @@ periods once the cache is full, and new memory is being initialized in GDALRasterBlock::Internalize(). In order to remove the need for this LRU cache to be locked more often a -new global config option is introducted "GDAL_DATASET_CACHING". This +new global config option is added "GDAL_DATASET_CACHING". This causes the LRU cache to be per dataset when set to "YES", rather then a global cache ("NO" Default). Doing this will also allow threaded applications to flush only the cache for a single dataset, improving diff --git a/doc/source/development/rfc/rfc52_strict_sql_quoting.rst b/doc/source/development/rfc/rfc52_strict_sql_quoting.rst index 8c93bee98883..3b251ee5f1b4 100644 --- a/doc/source/development/rfc/rfc52_strict_sql_quoting.rst +++ b/doc/source/development/rfc/rfc52_strict_sql_quoting.rst @@ -73,7 +73,7 @@ This change affects compatibility in the sense that users that relied on the current permissive behavior will have to adapt their SQL expressions. This might be quite tricky to detect as it will not always cause obvious runtime failures. For example " SELECT -'i_thought_this_would_be_interpreted_as_a_column_name_but_now_it_is_a_string_litteral' +'i_thought_this_would_be_interpreted_as_a_column_name_but_now_it_is_a_string_literal' FROM atable " will run without error but not produce the previously expected result. So applications will have to review how they build SQL filters ( SetAttributeFilter() ) and expressions ( ExecuteSQL() ) diff --git a/doc/source/development/rfc/rfc54_dataset_transactions.rst b/doc/source/development/rfc/rfc54_dataset_transactions.rst index 63a65120fa7f..6f4d7d8cb392 100644 --- a/doc/source/development/rfc/rfc54_dataset_transactions.rst +++ b/doc/source/development/rfc/rfc54_dataset_transactions.rst @@ -96,7 +96,7 @@ MySQL other reading) because of the use of mysql_use_result() that can work with one single request at a time. mysql_store_result() would be a solution but requires ingesting the whole result set into memory, - which is inpractical for big layers. + which is impractical for big layers. - step does not set row changes once the query has started (if done through another connection, because if done through ExecuteSQL() the long transaction is interrupted) @@ -134,36 +134,36 @@ OGRDataSource which inherits from GDALDataset). /** \brief For datasources which support transactions, StartTransaction creates a transaction. - If starting the transaction fails, will return - OGRERR_FAILURE. Datasources which do not support transactions will + If starting the transaction fails, will return + OGRERR_FAILURE. Datasources which do not support transactions will always return OGRERR_UNSUPPORTED_OPERATION. Nested transactions are not supported. - + All changes done after the start of the transaction are definitely applied in the datasource if CommitTransaction() is called. They may be canceled by calling RollbackTransaction() instead. - + At the time of writing, transactions only apply on vector layers. - + Datasets that support transactions will advertise the ODsCTransactions capability. Use of transactions at dataset level is generally preferred to transactions at layer level, whose scope is rarely limited to the layer from which it was started. - + In case StartTransaction() fails, neither CommitTransaction() or RollbackTransaction() should be called. - + If an error occurs after a successful StartTransaction(), the whole transaction may or may not be implicitly canceled, depending on drivers. (e.g. the PG driver will cancel it, SQLite/GPKG not). In any case, in the event of an error, an explicit call to RollbackTransaction() should be done to keep things balanced. - + 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 explicitly allow for such an emulation by setting bForce to TRUE. Drivers that offer emulated transactions should advertise the ODsCEmulatedTransactions capability (and not ODsCTransactions). - + This function is the same as the C function GDALDatasetStartTransaction(). @param bForce can be set to TRUE if an emulation, possibly slow, of a transaction @@ -182,10 +182,10 @@ OGRDataSource which inherits from GDALDataset). /** \brief For datasources which support transactions, CommitTransaction commits a transaction. - If no transaction is active, or the commit fails, will return - OGRERR_FAILURE. Datasources which do not support transactions will - always return OGRERR_UNSUPPORTED_OPERATION. - + If no transaction is active, or the commit fails, will return + OGRERR_FAILURE. Datasources which do not support transactions will + always return OGRERR_UNSUPPORTED_OPERATION. + Depending on drivers, this may or may not abort layer sequential readings that are active. @@ -202,11 +202,11 @@ OGRDataSource which inherits from GDALDataset). /** \brief For datasources which support transactions, RollbackTransaction will roll - back a datasource to its state before the start of the current transaction. + back a datasource to its state before the start of the current transaction. - If no transaction is active, or the rollback fails, will return + If no transaction is active, or the rollback fails, will return OGRERR_FAILURE. Datasources which do not support transactions will - always return OGRERR_UNSUPPORTED_OPERATION. + always return OGRERR_UNSUPPORTED_OPERATION. This function is the same as the C function GDALDatasetRollbackTransaction(). @@ -244,7 +244,7 @@ whose data is supported by files/directories. :: /** Returns a new datasource object that adds transactional behavior to an existing datasource. - * + * * The provided poTransactionBehaviour object should implement driver-specific * behavior for transactions. * diff --git a/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst b/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst index a21637e17aae..202dfa7f4d4c 100644 --- a/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst +++ b/doc/source/development/rfc/rfc59.1_utilities_as_a_library.rst @@ -395,13 +395,13 @@ keywords. So various combinations are possible : :: - def WarpOptions(options = [], format = 'GTiff', + def WarpOptions(options = [], format = 'GTiff', outputBounds = None, outputBoundsSRS = None, xRes = None, yRes = None, targetAlignedPixels = False, width = 0, height = 0, srcSRS = None, dstSRS = None, - srcAlpha = False, dstAlpha = False, + srcAlpha = False, dstAlpha = False, warpOptions = None, errorThreshold = None, warpMemoryLimit = None, creationOptions = None, outputType = GDT_Unknown, workingType = GDT_Unknown, resampleAlg = None, @@ -467,7 +467,7 @@ keywords. So various combinations are possible : :: - def VectorTranslateOptions(options = [], format = 'ESRI Shapefile', + def VectorTranslateOptions(options = [], format = 'ESRI Shapefile', accessMode = None, srcSRS = None, dstSRS = None, reproject = True, SQLStatement = None, SQLDialect = None, where = None, selectFields = None, spatFilter = None, @@ -553,7 +553,7 @@ keywords. So various combinations are possible : :: - def NearblackOptions(options = [], format = 'GTiff', + def NearblackOptions(options = [], format = 'GTiff', creationOptions = None, white = False, colors = None, maxNonBlack = None, nearDist = None, setAlpha = False, setMask = False, callback = None, callback_data = None): @@ -564,7 +564,7 @@ keywords. So various combinations are possible : creationOptions --- list of creation options white --- whether to search for nearly white (255) pixels instead of nearly black pixels. colors --- list of colors to search for, e.g. ((0,0,0),(255,255,255)). The pixels that are considered as the collar are set to 0 - maxNonBlack --- number of non-black (or other searched colors specified with white / colors) pixels that can be encountered before the giving up search inwards. Defaults to 2. + maxNonBlack --- number of non-black (or other searched colors specified with white / colors) pixels that can be encountered before the giving up search inwards. Defaults to 2. nearDist --- select how far from black, white or custom colors the pixel values can be and still considered near black, white or custom color. Defaults to 15. setAlpha --- adds an alpha band if the output file. setMask --- adds a mask band to the output file. @@ -635,7 +635,7 @@ keywords. So various combinations are possible : :: - def RasterizeOptions(options = [], format = None, + def RasterizeOptions(options = [], format = None, creationOptions = None, noData = None, initValues = None, outputBounds = None, outputSRS = None, width = None, height = None, @@ -660,8 +660,8 @@ keywords. So various combinations are possible : bands --- list of output bands to burn values into inverse --- whether to invert rasterization, ie burn the fixed burn value, or the burn value associated with the first feature into all parts of the image not inside the provided a polygon. allTouched -- whether to enable the ALL_TOUCHED rasterization option so that all pixels touched by lines or polygons will be updated, not just those on the line render path, or whose center point is within the polygon. - burnValues -- list of fixed values to burn into each band for all objects. Excusive with attribute. - attribute --- identifies an attribute field on the features to be used for a burn-in value. The value will be burned into all output bands. Excusive with burnValues. + burnValues -- list of fixed values to burn into each band for all objects. Exclusive with attribute. + attribute --- identifies an attribute field on the features to be used for a burn-in value. The value will be burned into all output bands. Exclusive with burnValues. useZ --- whether to indicate that a burn value should be extracted from the "Z" values of the feature. These values are added to the burn value given by burnValues or attribute if provided. As of now, only points and lines are drawn in 3D. layers --- list of layers from the datasource that will be used for input features. SQLStatement --- SQL statement to apply to the source dataset diff --git a/doc/source/development/rfc/rfc5_unicode.rst b/doc/source/development/rfc/rfc5_unicode.rst index 6405f30fda7e..d24d6c50d2f4 100644 --- a/doc/source/development/rfc/rfc5_unicode.rst +++ b/doc/source/development/rfc/rfc5_unicode.rst @@ -32,7 +32,7 @@ means we should convert user's input from the local encoding to UTF-8 during interactive sessions. The opposite should be done for GDAL output. For example, when user passes a filename as a command-line parameter to GDAL utilities, that filename should be immediately -converted to UTF-8 and only afetrwards passed to functions like +converted to UTF-8 and only afterwards passed to functions like GDALOpen() or OGROpen(). All functions, which take character strings as parameters, assume UTF-8 (with except of several ones, which will do the conversion between different encodings, see Implementation). The same is diff --git a/doc/source/development/rfc/rfc69_cplusplus_formatting.rst b/doc/source/development/rfc/rfc69_cplusplus_formatting.rst index 14a0621f8f47..dad776a33a13 100644 --- a/doc/source/development/rfc/rfc69_cplusplus_formatting.rst +++ b/doc/source/development/rfc/rfc69_cplusplus_formatting.rst @@ -13,7 +13,7 @@ Contact: schwehr@google.com / schwehr@gmail.com Co-Author: Alessandro Pasotti Contact: elpaso@itopen.it Started: 2017-May-04 -Status: Adpoted, implemented +Status: Adopted, implemented =========== ====================================== This RFC is based on `GEOS RFC @@ -159,11 +159,11 @@ different styles mixed. To skip the "big reformat" commit from ``git blame``, git offers a mechanism to [git_blame_ignore] , a pre-configured ignore file ``.git-blame-ignore-revs`` -will be provided in the source tree with the "big reformat" commit +will be provided in the source tree with the "big reformat" commit hash in it. -The ignore file can be specified on the command line with -``git blame --ignore-revs-file .git-blame-ignore-revs`` or it can be set +The ignore file can be specified on the command line with +``git blame --ignore-revs-file .git-blame-ignore-revs`` or it can be set permanently with ``git config blame.ignoreRevsFile .git-blame-ignore-revs``. The a.m. instructions will be added to the `developers documentation `__. diff --git a/doc/source/development/rfc/rfc6_sqlgeom.rst b/doc/source/development/rfc/rfc6_sqlgeom.rst index 611df0abb41a..2fd5fb7dac0e 100644 --- a/doc/source/development/rfc/rfc6_sqlgeom.rst +++ b/doc/source/development/rfc/rfc6_sqlgeom.rst @@ -64,9 +64,9 @@ for the field names and types in ogrfeaturequery.cpp as :: - char* SpecialFieldNames[SPECIAL_FIELD_COUNT] + char* SpecialFieldNames[SPECIAL_FIELD_COUNT] = {"FID", "OGR_GEOMETRY", "OGR_STYLE", "OGR_GEOM_WKT"}; - swq_field_type SpecialFieldTypes[SPECIAL_FIELD_COUNT] + swq_field_type SpecialFieldTypes[SPECIAL_FIELD_COUNT] = {SWQ_INTEGER, SWQ_STRING, SWQ_STRING, SWQ_STRING}; So as to make this array accessible to the other files the followings @@ -165,7 +165,7 @@ added to OGRFeature in ogrfeature.h as: :: - char * m_pszTmpFieldValue; + char * m_pszTmpFieldValue; This member will be initialized to NULL at the constructor, and will be freed using CPLFree() at the destructor of OGRFeature. @@ -180,7 +180,7 @@ m_pszTmpFieldValue at the beginning of the function: :: CPLFree(m_pszTmpFieldValue); - m_pszTmpFieldValue = NULL; + m_pszTmpFieldValue = NULL; In ogrfeaturequery.cpp we should change OGRFeatureQuery::Compile to add the special fields like: @@ -195,7 +195,7 @@ the special fields like: ++iField; } -In ogrfeaturequery.cpp OGRFeatureQueryEvaluator() should be modifyed +In ogrfeaturequery.cpp OGRFeatureQueryEvaluator() should be modified according to the field specific actions like :: @@ -211,7 +211,7 @@ according to the field specific actions like sField.Integer = poFeature->GetFieldAsInteger( op->field_index ); case SWQ_STRING: sField.String = (char*) poFeature->GetFieldAsString( op->field_index ); - } + } } else { @@ -224,12 +224,12 @@ according to the field specific actions like psField = poFeature->GetRawFieldRef( op->field_index ); In ogrfeaturequery.cpp OGRFeatureQuery::FieldCollector should be -modifyed to add the field names like: +modified to add the field names like: :: if( op->field_index >= poTargetDefn->GetFieldCount() - && op->field_index < poTargetDefn->GetFieldCount() + SPECIAL_FIELD_COUNT) + && op->field_index < poTargetDefn->GetFieldCount() + SPECIAL_FIELD_COUNT) pszFieldName = SpecialFieldNames[op->field_index]; In ogrdatasource.cpp ExecuteSQL() will allocate the arrays according to @@ -237,13 +237,13 @@ the number of the special fields: :: - sFieldList.names = (char **) + sFieldList.names = (char **) CPLMalloc( sizeof(char *) * (nFieldCount+SPECIAL_FIELD_COUNT) ); - sFieldList.types = (swq_field_type *) + sFieldList.types = (swq_field_type *) CPLMalloc( sizeof(swq_field_type) * (nFieldCount+SPECIAL_FIELD_COUNT) ); - sFieldList.table_ids = (int *) + sFieldList.table_ids = (int *) CPLMalloc( sizeof(int) * (nFieldCount+SPECIAL_FIELD_COUNT) ); - sFieldList.ids = (int *) + sFieldList.ids = (int *) CPLMalloc( sizeof(int) * (nFieldCount+SPECIAL_FIELD_COUNT) ); And the fields will be added as @@ -288,10 +288,10 @@ field values): :: - pszError = swq_select_summarize( psSelectInfo, iField, + pszError = swq_select_summarize( psSelectInfo, iField, poSrcFeature->GetFieldAsString( psColDef->field_index ) ); -OGRGenSQLResultsLayer::TranslateFeature should also be modifyed when +OGRGenSQLResultsLayer::TranslateFeature should also be modified when copying the fields from primary record to the destination feature :: @@ -350,19 +350,19 @@ the same function as: } When ordering by the field values the OGRGenSQLResultsLayer::Compare -should also be modifyed: +should also be modified: :: if( psKeyDef->field_index >= iFIDFieldIndex ) poFDefn = NULL; else - poFDefn = poSrcLayer->GetLayerDefn()->GetFieldDefn( + poFDefn = poSrcLayer->GetLayerDefn()->GetFieldDefn( psKeyDef->field_index ); - if( (pasFirstTuple[iKey].Set.nMarker1 == OGRUnsetMarker + if( (pasFirstTuple[iKey].Set.nMarker1 == OGRUnsetMarker && pasFirstTuple[iKey].Set.nMarker2 == OGRUnsetMarker) - || (pasSecondTuple[iKey].Set.nMarker1 == OGRUnsetMarker + || (pasSecondTuple[iKey].Set.nMarker1 == OGRUnsetMarker && pasSecondTuple[iKey].Set.nMarker2 == OGRUnsetMarker) ) nResult = 0; else if ( poFDefn == NULL ) @@ -397,7 +397,7 @@ straightforward and the following steps should be made: 3. The field value accessors (OGRFeature::GetFieldAsString, OGRFeature::GetFieldAsInteger, OGRFeature::GetFieldAsDouble) should - be modifyed to provide the value of the new special field. All of + be modified to provide the value of the new special field. All of these functions provide const return values so GetFieldAsString should retain the value in the m_pszTmpFieldValue member. diff --git a/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst b/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst index f26d7a625549..6ea971daddb1 100644 --- a/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst +++ b/doc/source/development/rfc/rfc73_proj6_wkt2_srsbarn.rst @@ -253,7 +253,7 @@ Alternatively the OSR_WKT_FORMAT configuration option can be used to modify the WKT version used by exportToWk() (when no explicit version is passed in the options of exportToWkt()) -The gdalinfo, ogrinfo and gdalsrsinfo utililies will default to +The gdalinfo, ogrinfo and gdalsrsinfo utilities will default to outputting WKT2:2018 Axis order issues diff --git a/doc/source/development/rfc/rfc75_multidimensional_arrays.rst b/doc/source/development/rfc/rfc75_multidimensional_arrays.rst index ab8d6ef4213b..021109202372 100644 --- a/doc/source/development/rfc/rfc75_multidimensional_arrays.rst +++ b/doc/source/development/rfc/rfc75_multidimensional_arrays.rst @@ -26,7 +26,7 @@ spatio-temporal (time series of 2D raster) or spatio-vertical-temporal (2D + Z dimension + time dimension) data which are becoming increasingly more available. GDAL current raster model is however strongly 2D oriented. A number of drivers, such as netCDF, HDF4, HDF5, work around that -limitation by using raster bands or subdatasets to expose muliple 2D slices of what +limitation by using raster bands or subdatasets to expose multiple 2D slices of what is intrinsically a N>2 Multidimensional dataset. It is desirable to have a proper API, and driver support, to be able to expose those multidimensional arrays as such, and be able to perform slice and trim operations on them. diff --git a/doc/source/development/rfc/rfc7_vsilapi.rst b/doc/source/development/rfc/rfc7_vsilapi.rst index 558e4d258d6f..6e152b40ce21 100644 --- a/doc/source/development/rfc/rfc7_vsilapi.rst +++ b/doc/source/development/rfc/rfc7_vsilapi.rst @@ -96,7 +96,7 @@ Implementation -------------- The whole source tree ( port, gcore, frmts, ogr, swig/include ) will be -altered adequatly so that the compilation works in VSIL_STRICT_ENFORCE +altered adequately so that the compilation works in VSIL_STRICT_ENFORCE mode. Ticket #3799 contains a patch with the implementation. The compilation doesn't add any new warning. The autotest suite still works after this change. @@ -108,7 +108,7 @@ process have been compiled. In the conversion process, a misuse of POSIX FILE API with a large file handler was discovered in the ceos2 driver, but the function happened to -be unusued. +be unused. Voting History -------------- diff --git a/doc/source/development/rfc/rfc96_deferred_plugin_loading.rst b/doc/source/development/rfc/rfc96_deferred_plugin_loading.rst index dbaf1386dcdc..0125fcee587c 100644 --- a/doc/source/development/rfc/rfc96_deferred_plugin_loading.rst +++ b/doc/source/development/rfc/rfc96_deferred_plugin_loading.rst @@ -377,7 +377,7 @@ done by code external to libgdal core. However, the candidate implementation hits an issue with the way the GDAL CondaForge builds work currently. At time of writing, the GDAL CondaForge -build recipee does: +build recipe does: - a regular GDAL build without Arrow/Parquet dependency (and thus without the driver), whose libgdal.so goes in to the libgdal package. @@ -389,7 +389,7 @@ build recipee does: But that modified libgdal.so is discarded currently, and the ogr_Parquet.so plugin then depends on a identify method that is not implemented. -The initial idea was that the build recipee would have to be modified to produce +The initial idea was that the build recipe would have to be modified to produce all artifacts (libgdal.so and libparquet.so) at a single time, and dispatch them appropriately in libgdal and libgdal-arrow-parquet packages, rather than doing two builds. However, CondaForge builds support several libarrow versions, diff --git a/doc/source/drivers/raster/fits.rst b/doc/source/drivers/raster/fits.rst index b73949c9d74e..39a05798e1c1 100644 --- a/doc/source/drivers/raster/fits.rst +++ b/doc/source/drivers/raster/fits.rst @@ -244,7 +244,7 @@ of the field. Fields that have TSCAL and/or TZERO headers are automatically scaled and offset to the physical value (only applies to numeric data types) -TNULL headers are used for integer numeric data types and for a single-occurence +TNULL headers are used for integer numeric data types and for a single-occurrence field to set a OGR field to NULL. Layer creation options @@ -351,10 +351,10 @@ Linux ^^^^^ From source """"""""""" -Install CFITSIO headers from your distro (eg, cfitsio-devel on Fedora; libcfitsio-dev on Debian-Ubuntu), then compile GDAL as usual. CFITSIO will be automatically detected and linked. +Install CFITSIO headers from your distribution (eg, cfitsio-devel on Fedora; libcfitsio-dev on Debian-Ubuntu), then compile GDAL as usual. CFITSIO will be automatically detected and linked. -From distros -"""""""""""" +From distributions +"""""""""""""""""" On Fedora/CentOS install CFITSIO then GDAL with dnf (yum): cfitsio is automatically linked. MacOSX diff --git a/doc/source/drivers/raster/georaster.rst b/doc/source/drivers/raster/georaster.rst index c900917f7972..bde1efe71aa0 100644 --- a/doc/source/drivers/raster/georaster.rst +++ b/doc/source/drivers/raster/georaster.rst @@ -451,7 +451,7 @@ Extracting: gdal_translate geor:spock/lion@orcl,gdal_rdt,101 out.tif Note: On the above example that accessing by RDT/RID doesn't need -schame name as long as the users is granted full access to both +same name as long as the users is granted full access to both tables. Loading: diff --git a/doc/source/drivers/raster/isis3.rst b/doc/source/drivers/raster/isis3.rst index f74e70aab96f..a160de4a6efb 100644 --- a/doc/source/drivers/raster/isis3.rst +++ b/doc/source/drivers/raster/isis3.rst @@ -23,7 +23,7 @@ well as selected other header metadata. Starting with GDAL 2.2, a mask band is attached to each source band. The value of this mask band is 0 when the pixel value is the NULL value or -one of the low/high on-intstrument/processed saturation value, or 255 +one of the low/high on-instrument/processed saturation value, or 255 when the pixel value is valid. Implementation of this driver was supported by the United States @@ -318,7 +318,7 @@ Python : from osgeo import gdal src_ds = gdal.Open('in.lbl') - # Load source label as JSON + # Load source label as JSON label = json.loads( src_ds.GetMetadata_List('json:ISIS3')[0] ) # Update parameter label["IsisCube"]["Mapping"]["TargetName"] = "Moon" diff --git a/doc/source/drivers/raster/jpipkak.rst b/doc/source/drivers/raster/jpipkak.rst index f9cb29822bd5..f13fd313ec71 100644 --- a/doc/source/drivers/raster/jpipkak.rst +++ b/doc/source/drivers/raster/jpipkak.rst @@ -51,7 +51,7 @@ are made at the 1:1 resolution level. the resolution associated with the requested view-window. The values 'fx' and 'fy' specify the dimensions of the desired image resolution. 'roff' is used to identify the upper left hand corner off the spatial - region associated with the requested view-windw. 'rsiz' is used to + region associated with the requested view-window. 'rsiz' is used to identify the horizontal and vertical extents of the spatial region associated with the requested view-window. diff --git a/doc/source/drivers/raster/netcdf.rst b/doc/source/drivers/raster/netcdf.rst index 9769eebf66bc..78e95193eb70 100644 --- a/doc/source/drivers/raster/netcdf.rst +++ b/doc/source/drivers/raster/netcdf.rst @@ -482,7 +482,7 @@ The following creation options are available: these variables by default. In import the CF "grid_mapping" variable takes precedence and the GDAL tags are used if they do not conflict with CF metadata. In GDAL 4, spatial_ref will not be exported. The - crs_wkt CF metatata attribute will be used instead. + crs_wkt CF metadata attribute will be used instead. - .. co:: WRITE_LONLAT :choices: YES, NO, IF_NEEDED diff --git a/doc/source/drivers/raster/safe.rst b/doc/source/drivers/raster/safe.rst index 8c9b9f2ed91b..1cde8c865389 100644 --- a/doc/source/drivers/raster/safe.rst +++ b/doc/source/drivers/raster/safe.rst @@ -43,7 +43,7 @@ If the product contains multiple measurements (for example multiple polarizations), each one is available as a raster band - if the swath is the same. When the swath is the same, the geographic area is the same. -If the product contains multiple swaths and multiple polatizations, the +If the product contains multiple swaths and multiple polarizations, the driver shows the first swath by default. To access other swaths, the user must select a specific subdataset. diff --git a/doc/source/drivers/raster/vrt.rst b/doc/source/drivers/raster/vrt.rst index 342edba77da2..a7399412e6c9 100644 --- a/doc/source/drivers/raster/vrt.rst +++ b/doc/source/drivers/raster/vrt.rst @@ -1362,7 +1362,7 @@ set to VRTDerivedRasterBand) are : - **PixelFunctionCode** (required if PixelFunctionType is of the form "function_name", ignored otherwise). The in-lined code of a Python module, that must be at least have a function whose name is given by PixelFunctionType. -- **BufferRadius** (optional, defaults to 0): Amount of extra pixels, with respect to the original RasterIO() request to satisfy, that are fetched at the left, right, bottom and top of the input and output buffers passed to the pixel function. Note that the values of the output buffer in this buffer zone willbe ignored. +- **BufferRadius** (optional, defaults to 0): Amount of extra pixels, with respect to the original RasterIO() request to satisfy, that are fetched at the left, right, bottom and top of the input and output buffers passed to the pixel function. Note that the values of the output buffer in this buffer zone will be ignored. - **SkipNonContributingSources** (optional, added in GDAL 3.7, defaults to false) = true/false: Whether sources that do not intersect the VRTRasterBand RasterIO() requested region should be omitted. By default, data for all sources, including ones that do not intersect it, are passed to the pixel function. By setting this parameter to false, only sources that intersect the requested region will be passed. diff --git a/doc/source/drivers/vector/amigocloud.rst b/doc/source/drivers/vector/amigocloud.rst index 4b3bb665668a..b407169a25c3 100644 --- a/doc/source/drivers/vector/amigocloud.rst +++ b/doc/source/drivers/vector/amigocloud.rst @@ -42,7 +42,7 @@ Currently the following one is supported : If several parameters are specified, they must be separated by a space. -If no datset_id is provided, the driver will print list of available +If no dataset_id is provided, the driver will print list of available datasets for given project. For example: **"AmigoCloud:1234 datasets"** diff --git a/doc/source/drivers/vector/elasticsearch.rst b/doc/source/drivers/vector/elasticsearch.rst index 8de33bc3d10e..5a799ffc7a20 100644 --- a/doc/source/drivers/vector/elasticsearch.rst +++ b/doc/source/drivers/vector/elasticsearch.rst @@ -250,7 +250,7 @@ Starting with GDAL 2.2, SQL requests, involving a single layer, with WHERE and ORDER BY statements will be translated as Elasticsearch queries. -Otherwise, if specifying "ES" as the dialect of ExecuteSQL(), a JSON +Otherwise, if specifying "ES" as the dialect of ExecuteSQL(), a JSON string with a serialized `Elastic Search filter `__ can be passed. The search will be done on all indices and types, unless @@ -312,9 +312,9 @@ Aggregations The driver can support issuing aggregation requests to an index. ElasticSearch aggregations can potentially be rather complex, so the driver currently limits -to geohash grid based spatial aggegrations, with additional fields with +to geohash grid based spatial aggregation, with additional fields with statistical indicators (min, max, average, .), which can be used for example -to generate heatmaps. The specification of the aggegation is done through +to generate heatmaps. The specification of the aggregation is done through the :oo:`AGGREGATION` open option, whose value is a JSON serialized object whose members are: @@ -324,7 +324,7 @@ members are: `geohash grid aggregation `__. For documents with points encoded as GeoJSON, this will be for example `geometry.coordinates`. When this property is not specified, the driver will analyze the mapping and use the geometry field definition - found into it (provided there is a single one). Note that aggegration on + found into it (provided there is a single one). Note that aggregation on geo_shape geometries is only supported since Elasticsearch 7 and may require a non-free license. @@ -347,22 +347,22 @@ members are: fields should be added, that can have the following members: * ``min`` (optional): array with the paths to index properties on which - to compute the minimum during aggegation. + to compute the minimum during aggregation. * ``max`` (optional): array with the paths to index properties on which - to compute the maximum during aggegation. + to compute the maximum during aggregation. * ``avg`` (optional): array with the paths to index properties on which - to compute the average during aggegation. + to compute the average during aggregation. * ``sum`` (optional): array with the paths to index properties on which - to compute the sum during aggegation. + to compute the sum during aggregation. * ``count`` (optional): array with the paths to index properties on which - to compute the value_count during aggegation. + to compute the value_count during aggregation. * ``stats`` (optional): array with the paths to index properties on which - to compute all the above indicators during aggegation. + to compute all the above indicators during aggregation. When using a GeoJSON mapping, the path to an index property is typically ``property.some_name``. diff --git a/doc/source/drivers/vector/plscenes_data_v1.rst b/doc/source/drivers/vector/plscenes_data_v1.rst index da7cfe97736c..c5dc8cddf89a 100644 --- a/doc/source/drivers/vector/plscenes_data_v1.rst +++ b/doc/source/drivers/vector/plscenes_data_v1.rst @@ -133,7 +133,7 @@ The following configuration options are available: Attributes ---------- -The layer field definition is built from the "plscensconf.json" file in +The layer field definition is built from the "plscenesconf.json" file in the GDAL configuration. The links to downloadable products are in *asset_XXXXX_location* attributes where XXXXX is the asset category id, when they are active. Otherwise they should be activated by sending a diff --git a/doc/source/programs/gdal_calc.rst b/doc/source/programs/gdal_calc.rst index 9e752b1a6f51..98527d1a1ebf 100644 --- a/doc/source/programs/gdal_calc.rst +++ b/doc/source/programs/gdal_calc.rst @@ -82,7 +82,7 @@ but no projection checking is performed (unless projectionCheck option is used). .. note:: - Despite the datatype set using ``--type``, when doing intermediate aritmethic operations using operands of the + Despite the datatype set using ``--type``, when doing intermediate arithmetic operations using operands of the same type, the operation result will honor the original datatype. This may lead into unexpected results in the final result. .. note:: diff --git a/doc/source/programs/gdalmdimtranslate.rst b/doc/source/programs/gdalmdimtranslate.rst index 0cb0bdd2b8a5..fdc37075ab08 100644 --- a/doc/source/programs/gdalmdimtranslate.rst +++ b/doc/source/programs/gdalmdimtranslate.rst @@ -118,7 +118,7 @@ The following command line parameters can appear in any order. Performs a subsetting (trimming or slicing) operation along a dimension, provided that it is indexed by a 1D variable of numeric or string data type, - and whose values are monotically sorted. + and whose values are monotonically sorted. follows exactly the `OGC WCS 2.0 KVP encoding `__ for subsetting. diff --git a/doc/source/programs/ogrmerge.rst b/doc/source/programs/ogrmerge.rst index 0f39f5fa09ac..743e1f5d378d 100644 --- a/doc/source/programs/ogrmerge.rst +++ b/doc/source/programs/ogrmerge.rst @@ -88,7 +88,7 @@ potential manual editing of it and :program:`ogr2ogr` can be done. Name of the output vector layer (in single mode, and the default is "merged"), or template to name the output vector layers in default mode (the default value is ``{AUTO_NAME}``). The template can be a - string with the following variables that will be susbstitued with a + string with the following variables that will be substituted with a value computed from the input layer being processed: - ``{AUTO_NAME}``: equivalent to ``{DS_BASENAME}_{LAYER_NAME}`` if both diff --git a/doc/source/programs/sozip.rst b/doc/source/programs/sozip.rst index 0ace8a573167..fd4344226c8f 100644 --- a/doc/source/programs/sozip.rst +++ b/doc/source/programs/sozip.rst @@ -79,7 +79,7 @@ The :program:`sozip` utility can be used to: Validates a SOZip file. Baseline ZIP validation is done in a light way, limited to being able to browse through ZIP records with the InfoZIP-based ZIP reader used by GDAL. But validation of the SOZip-specific aspects is - done in a more thoroughful way. + done in a more thorougful way. .. option:: -r .. option:: --recurse-paths diff --git a/frmts/grib/gribcreatecopy.cpp b/frmts/grib/gribcreatecopy.cpp index 763c98b7114f..56c1bf3cc635 100644 --- a/frmts/grib/gribcreatecopy.cpp +++ b/frmts/grib/gribcreatecopy.cpp @@ -180,7 +180,7 @@ class GRIB2Section3Writer bool WriteMercator1SP(); bool WriteMercator2SP(OGRSpatialReference *poSRS = nullptr); bool WriteTransverseMercator(); - bool WritePolarSteregraphic(); + bool WritePolarStereographic(); bool WriteLCC1SP(); bool WriteLCC2SPOrAEA(OGRSpatialReference *poSRS = nullptr); bool WriteLAEA(); @@ -547,10 +547,10 @@ bool GRIB2Section3Writer::WriteTransverseMercator() } /************************************************************************/ -/* WritePolarSteregraphic() */ +/* WritePolarStereographic() */ /************************************************************************/ -bool GRIB2Section3Writer::WritePolarSteregraphic() +bool GRIB2Section3Writer::WritePolarStereographic() { WriteUInt16(fp, GS3_POLAR); // Grid template number WriteEllipsoidAndRasterSize(); @@ -803,7 +803,7 @@ bool GRIB2Section3Writer::Write() } else if (pszProjection && EQUAL(pszProjection, SRS_PT_POLAR_STEREOGRAPHIC)) { - bRet = WritePolarSteregraphic(); + bRet = WritePolarStereographic(); } else if (pszProjection != nullptr && EQUAL(pszProjection, SRS_PT_LAMBERT_CONFORMAL_CONIC_1SP)) diff --git a/gcore/gdalmultidim.cpp b/gcore/gdalmultidim.cpp index 6d3d550bf2c1..70cd579b6018 100644 --- a/gcore/gdalmultidim.cpp +++ b/gcore/gdalmultidim.cpp @@ -770,7 +770,7 @@ GUInt64 GDALGroup::GetTotalCopyCost() const * @param poSrcDS Source dataset. Might be nullptr (but for correct behavior * of some output drivers this is not recommended) * @param poSrcGroup Source group. Must NOT be nullptr. - * @param bStrict Whether to enable stict mode. In strict mode, any error will + * @param bStrict Whether to enable strict mode. In strict mode, any error will * stop the copy. In relaxed mode, the copy will be attempted to * be pursued. * @param nCurCost Should be provided as a variable initially set to 0. @@ -2120,7 +2120,7 @@ bool GDALAbstractMDArray::CheckReadWriteParams( * count[] and with the spacing of bufferStride[]. * * @param pDstBufferAllocStart Optional pointer that can be used to validate the - * validty of pDstBuffer. pDstBufferAllocStart + * validity of pDstBuffer. pDstBufferAllocStart * should be the pointer returned by the malloc() or equivalent call used to * allocate the buffer. It will generally be equal to pDstBuffer (when * bufferStride[] values are all positive), but not necessarily. If specified, @@ -2128,7 +2128,7 @@ bool GDALAbstractMDArray::CheckReadWriteParams( * validation is needed, nullptr can be passed. * * @param nDstBufferAllocSize Optional buffer size, that can be used to - * validate the validty of pDstBuffer. This is the size of the buffer starting + * validate the validity of pDstBuffer. This is the size of the buffer starting * at pDstBufferAllocStart. If specified, pDstBufferAllocStart should be also * set to the appropriate value. * If no validation is needed, 0 can be passed. @@ -2224,7 +2224,7 @@ bool GDALAbstractMDArray::IWrite(const GUInt64 *, const size_t *, * count[] and with the spacing of bufferStride[]. * * @param pSrcBufferAllocStart Optional pointer that can be used to validate the - * validty of pSrcBuffer. pSrcBufferAllocStart + * validity of pSrcBuffer. pSrcBufferAllocStart * should be the pointer returned by the malloc() or equivalent call used to * allocate the buffer. It will generally be equal to pSrcBuffer (when * bufferStride[] values are all positive), but not necessarily. If specified, @@ -2232,7 +2232,7 @@ bool GDALAbstractMDArray::IWrite(const GUInt64 *, const size_t *, * validation is needed, nullptr can be passed. * * @param nSrcBufferAllocSize Optional buffer size, that can be used to - * validate the validty of pSrcBuffer. This is the size of the buffer starting + * validate the validity of pSrcBuffer. This is the size of the buffer starting * at pSrcBufferAllocStart. If specified, pDstBufferAllocStart should be also * set to the appropriate value. * If no validation is needed, 0 can be passed. @@ -3924,7 +3924,7 @@ bool GDALMDArray::CopyFromAllExceptValues(const GDALMDArray *poSrcArray, * @param poSrcDS Source dataset. Might be nullptr (but for correct behavior * of some output drivers this is not recommended) * @param poSrcArray Source array. Should NOT be nullptr. - * @param bStrict Whether to enable stict mode. In strict mode, any error will + * @param bStrict Whether to enable strict mode. In strict mode, any error will * stop the copy. In relaxed mode, the copy will be attempted to * be pursued. * @param nCurCost Should be provided as a variable initially set to 0. @@ -5697,7 +5697,7 @@ CreateFieldNameExtractArray(const std::shared_ptr &self, * array, with the values in first dimension reversed. That is * [[4,5,6,7],[0,1,2,3]]. *
  • GetView("[newaxis,...]"): returns a - * 3-dimensional array, with an addditional dimension of size 1 put at the + * 3-dimensional array, with an additional dimension of size 1 put at the * beginning. That is [[[0,1,2,3],[4,5,6,7]]].
    • * * diff --git a/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd b/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd index 35c180e45327..e2fb61574cf0 100644 --- a/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd +++ b/ogr/ogrsf_frmts/gmlas/data/gmlasconf.xsd @@ -456,7 +456,7 @@ - Maximum file size allowed. + Maximum file size allowed. Default: 1 MB. @@ -890,7 +890,7 @@ Line format. - Default is platform dependant (CR-LF on Windows, LF otherwise) + Default is platform dependent (CR-LF on Windows, LF otherwise) @@ -898,7 +898,7 @@ - Platform dependant (CR-LF on Windows, LF otherwise) + Platform dependent (CR-LF on Windows, LF otherwise) diff --git a/port/cpl_odbc.h b/port/cpl_odbc.h index 935ef1009874..0fbfeb87fcda 100644 --- a/port/cpl_odbc.h +++ b/port/cpl_odbc.h @@ -74,7 +74,7 @@ class CPL_DLL CPLODBCDriverInstaller /** * Installs ODBC driver or updates definition of already installed driver. - * Interanally, it calls ODBC's SQLInstallDriverEx function. + * Internally, it calls ODBC's SQLInstallDriverEx function. * * @param pszDriver - The driver definition as a list of keyword-value * pairs describing the driver (See ODBC API Reference). diff --git a/swig/include/python/docs/ogr_feature_docs.i b/swig/include/python/docs/ogr_feature_docs.i index 6e73d15d1619..9be69f82625a 100644 --- a/swig/include/python/docs/ogr_feature_docs.i +++ b/swig/include/python/docs/ogr_feature_docs.i @@ -581,7 +581,7 @@ Returns the native media type for the feature. The native media type is the identifier for the format of the native data. It follows the IANA RFC 2045 -(seehttps://en.wikipedia.org/wiki/Media_type), e.g. +(see https://en.wikipedia.org/wiki/Media_type), e.g. \"application/vnd.geo+json\" for JSon. See :cpp:func:`OGRFeature::GetNativeMediaType` and :ref:`rfc-60`. diff --git a/swig/include/python/docs/ogr_layer_docs.i b/swig/include/python/docs/ogr_layer_docs.i index 59d1b86ed06d..180845de7738 100644 --- a/swig/include/python/docs/ogr_layer_docs.i +++ b/swig/include/python/docs/ogr_layer_docs.i @@ -47,7 +47,7 @@ force: int, default=False can_return_null: int, default=False Whether None can be returned in the response. geom_field: int, default=0 - Ithe index of the geometry field on which to compute the extent. + The index of the geometry field on which to compute the extent. Can be iterated over using :py:func:`range` and :py:func:`GetGeomFieldCount`. Returns diff --git a/swig/include/python/docs/osr_docs.i b/swig/include/python/docs/osr_docs.i index 7f05b90e2e16..eb139579918d 100644 --- a/swig/include/python/docs/osr_docs.i +++ b/swig/include/python/docs/osr_docs.i @@ -9,7 +9,7 @@ Parameters src : SpatialReference source spatial reference system dst : SpatialReference - target spatial reference ystem + target spatial reference system options : CoordinateTransformationOptions Returns diff --git a/swig/include/python/gdal_python.i b/swig/include/python/gdal_python.i index 7823544a8182..0f6cb1bfc347 100644 --- a/swig/include/python/gdal_python.i +++ b/swig/include/python/gdal_python.i @@ -3908,10 +3908,10 @@ def RasterizeOptions(options=None, format=None, render path, or whose center point is within the polygon. burnValues: list of fixed values to burn into each band for all objects. - Excusive with attribute. + Exclusive with attribute. attribute: identifies an attribute field on the features to be used for a burn-in value. - The value will be burned into all output bands. Excusive with burnValues. + The value will be burned into all output bands. Exclusive with burnValues. useZ: whether to indicate that a burn value should be extracted from the "Z" values of the feature. These values are added to the burn value given by burnValues