diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/4D_api.cpp | 2 | ||||
| -rw-r--r-- | src/apps/cs2cs.cpp | 4 | ||||
| -rw-r--r-- | src/ell_set.cpp | 2 | ||||
| -rw-r--r-- | src/geodesic.h | 2 | ||||
| -rw-r--r-- | src/grids.cpp | 2 | ||||
| -rw-r--r-- | src/internal.cpp | 2 | ||||
| -rw-r--r-- | src/iso19111/c_api.cpp | 10 | ||||
| -rw-r--r-- | src/iso19111/common.cpp | 2 | ||||
| -rw-r--r-- | src/iso19111/coordinateoperation.cpp | 8 | ||||
| -rw-r--r-- | src/iso19111/io.cpp | 6 | ||||
| -rw-r--r-- | src/iso19111/metadata.cpp | 6 | ||||
| -rw-r--r-- | src/iso19111/util.cpp | 2 | ||||
| -rw-r--r-- | src/malloc.cpp | 2 | ||||
| -rw-r--r-- | src/networkfilemanager.cpp | 4 | ||||
| -rw-r--r-- | src/projections/isea.cpp | 2 | ||||
| -rw-r--r-- | src/projections/ocea.cpp | 4 | ||||
| -rw-r--r-- | src/projections/tmerc.cpp | 4 | ||||
| -rw-r--r-- | src/strtod.cpp | 2 | ||||
| -rw-r--r-- | src/transformations/vgridshift.cpp | 2 |
19 files changed, 34 insertions, 34 deletions
diff --git a/src/4D_api.cpp b/src/4D_api.cpp index 069093f2..2b00011d 100644 --- a/src/4D_api.cpp +++ b/src/4D_api.cpp @@ -605,7 +605,7 @@ static int cs2cs_emulation_setup (PJ *P) { /************************************************************************************** If any cs2cs style modifiers are given (axis=..., towgs84=..., ) create the 4D API equivalent operations, so the preparation and finalization steps in the pj_inv/pj_fwd -invocators can emulate the behaviour of pj_transform and the cs2cs app. +invocators can emulate the behavior of pj_transform and the cs2cs app. Returns 1 on success, 0 on failure **************************************************************************************/ diff --git a/src/apps/cs2cs.cpp b/src/apps/cs2cs.cpp index c99e16e0..58c164c9 100644 --- a/src/apps/cs2cs.cpp +++ b/src/apps/cs2cs.cpp @@ -117,10 +117,10 @@ static void process(FILE *fid) /* To avoid breaking existing tests, we read what is a possible t */ /* component of the input and rewind the s-pointer so that the final */ - /* output has consistent behaviour, with or without t values. */ + /* output has consistent behavior, with or without t values. */ /* This is a bit of a hack, in most cases 4D coordinates will be */ /* written to STDOUT (except when using -E) but the output format */ - /* speficied with -f is not respected for the t component, rather it */ + /* specified with -f is not respected for the t component, rather it */ /* is forward verbatim from the input. */ char *before_time = s; double t = strtod(s, &s); diff --git a/src/ell_set.cpp b/src/ell_set.cpp index 434ae76d..ddd507ac 100644 --- a/src/ell_set.cpp +++ b/src/ell_set.cpp @@ -70,7 +70,7 @@ int pj_ellipsoid (PJ *P) { are are taken into account as modifiers for the built in ellipsoid definition. While this may seem strange, it is in accordance with historical PROJ - behaviour. It can e.g. be used to define coordinates on the ellipsoid + behavior. It can e.g. be used to define coordinates on the ellipsoid scaled to unit semimajor axis by specifying "+ellps=xxx +a=1" ****************************************************************************************/ diff --git a/src/geodesic.h b/src/geodesic.h index e2265c89..b21e6c8c 100644 --- a/src/geodesic.h +++ b/src/geodesic.h @@ -476,7 +476,7 @@ extern "C" { /** * Initialize a geod_geodesicline object in terms of the direct geodesic - * problem spacified in terms of either distance or arc length. + * problem specified in terms of either distance or arc length. * * @param[out] l a pointer to the object to be initialized. * @param[in] g a pointer to the geod_geodesic object specifying the diff --git a/src/grids.cpp b/src/grids.cpp index 9dc1723e..067d3d45 100644 --- a/src/grids.cpp +++ b/src/grids.cpp @@ -1118,7 +1118,7 @@ insertIntoHierarchy(PJ_CONTEXT *ctx, std::unique_ptr<GridType> &&grid, const auto &extent = grid->extentAndRes(); // If we have one or both of grid_name and parent_grid_name, try to use - // the names to recreate the hiearchy + // the names to recreate the hierarchy if (!gridName.empty()) { if (mapGrids.find(gridName) != mapGrids.end()) { pj_log(ctx, PJ_LOG_DEBUG_MAJOR, "Several grids called %s found!", diff --git a/src/internal.cpp b/src/internal.cpp index b4b7a683..91994077 100644 --- a/src/internal.cpp +++ b/src/internal.cpp @@ -475,7 +475,7 @@ void proj_context_log_debug (PJ_CONTEXT *ctx, const char *fmt, ...) { /*****************************************************************************/ void proj_log_trace (PJ *P, const char *fmt, ...) { /****************************************************************************** - For reporting embarrasingly detailed debugging information. + For reporting embarrassingly detailed debugging information. ******************************************************************************/ va_list args; va_start( args, fmt ); diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp index 6b726f34..200ac454 100644 --- a/src/iso19111/c_api.cpp +++ b/src/iso19111/c_api.cpp @@ -1,7 +1,7 @@ /****************************************************************************** * * Project: PROJ - * Purpose: C API wraper of C++ API + * Purpose: C API wrapper of C++ API * Author: Even Rouault <even dot rouault at spatialys dot com> * ****************************************************************************** @@ -1354,7 +1354,7 @@ const char *proj_get_id_code(const PJ *obj, int index) { * supported options are: * <ul> * <li>MULTILINE=YES/NO. Defaults to YES, except for WKT1_ESRI</li> - * <li>INDENTATION_WIDTH=number. Defauls to 4 (when multiline output is + * <li>INDENTATION_WIDTH=number. Defaults to 4 (when multiline output is * on).</li> * <li>OUTPUT_AXIS=AUTO/YES/NO. In AUTO mode, axis will be output for WKT2 * variants, for WKT1_GDAL for ProjectedCRS with easting/northing ordering @@ -1524,7 +1524,7 @@ const char *proj_as_proj_string(PJ_CONTEXT *ctx, const PJ *obj, * supported options are: * <ul> * <li>MULTILINE=YES/NO. Defaults to YES</li> - * <li>INDENTATION_WIDTH=number. Defauls to 2 (when multiline output is + * <li>INDENTATION_WIDTH=number. Defaults to 2 (when multiline output is * on).</li> * <li>SCHEMA=string. URL to PROJJSON schema. Can be set to empty string to * disable it.</li> @@ -3198,7 +3198,7 @@ PJ *proj_create_vertical_crs(PJ_CONTEXT *ctx, const char *crs_name, * use. * It should be used by at most one thread at a time. * - * This is an extented (_ex) version of proj_create_vertical_crs() that adds + * This is an extended (_ex) version of proj_create_vertical_crs() that adds * the capability of defining a geoid model. * * @param ctx PROJ context, or NULL for default context @@ -7434,7 +7434,7 @@ void proj_operation_factory_context_set_use_proj_alternative_grid_names( * step. * * By default, with the IF_NO_DIRECT_TRANSFORMATION stratgey, all potential - * C candidates will be used if there is no direct tranformation. + * C candidates will be used if there is no direct transformation. * * @param ctx PROJ context, or NULL for default context * @param factory_ctx Operation factory context. must not be NULL diff --git a/src/iso19111/common.cpp b/src/iso19111/common.cpp index b5e393b3..0eb40f12 100644 --- a/src/iso19111/common.cpp +++ b/src/iso19111/common.cpp @@ -422,7 +422,7 @@ bool Measure::operator==(const Measure &other) PROJ_PURE_DEFN { /** \brief Returns whether an object is equivalent to another one. * @param other other object to compare to - * @param criterion comparaison criterion. + * @param criterion comparison criterion. * @param maxRelativeError Maximum relative error allowed. * @return true if objects are equivalent. */ diff --git a/src/iso19111/coordinateoperation.cpp b/src/iso19111/coordinateoperation.cpp index ec515cd7..0f5e4c4d 100644 --- a/src/iso19111/coordinateoperation.cpp +++ b/src/iso19111/coordinateoperation.cpp @@ -4684,7 +4684,7 @@ ConversionNNPtr Conversion::createEqualEarth( * 0.</li> * </ul> * - * For completness, PROJ adds the falseEasting and falseNorthing parameter, + * For completeness, PROJ adds the falseEasting and falseNorthing parameter, * which are not described in EPSG. They should usually be set to 0. * * @param properties See \ref general_properties of the conversion. If the name @@ -4717,7 +4717,7 @@ ConversionNNPtr Conversion::createVerticalPerspective( /** \brief Instantiate a conversion based on the Pole Rotation method, using * the conventions of the GRIB 1 and GRIB 2 data formats. * - * Those are mentionned in the Note 2 of + * Those are mentioned in the Note 2 of * https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/grib2_temp3-1.shtml * * Several conventions for the pole rotation method exists. @@ -10739,7 +10739,7 @@ CoordinateOperationContext::getGridAvailabilityUse() const { * step. * * By default, with the IF_NO_DIRECT_TRANSFORMATION stratgey, all potential - * C candidates will be used if there is no direct tranformation. + * C candidates will be used if there is no direct transformation. */ void CoordinateOperationContext::setAllowUseIntermediateCRS( IntermediateCRSUse use) { @@ -12110,7 +12110,7 @@ CoordinateOperationFactory::Private::findsOpsInRegistryWithIntermediate( // If doing GeogCRS --> GeogCRS, only use GeogCRS as // intermediate CRS - // Avoid weird behaviour when doing NAD83 -> NAD83(2011) + // Avoid weird behavior when doing NAD83 -> NAD83(2011) // that would go through NAVD88 otherwise. if (context.context->getIntermediateCRS().empty() && dynamic_cast<const crs::GeographicCRS *>(sourceCRS.get()) && diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp index a255b959..97f741be 100644 --- a/src/iso19111/io.cpp +++ b/src/iso19111/io.cpp @@ -179,7 +179,7 @@ struct WKTFormatter::Private { * * A formatter can be used only once (its internal state is mutated) * - * Its default behaviour can be adjusted with the different setters. + * Its default behavior can be adjusted with the different setters. * * @param convention WKT flavor. Defaults to Convention::WKT2 * @param dbContext Database context, to allow queries in it if needed. @@ -201,7 +201,7 @@ WKTFormatterNNPtr WKTFormatter::create(Convention convention, * * A formatter can be used only once (its internal state is mutated) * - * Its default behaviour can be adjusted with the different setters. + * Its default behavior can be adjusted with the different setters. * * @param other source formatter. * @return new formatter. @@ -6631,7 +6631,7 @@ PROJStringFormatter::~PROJStringFormatter() = default; * * A formatter can be used only once (its internal state is mutated) * - * Its default behaviour can be adjusted with the different setters. + * Its default behavior can be adjusted with the different setters. * * @param conventionIn PROJ string flavor. Defaults to Convention::PROJ_5 * @param dbContext Database context (can help to find alternative grid names). diff --git a/src/iso19111/metadata.cpp b/src/iso19111/metadata.cpp index 8f2601e0..fc788a30 100644 --- a/src/iso19111/metadata.cpp +++ b/src/iso19111/metadata.cpp @@ -777,7 +777,7 @@ bool Extent::_isEquivalentTo(const util::IComparable *other, /** \brief Returns whether this extent contains the other one. * - * Behaviour only well specified if each sub-extent category as at most + * Behavior only well specified if each sub-extent category as at most * one element. */ bool Extent::contains(const ExtentNNPtr &other) const { @@ -802,7 +802,7 @@ bool Extent::contains(const ExtentNNPtr &other) const { /** \brief Returns whether this extent intersects the other one. * - * Behaviour only well specified if each sub-extent category as at most + * Behavior only well specified if each sub-extent category as at most * one element. */ bool Extent::intersects(const ExtentNNPtr &other) const { @@ -829,7 +829,7 @@ bool Extent::intersects(const ExtentNNPtr &other) const { /** \brief Returns the intersection of this extent with another one. * - * Behaviour only well specified if there is one single GeographicExtent + * Behavior only well specified if there is one single GeographicExtent * in each object. * Returns nullptr otherwise. */ diff --git a/src/iso19111/util.cpp b/src/iso19111/util.cpp index 2a6178e2..21d45e44 100644 --- a/src/iso19111/util.cpp +++ b/src/iso19111/util.cpp @@ -686,7 +686,7 @@ IComparable::~IComparable() = default; /** \brief Returns whether an object is equivalent to another one. * @param other other object to compare to - * @param criterion comparaison criterion. + * @param criterion comparison criterion. * @param dbContext Database context, or nullptr. * @return true if objects are equivalent. */ diff --git a/src/malloc.cpp b/src/malloc.cpp index 10ab2fad..c8de6630 100644 --- a/src/malloc.cpp +++ b/src/malloc.cpp @@ -216,7 +216,7 @@ PJ *pj_default_destructor (PJ *P, int errlev) { /* Destructor */ /* Even if P==0, we set the errlev on pj_error and the default context */ /* Note that both, in the multithreaded case, may then contain undefined */ - /* values. This is expected behaviour. For MT have one ctx per thread */ + /* values. This is expected behavior. For MT have one ctx per thread */ if (0!=errlev) pj_ctx_set_errno (pj_get_ctx(P), errlev); diff --git a/src/networkfilemanager.cpp b/src/networkfilemanager.cpp index 30229fea..4d6f425c 100644 --- a/src/networkfilemanager.cpp +++ b/src/networkfilemanager.cpp @@ -2180,7 +2180,7 @@ void proj_grid_cache_clear(PJ_CONTEXT *ctx) { * use the "downloaded_file_properties" table of its grid cache database. * Consequently files manually placed in the user-writable * directory without using this function would be considered as - * non-existing/obsolete and would be unconditionnaly downloaded again. + * non-existing/obsolete and would be unconditionally downloaded again. * * This function can only be used if networking is enabled, and either * the default curl network API or a custom one have been installed. @@ -2309,7 +2309,7 @@ int proj_is_download_needed(PJ_CONTEXT *ctx, const char *url_or_filename, * use the "downloaded_file_properties" table of its grid cache database. * Consequently files manually placed in the user-writable * directory without using this function would be considered as - * non-existing/obsolete and would be unconditionnaly downloaded again. + * non-existing/obsolete and would be unconditionally downloaded again. * * This function can only be used if networking is enabled, and either * the default curl network API or a custom one have been installed. diff --git a/src/projections/isea.cpp b/src/projections/isea.cpp index 1ebbeebb..dd1d48ff 100644 --- a/src/projections/isea.cpp +++ b/src/projections/isea.cpp @@ -322,7 +322,7 @@ static int isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) /* * spherical distance from center of polygon face to any of its - * vertexes on the globe + * vertices on the globe */ double g; diff --git a/src/projections/ocea.cpp b/src/projections/ocea.cpp index 4fc5391d..de9838cb 100644 --- a/src/projections/ocea.cpp +++ b/src/projections/ocea.cpp @@ -65,12 +65,12 @@ PJ *PROJECTION(ocea) { /*Define Pole of oblique transformation from 1 point & 1 azimuth*/ // ERO: I've added M_PI so that the alpha is the angle from point 1 to point 2 // from the North in a clockwise direction - // (to be consistent with omerc behaviour) + // (to be consistent with omerc behavior) alpha = M_PI + pj_param(P->ctx, P->params, "ralpha").f; lonz = pj_param(P->ctx, P->params, "rlonc").f; /*Equation 9-8 page 80 (http://pubs.usgs.gov/pp/1395/report.pdf)*/ // Actually slightliy modified to use atan2(), as it is suggested by - // Snyder for equation 9-1, but this is not mentionned here + // Snyder for equation 9-1, but this is not mentioned here lam_p = atan2(-cos(alpha) , -sin(P->phi0) * sin(alpha)) + lonz; /*Equation 9-7 page 80 (http://pubs.usgs.gov/pp/1395/report.pdf)*/ phi_p = asin(cos(P->phi0) * sin(alpha)); diff --git a/src/projections/tmerc.cpp b/src/projections/tmerc.cpp index 1e5fc1a8..3a58fc02 100644 --- a/src/projections/tmerc.cpp +++ b/src/projections/tmerc.cpp @@ -286,7 +286,7 @@ static PJ *setup_approx(PJ *P) { // /*****************************************************************************/ -/* Helper functios for "exact" transverse mercator */ +/* Helper functions for "exact" transverse mercator */ inline static double gatg(const double *p1, int len_p1, double B, double cos_2B, double sin_2B) { double h = 0, h1, h2 = 0; @@ -750,7 +750,7 @@ PJ *PROJECTION(etmerc) { /* UTM uses the Poder/Engsager implementation for the underlying projection */ -/* UNLESS +approx is set in which case the Evenden/Snyder implemenation is used. */ +/* UNLESS +approx is set in which case the Evenden/Snyder implementation is used. */ PJ *PROJECTION(utm) { long zone; if (P->es == 0.0) { diff --git a/src/strtod.cpp b/src/strtod.cpp index d45e62db..4311caea 100644 --- a/src/strtod.cpp +++ b/src/strtod.cpp @@ -46,7 +46,7 @@ * Converts ASCII string to floating point number. * * This function converts the initial portion of the string pointed to - * by nptr to double floating point representation. The behaviour is the + * by nptr to double floating point representation. The behavior is the * same as * * pj_strtod(nptr, (char **)NULL); diff --git a/src/transformations/vgridshift.cpp b/src/transformations/vgridshift.cpp index 6ee8a6b0..3d9f046a 100644 --- a/src/transformations/vgridshift.cpp +++ b/src/transformations/vgridshift.cpp @@ -46,7 +46,7 @@ struct vgridshiftData { static void deal_with_vertcon_gtx_hack(PJ *P) { struct vgridshiftData *Q = (struct vgridshiftData *) P->opaque; - // The .gtx VERTCON files stored millimetres, but the .tif files + // The .gtx VERTCON files stored millimeters, but the .tif files // are in metres. if( Q->forward_multiplier != 0.001 ) { return; |
