Skip to content

Commit

Permalink
typo fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rouault committed Oct 26, 2021
1 parent 35c07b1 commit 80b15ee
Show file tree
Hide file tree
Showing 27 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion alg/gdalwarper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,7 @@ GDALWarpDstAlphaMasker( void *pMaskFuncArg, int nBandCount,
* <li>input pixel = (1, 2, 127) ==> output pixel = (0, 0, 127, 255)</li>
* </ul>
*
* Note: NO was the default behaviour before GDAL 3.3.2
* Note: NO was the default behavior before GDAL 3.3.2
* </li>
* <li>When PARTIAL, or not specified at all (default behavior),
* nodata masking values is considered independently for each band.
Expand Down
2 changes: 1 addition & 1 deletion autotest/cpp/test_cpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3448,7 +3448,7 @@ namespace tut

constexpr int MAX_RAND_VAL = 32767;

// Slighly improved version of https://xkcd.com/221/, as suggested by
// Slightly improved version of https://xkcd.com/221/, as suggested by
// "man srand"
const auto DummyRand = [&]()
{
Expand Down
4 changes: 2 additions & 2 deletions doc/source/development/rfc/rfc81_coordinate_epoch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ Examples of dynamic CRS are ``WGS 84 (G1762)``, ``ITRF2014``, ``ATRF2014``.

The generic EPSG:4326 WGS 84 CRS is also considered dynamic, although it is
not recommended to use it due to being based on a datum ensemble whose positional
accuracy is 2 metres, but prefer one of its realizations, such as WGS 84 (G1762)
accuracy is 2 meters, but prefer one of its realizations, such as WGS 84 (G1762)

At time of writing, no formats handled by GDAL/OGR have a standardized way of
encoding a coordinate epoch. We consequently have made choices how to encode it,
admitedly not always elegant, with the aim of being as much as possible backward
admittedly not always elegant, with the aim of being as much as possible backward
compatible with existing readers.
Those encodings might change if corresponding official specifications
evolve to take this concept into account. But, as this is a bit of a chicken-and-egg
Expand Down
2 changes: 1 addition & 1 deletion doc/source/drivers/raster/grib.rst
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Open options
the bands. In particular, this allows an orders of magnitude
faster extraction of select bands from large GRIBv2 files on
remote storage (like NOMADS on AWS S3).
In order to avoid unncessary I/O only the text
In order to avoid unnecessary I/O only the text
description of the bands should be accessed as accessing the
metadata will require loading of the band header.
gdal_translate is supported but gdalinfo is not.
Expand Down
4 changes: 2 additions & 2 deletions doc/source/drivers/raster/gtiff.rst
Original file line number Diff line number Diff line change
Expand Up @@ -616,13 +616,13 @@ if all the following conditions are met:

- the source dataset is a JPEG file (or a VRT with a JPEG as a single SimpleSource)
- the target dataset is a JPEG-in-TIFF file
- no explicity target JPEG quality is specified
- no explicitly target JPEG quality is specified
- no change in colorspace is specified
- no sub-windowing is requested
- and more generally, no change that alters pixel values

The generation of a tiled JPEG-in-TIFF from the original JPEG image is possible.
Explicit assigment of target SRS and bounds are also possible.
Explicit assignment of target SRS and bounds are also possible.

So, the following commands will use the lossless copy method :

Expand Down
6 changes: 3 additions & 3 deletions doc/source/drivers/raster/netcdf.rst
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ or,

See also the configuration options **GDAL_NETCDF_VERIFY_DIMS** and
**GDAL_NETCDF_IGNORE_XY_AXIS_NAME_CHECKS** which control this
behaviour.
behavior.

Open options
------------
Expand Down Expand Up @@ -300,7 +300,7 @@ Variables attributes for: tos, lon, lat and time
time#bounds=time_bnds
time#original_units=seconds since 2001-1-1

Product specific behaviour
Product specific behavior
--------------------------

Sentinel 5
Expand Down Expand Up @@ -372,7 +372,7 @@ Creation Options
Creation of multidimensional files with CreateCopy() 2D raster API
------------------------------------------------------------------

Starting with GDAL 3.1, the prefered way of creating > 2D files is to use the
Starting with GDAL 3.1, the preferred way of creating > 2D files is to use the
the :ref:`multidim_raster_data_model` API. However it is possible to create
such files with the 2D raster API using the CreateCopy() method (note that at
time of writing, this is not supported using the Create() method).
Expand Down
2 changes: 1 addition & 1 deletion doc/source/drivers/raster/vicar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ The available creation options are:
information. Defaults to MIPL using the ``MAP`` property group. When setting to
GEOTIFF, a ``GEOTIFF`` property group will be used using GeoTIFF keys and tags.
The COORDINATE_SYSTEM_NAME, POSITIVE_LONGITUDE_DIRECTION and TARGET_NAME
options will be ignored when selectin the GEOTIFF encoding.
options will be ignored when selecting the GEOTIFF encoding.
- **COORDINATE_SYSTEM_NAME**\ =PLANETOCENTRIC/PLANETOGRAPHIC. Value of
MAP.COORDINATE_SYSTEM_NAME. Defaults to PLANETOCENTRIC. If specified, and
USE_SRC_MAP is in effect, this will be taken into account to
Expand Down
2 changes: 1 addition & 1 deletion doc/source/drivers/raster/vrt.rst
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ tag is not present, the source dataset will be opened at the same time as the VR
.. note::

Starting with GDAL 3.4, the ``SourceProperties`` element is no longer necessary
for defered opening of the source datasets.
for deferred opening of the source datasets.

The content of the SourceBand subelement can refer to
a mask band. For example mask,1 means the mask band of the first band of the source.
Expand Down
2 changes: 1 addition & 1 deletion doc/source/drivers/raster/wms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ other content before the ``<GDAL_WMS>`` element.
<BlockSizeX>1024</BlockSizeX> Block size in pixels. (optional, defaults to 1024, except for VirtualEarth)
<BlockSizeY>1024</BlockSizeY> Block size in pixels. (optional, defaults to 1024, except for VirtualEarth)
<OverviewCount>10</OverviewCount> Count of reduced resolution layers each having 2 times lower resolution. (optional, default is calculated at runtime)
<Cache> Enable local disk cache. Allows for offline operation. (optional but present in the autogenerated service file, cache is disabled when not present or if it is overriden with GDAL_ENABLE_WMS_CACHE=NO)
<Cache> Enable local disk cache. Allows for offline operation. (optional but present in the autogenerated service file, cache is disabled when not present or if it is overridden with GDAL_ENABLE_WMS_CACHE=NO)
<Path>./gdalwmscache</Path> Location where to store cache files. It is safe to use same cache path for different data sources. /vsimem/ paths are supported allowing for temporary in-memory cache. (optional, defaults to ./gdalwmscache if GDAL_DEFAULT_WMS_CACHE_PATH configuration option is not specified)
<Depth>2</Depth> Number of directory layers. 2 will result in files being written as cache_path/A/B/ABCDEF... (optional, defaults to 2)
<Extension>.jpg</Extension> Append to cache files. (optional, defaults to none)
Expand Down
2 changes: 1 addition & 1 deletion doc/source/drivers/raster/wmts.rst
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ It is important that there be no spaces or other content before the
| | cache is disabled when absent, |
| | but it is present in the |
| | autogenerated XML, can be |
| | overriden with |
| | overridden with |
| | GDAL_ENABLE_WMS_CACHE=NO |
+-----------------------------------+-----------------------------------+
| <Path>./gdalwmscache</Path> | Location where to store cache |
Expand Down
2 changes: 1 addition & 1 deletion doc/source/drivers/raster/zarr.rst
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ SRS encoding
------------

The Zarr specification has no provision for spatial reference system encoding.
GDAL uses a ``_CRS`` attribute that is a dictionnary that may contain one or
GDAL uses a ``_CRS`` attribute that is a dictionary that may contain one or
several of the following keys: ``url`` (using a OGC CRS URL), ``wkt`` (WKT:2019
used by default on writing, WKT1 also supported on reading.), ``projjson``.
On reading, it will use ``url`` by default, if not found will fallback to ``wkt``
Expand Down
2 changes: 1 addition & 1 deletion doc/source/drivers/vector/gpkg.rst
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ Two special hard-coded CRS are reserved per the GeoPackage specification:
creating a spatial layer without any explicit CRS

- SRID -1, for a Undefined Projected CRS. It might be selected by creating a
layer with a CRS instanciated from the following WKT string:
layer with a CRS instantiated from the following WKT string:
``LOCAL_CS["Undefined cartesian SRS"]``. (GDAL >= 3.3)

Level of support of GeoPackage Extensions
Expand Down
2 changes: 1 addition & 1 deletion doc/source/programs/gdalwarp.rst
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ with control information.

Force the use of vertical shift. This option is generally not necessary,
except when using an explicit coordinate transformation (:option:`-ct`),
and not specifying an explict source and target SRS.
and not specifying an explicit source and target SRS.

.. versionadded:: 3.4

Expand Down
2 changes: 1 addition & 1 deletion doc/source/user/coordinate_epoch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Examples of dynamic CRS are ``WGS 84 (G1762)``, ``ITRF2014``, ``ATRF2014``.

The generic EPSG:4326 WGS 84 CRS is also considered dynamic, although it is
not recommended to use it due to being based on a datum ensemble whose positional
accuracy is 2 metres, but prefer one of its realizations, such as WGS 84 (G1762)
accuracy is 2 meters, but prefer one of its realizations, such as WGS 84 (G1762)

The :cpp:func:`OGRSpatialReference::IsDynamic` method can be used to test if
a CRS is a dynamic one.
Expand Down
2 changes: 1 addition & 1 deletion frmts/gtiff/libtiff/tif_jpeg.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
*/
#include <setjmp.h>

/* Settings that are independ of libjpeg ABI. Used when reinitializing the */
/* Settings that are independent of libjpeg ABI. Used when reinitializing the */
/* JPEGState from libjpegs 8 bit to libjpeg 12 bits, which have potentially */
/* different ABI */
typedef struct {
Expand Down
2 changes: 1 addition & 1 deletion frmts/mrf/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Meta Raster Format

MRF is a GDAL raster format designed to be cloud friendly and can also be used as a tile storage and as a local pass-through caching.
It implementes multiple per-tile storage formats, including JPEG,PNG,LERC,ZSTD and DEFLATE.
It implements multiple per-tile storage formats, including JPEG,PNG,LERC,ZSTD and DEFLATE.

Up to date documentation: [MUG](https://github.com/nasa-gibs/mrf/blob/master/doc/MUG.md)
MRF specific utilities: [NASA-GIBS/mrf](https://github.com/nasa-gibs/mrf)
2 changes: 1 addition & 1 deletion frmts/mrf/mrf_band.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -944,7 +944,7 @@ CPLErr MRFRasterBand::IReadBlock(int xblk, int yblk, void *buffer) {
auto ctx = poDS->getzsd();
if (!ctx) {
CPLFree(data);
CPLError(CE_Failure, CPLE_AppDefined, "Can't aquire ZSTD context");
CPLError(CE_Failure, CPLE_AppDefined, "Can't acquire ZSTD context");
return CE_Failure;
}
if (img.pageSizeBytes > INT_MAX - 1440) {
Expand Down
2 changes: 1 addition & 1 deletion frmts/pds/pds4dataset.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3566,7 +3566,7 @@ void PDS4Dataset::CreateHeader(CPLXMLNode* psProduct,
}
}

// Depending on the vrsion of the DISP schema, Local_Internal_Reference
// Depending on the version of the DISP schema, Local_Internal_Reference
// may be in the disp: namespace or the default one.
const auto GetLocalIdentifierReferenceFromDisciplineArea =
[](const CPLXMLNode* psDisciplineArea, const char* pszDefault)
Expand Down
2 changes: 1 addition & 1 deletion frmts/zarr/zarr_group.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

ZarrGroupBase::~ZarrGroupBase()
{
// We need to explictly flush arrays so that the _ARRAY_DIMENSIONS
// We need to explicitly flush arrays so that the _ARRAY_DIMENSIONS
// is properly written. As it relies on checking if the dimensions of the
// array have an indexing variable, then still need to be all alive.
for( auto& kv: m_oMapMDArrays )
Expand Down
4 changes: 2 additions & 2 deletions gcore/gdalproxypool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -683,9 +683,9 @@ GDALProxyPoolDataset::GDALProxyPoolDataset( const char* pszSourceDatasetDescript
/* Create() */
/************************************************************************/

/* Instanciate a GDALProxyPoolDataset where the parameters (raster size, etc.)
/* Instantiate a GDALProxyPoolDataset where the parameters (raster size, etc.)
* are obtained by opening the underlying dataset.
* Its bands are also instanciated.
* Its bands are also instantiated.
*/
GDALProxyPoolDataset* GDALProxyPoolDataset::Create( const char* pszSourceDatasetDescription,
CSLConstList papszOpenOptions,
Expand Down
6 changes: 3 additions & 3 deletions ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flatbuffers.h
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ template<typename T, uint16_t length> class Array {

void CopyFromSpanImpl(flatbuffers::integral_constant<bool, true>,
flatbuffers::span<const T, length> src) {
// Use std::memcpy() instead of std::copy() to avoid preformance degradation
// Use std::memcpy() instead of std::copy() to avoid performance degradation
// due to aliasing if T is char or unsigned char.
// The size is known at compile time, so memcpy would be inlined.
std::memcpy(data(), src.data(), length * sizeof(T));
Expand Down Expand Up @@ -2204,7 +2204,7 @@ class FlatBufferBuilder {
return reinterpret_cast<T *>(buf_.make_space(vector_size * sizeof(T)));
}

// End the vector of structues in the flatbuffers.
// End the vector of structures in the flatbuffers.
// Vector should have previously be started with StartVectorOfStructs().
template<typename T>
Offset<Vector<const T *>> EndVectorOfStructs(size_t vector_size) {
Expand Down Expand Up @@ -2821,7 +2821,7 @@ inline int LookupEnum(const char **names, const char *name) {

// Minimal reflection via code generation.
// Besides full-fat reflection (see reflection.h) and parsing/printing by
// loading schemas (see idl.h), we can also have code generation for mimimal
// loading schemas (see idl.h), we can also have code generation for minimal
// reflection data which allows pretty-printing and other uses without needing
// a schema or a parser.
// Generate code with --reflect-types (types only) or --reflect-names (names
Expand Down
2 changes: 1 addition & 1 deletion ogr/ogrsf_frmts/flatgeobuf/flatbuffers/flexbuffers.h
Original file line number Diff line number Diff line change
Expand Up @@ -1086,7 +1086,7 @@ class Builder FLATBUFFERS_FINAL_CLASS {
return stack_.size();
}

// TODO(wvo): allow this to specify an aligment greater than the natural
// TODO(wvo): allow this to specify an alignment greater than the natural
// alignment.
size_t EndVector(size_t start, bool typed, bool fixed) {
auto vec = CreateVector(start, stack_.size() - start, 1, typed, fixed);
Expand Down
4 changes: 2 additions & 2 deletions ogr/ogrspatialreference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7166,9 +7166,9 @@ OGRErr OSRSetPolyconic( OGRSpatialReferenceH hSRS,
*
* Two variants are possible:
* - Polar Stereographic Variant A: dfCenterLat must be +/- 90° and is
* interpretated as the latitude of origin, combined with the scale factor
* interpreted as the latitude of origin, combined with the scale factor
* - Polar Stereographic Variant B: dfCenterLat is different from +/- 90° and
* is interpretated as the latitude of true scale. In that situation, dfScale
* is interpreted as the latitude of true scale. In that situation, dfScale
* must be set to 1 (it is ignored in the projection parameters)
*/
OGRErr OGRSpatialReference::SetPS(
Expand Down
2 changes: 1 addition & 1 deletion port/cpl_userfaultfd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ cpl_uffd_context* CPLCreateUserFaultMapping(const char * pszFilename, void ** pp
// Since kernel 5.2, raw userfaultfd is disabled since if the fault originates
// from the kernel, that could lead to easier exploitation of kernel bugs.
// Since kernel 5.11, UFFD_USER_MODE_ONLY can be used to restrict the mechanism
// to faults occuring only from user space, which is likely to be our use case.
// to faults occurring only from user space, which is likely to be our use case.
ctx->uffd = static_cast<int>(syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY));
if( ctx->uffd == -1 && errno == EINVAL )
ctx->uffd = static_cast<int>(syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK));
Expand Down
2 changes: 1 addition & 1 deletion port/cpl_vsil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ char** VSIGetFileMetadata( const char * pszFilename, const char* pszDomain,
* <li>HEADERS: specific to /vsis3/ and /vsigs/: to set HTTP headers, such as
* "Content-Type", or other file system specific header.
* For /vsigs/, this also includes: x-goog-meta-{key}={value}. Note that you
* should specify all metadata to be set, as existing metadata will be overriden.
* should specify all metadata to be set, as existing metadata will be overridden.
* </li>
* <li>TAGS: Content of papszMetadata should be KEY=VALUE pairs.
* <ul>
Expand Down
2 changes: 1 addition & 1 deletion scripts/analyze_ossfuzz.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def add_occurence(category_id):
add_occurence('integer_overflow_unsigned')
else:
if 'harmless' in msg:
add_occurence('integer_overflow_harmless') # one occurence due to atoi()
add_occurence('integer_overflow_harmless') # one occurrence due to atoi()
else:
add_occurence('integer_overflow_signed')
elif 'out of bound' in msg or 'heap' in msg or 'buffer' in msg or 'container overflow' in msg or 'array' in msg or 'read overflow' in msg:
Expand Down
2 changes: 1 addition & 1 deletion scripts/fix_typos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ if ! test -d fix_typos; then
)
fi

EXCLUDED_FILES="*/.svn*,configure,config.status,config.guess,config.sub,*/autom4te.cache/*,*.ai,*.svg"
EXCLUDED_FILES="*/.svn*,configure,config.log,config.status,config.guess,config.sub,*/autom4te.cache/*,*.ai,*.svg"
EXCLUDED_FILES="$EXCLUDED_FILES,*/hdf-eos/*,teststream.out,ogrogdilayer.cpp"
EXCLUDED_FILES="$EXCLUDED_FILES,*/doc/build/*,*/data/*,figures.mp,*/tmp/*,*/ruby/*"
EXCLUDED_FILES="$EXCLUDED_FILES,*/fix_typos/*,fix_typos.sh,*.eps,geopackage_aspatial.html"
Expand Down

0 comments on commit 80b15ee

Please sign in to comment.