aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/proj/common.hpp2
-rw-r--r--include/proj/coordinateoperation.hpp2
-rw-r--r--include/proj/metadata.hpp2
-rw-r--r--src/apps/gie.cpp2
-rw-r--r--src/apps/optargpm.h2
-rw-r--r--src/apps/proj.cpp4
-rw-r--r--src/apps/projinfo.cpp38
-rw-r--r--src/conversions/axisswap.cpp2
-rw-r--r--src/conversions/cart.cpp2
-rw-r--r--src/iso19111/c_api.cpp4
-rw-r--r--src/iso19111/crs.cpp20
-rw-r--r--src/iso19111/factory.cpp10
-rw-r--r--src/iso19111/io.cpp18
-rw-r--r--src/iso19111/operation/coordinateoperationfactory.cpp4
-rw-r--r--src/networkfilemanager.cpp4
-rw-r--r--src/proj.h4
-rw-r--r--src/projections/healpix.cpp2
-rw-r--r--src/projections/times.cpp2
-rw-r--r--src/sqlite3_utils.cpp2
-rw-r--r--src/transformations/deformation.cpp2
-rwxr-xr-xtest/cli/testIGNF2
-rw-r--r--test/gie/4D-API_cs2cs-style.gie2
-rw-r--r--test/unit/test_io.cpp4
-rw-r--r--test/unit/test_operationfactory.cpp2
24 files changed, 69 insertions, 69 deletions
diff --git a/include/proj/common.hpp b/include/proj/common.hpp
index 04ad63ad..c8ffe904 100644
--- a/include/proj/common.hpp
+++ b/include/proj/common.hpp
@@ -292,7 +292,7 @@ using IdentifiedObjectPtr = std::shared_ptr<IdentifiedObject>;
/** Non-null shared pointer of IdentifiedObject. */
using IdentifiedObjectNNPtr = util::nn<IdentifiedObjectPtr>;
-/** \brief Abstract class representating a CRS-related object that has an
+/** \brief Abstract class representing a CRS-related object that has an
* identification.
*
* \remark Implements IdentifiedObject from \ref ISO_19111_2019
diff --git a/include/proj/coordinateoperation.hpp b/include/proj/coordinateoperation.hpp
index ede55fed..1b209cae 100644
--- a/include/proj/coordinateoperation.hpp
+++ b/include/proj/coordinateoperation.hpp
@@ -740,7 +740,7 @@ projection grid at the natural origin.
EPSG:8807
-\subsection latitude_projection_centre Latitute of projection centre
+\subsection latitude_projection_centre Latitude of projection centre
For an oblique projection, this is the latitude of the point at which the
azimuth of the central line is defined.
diff --git a/include/proj/metadata.hpp b/include/proj/metadata.hpp
index bd78e6e3..605ad191 100644
--- a/include/proj/metadata.hpp
+++ b/include/proj/metadata.hpp
@@ -141,7 +141,7 @@ using GeographicBoundingBoxNNPtr = util::nn<GeographicBoundingBoxPtr>;
/** \brief Geographic position of the dataset.
*
- * This is only an approximate so specifying the co-ordinate reference system is
+ * This is only an approximate so specifying the coordinate reference system is
* unnecessary.
*
* \remark Implements [GeographicBoundingBox]
diff --git a/src/apps/gie.cpp b/src/apps/gie.cpp
index 07c06dd9..9c2d3eab 100644
--- a/src/apps/gie.cpp
+++ b/src/apps/gie.cpp
@@ -1266,7 +1266,7 @@ Constructor for the ffio object.
/***************************************************************************************/
static ffio *ffio_destroy (ffio *G) {
/****************************************************************************************
-Free all allocated associated memory, then free G itself. For extra RAII compliancy,
+Free all allocated associated memory, then free G itself. For extra RAII compliance,
the file object should also be closed if still open, but this will require additional
control logic, and ffio is a gie tool specific package, so we fall back to asserting that
fclose has been called prior to ffio_destroy.
diff --git a/src/apps/optargpm.h b/src/apps/optargpm.h
index 4e8dd9c7..9a66b9a0 100644
--- a/src/apps/optargpm.h
+++ b/src/apps/optargpm.h
@@ -576,7 +576,7 @@ OPTARGS *opt_parse (int argc, char **argv, const char *flags, const char *keys,
continue;
}
- /* options taking argumants */
+ /* options taking arguments */
/* argument separate (i.e. "-i 10") */
if (j + 1==arg_group_size) {
diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp
index 0108cb74..93f1ce7b 100644
--- a/src/apps/proj.cpp
+++ b/src/apps/proj.cpp
@@ -21,7 +21,7 @@
#define MAX_LINE 1000
#define MAX_PARGS 100
-#define PJ_INVERS(P) (P->inv ? 1 : 0)
+#define PJ_INVERSE(P) (P->inv ? 1 : 0)
static PJ *Proj;
static union {
@@ -219,7 +219,7 @@ static void vprocess(FILE *fid) {
linvers = inverse;
if (linvers) {
- if (!PJ_INVERS(Proj)) {
+ if (!PJ_INVERSE(Proj)) {
emess(-1,"inverse for this projection not avail.\n");
continue;
}
diff --git a/src/apps/projinfo.cpp b/src/apps/projinfo.cpp
index 71830f00..16f2a906 100644
--- a/src/apps/projinfo.cpp
+++ b/src/apps/projinfo.cpp
@@ -335,7 +335,7 @@ static void outputObject(
auto projStringExportable =
nn_dynamic_pointer_cast<IPROJStringExportable>(obj);
- bool alreadyOutputed = false;
+ bool alreadyOutputted = false;
if (projStringExportable) {
if (outputOpt.PROJ5) {
try {
@@ -369,7 +369,7 @@ static void outputObject(
std::cerr << "Error when exporting to PROJ string: " << e.what()
<< std::endl;
}
- alreadyOutputed = true;
+ alreadyOutputted = true;
}
}
@@ -377,7 +377,7 @@ static void outputObject(
if (wktExportable) {
if (outputOpt.WKT2_2015) {
try {
- if (alreadyOutputed) {
+ if (alreadyOutputted) {
std::cout << std::endl;
}
if (!outputOpt.quiet) {
@@ -396,12 +396,12 @@ static void outputObject(
std::cerr << "Error when exporting to WKT2:2015: " << e.what()
<< std::endl;
}
- alreadyOutputed = true;
+ alreadyOutputted = true;
}
if (outputOpt.WKT2_2015_SIMPLIFIED) {
try {
- if (alreadyOutputed) {
+ if (alreadyOutputted) {
std::cout << std::endl;
}
if (!outputOpt.quiet) {
@@ -422,12 +422,12 @@ static void outputObject(
std::cerr << "Error when exporting to WKT2:2015_SIMPLIFIED: "
<< e.what() << std::endl;
}
- alreadyOutputed = true;
+ alreadyOutputted = true;
}
if (outputOpt.WKT2_2019) {
try {
- if (alreadyOutputed) {
+ if (alreadyOutputted) {
std::cout << std::endl;
}
if (!outputOpt.quiet) {
@@ -448,12 +448,12 @@ static void outputObject(
std::cerr << "Error when exporting to WKT2:2019: " << e.what()
<< std::endl;
}
- alreadyOutputed = true;
+ alreadyOutputted = true;
}
if (outputOpt.WKT2_2019_SIMPLIFIED) {
try {
- if (alreadyOutputed) {
+ if (alreadyOutputted) {
std::cout << std::endl;
}
if (!outputOpt.quiet) {
@@ -474,12 +474,12 @@ static void outputObject(
std::cerr << "Error when exporting to WKT2:2019_SIMPLIFIED: "
<< e.what() << std::endl;
}
- alreadyOutputed = true;
+ alreadyOutputted = true;
}
if (outputOpt.WKT1_GDAL && !nn_dynamic_pointer_cast<Conversion>(obj)) {
try {
- if (alreadyOutputed) {
+ if (alreadyOutputted) {
std::cout << std::endl;
}
if (!outputOpt.quiet) {
@@ -504,12 +504,12 @@ static void outputObject(
std::cerr << "Error when exporting to WKT1:GDAL: " << e.what()
<< std::endl;
}
- alreadyOutputed = true;
+ alreadyOutputted = true;
}
if (outputOpt.WKT1_ESRI && !nn_dynamic_pointer_cast<Conversion>(obj)) {
try {
- if (alreadyOutputed) {
+ if (alreadyOutputted) {
std::cout << std::endl;
}
if (!outputOpt.quiet) {
@@ -529,7 +529,7 @@ static void outputObject(
std::cerr << "Error when exporting to WKT1:ESRI: " << e.what()
<< std::endl;
}
- alreadyOutputed = true;
+ alreadyOutputted = true;
}
}
@@ -537,7 +537,7 @@ static void outputObject(
if (JSONExportable) {
if (outputOpt.PROJJSON) {
try {
- if (alreadyOutputed) {
+ if (alreadyOutputted) {
std::cout << std::endl;
}
if (!outputOpt.quiet) {
@@ -556,7 +556,7 @@ static void outputObject(
std::cerr << "Error when exporting to PROJJSON: " << e.what()
<< std::endl;
}
- // alreadyOutputed = true;
+ // alreadyOutputted = true;
}
}
@@ -796,7 +796,7 @@ int main(int argc, char **argv) {
bool user_string_specified = false;
std::string sourceCRSStr;
std::string targetCRSStr;
- bool outputSwithSpecified = false;
+ bool outputSwitchSpecified = false;
OutputOptions outputOpt;
std::string objectKind;
bool summary = false;
@@ -829,7 +829,7 @@ int main(int argc, char **argv) {
for (int i = 1; i < argc; i++) {
std::string arg(argv[i]);
if (arg == "-o" && i + 1 < argc) {
- outputSwithSpecified = true;
+ outputSwitchSpecified = true;
i++;
auto formats(split(argv[i], ','));
for (auto format : formats) {
@@ -1177,7 +1177,7 @@ int main(int argc, char **argv) {
usage();
}
- if (!outputSwithSpecified) {
+ if (!outputSwitchSpecified) {
outputOpt.PROJ5 = true;
outputOpt.WKT2_2019 = true;
}
diff --git a/src/conversions/axisswap.cpp b/src/conversions/axisswap.cpp
index 682f74ef..9edc71f7 100644
--- a/src/conversions/axisswap.cpp
+++ b/src/conversions/axisswap.cpp
@@ -298,7 +298,7 @@ PJ *CONVERSION(axisswap,0) {
}
- /* Preparation and finalization steps are skipped, since the raison */
+ /* Preparation and finalization steps are skipped, since the reason */
/* d'etre of axisswap is to bring input coordinates in line with the */
/* the internally expected order (ENU), such that handling of offsets */
/* etc. can be done correctly in a later step of a pipeline */
diff --git a/src/conversions/cart.cpp b/src/conversions/cart.cpp
index 364bbb92..5175599a 100644
--- a/src/conversions/cart.cpp
+++ b/src/conversions/cart.cpp
@@ -98,7 +98,7 @@ PROJ_HEAD(cart, "Geodetic/cartesian conversions");
(WP2, below)
These routines are probably not as robust at those in
- geocent.c, at least thay haven't been through as heavy
+ geocent.c, at least they haven't been through as heavy
use as their geocent sisters. Some care has been taken
to avoid singularities, but extreme cases (e.g. setting
es, the squared eccentricity, to 1), will cause havoc.
diff --git a/src/iso19111/c_api.cpp b/src/iso19111/c_api.cpp
index 0d386e6b..0ea74394 100644
--- a/src/iso19111/c_api.cpp
+++ b/src/iso19111/c_api.cpp
@@ -2589,7 +2589,7 @@ void proj_get_crs_list_parameters_destroy(PROJ_CRS_LIST_PARAMETERS *params) {
* The returned object is an array of PROJ_CRS_INFO* pointers, whose last
* entry is NULL. This array should be freed with proj_crs_info_list_destroy()
*
- * When no filter parameters are set, this is functionnaly equivalent to
+ * When no filter parameters are set, this is functionally equivalent to
* proj_get_codes_from_database(), instantiating a PJ* object for each
* of the codes with proj_create_from_database() and retrieving information
* with the various getters. However this function will be much faster.
@@ -7593,7 +7593,7 @@ void proj_operation_factory_context_set_crs_extent_use(
*
* @param ctx PROJ context, or NULL for default context
* @param factory_ctx Operation factory context. must not be NULL
- * @param criterion patial criterion to use
+ * @param criterion spatial criterion to use
*/
void PROJ_DLL proj_operation_factory_context_set_spatial_criterion(
PJ_CONTEXT *ctx, PJ_OPERATION_FACTORY_CONTEXT *factory_ctx,
diff --git a/src/iso19111/crs.cpp b/src/iso19111/crs.cpp
index 6bf607fa..73c61e2c 100644
--- a/src/iso19111/crs.cpp
+++ b/src/iso19111/crs.cpp
@@ -2208,11 +2208,11 @@ GeodeticCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
};
- const bool unsignificantName = thisName.empty() ||
+ const bool insignificantName = thisName.empty() ||
ci_equal(thisName, "unknown") ||
ci_equal(thisName, "unnamed");
- if (unsignificantName) {
+ if (insignificantName) {
searchByDatumOrEllipsoid();
} else if (hasCodeCompatibleOfAuthorityFactory(this,
authorityFactory)) {
@@ -3277,7 +3277,7 @@ VerticalCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
const io::DatabaseContextNNPtr &dbContext =
authorityFactory->databaseContext();
- const bool unsignificantName = thisName.empty() ||
+ const bool insignificantName = thisName.empty() ||
ci_equal(thisName, "unknown") ||
ci_equal(thisName, "unnamed");
if (hasCodeCompatibleOfAuthorityFactory(this, authorityFactory)) {
@@ -3298,7 +3298,7 @@ VerticalCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
}
}
- } else if (!unsignificantName) {
+ } else if (!insignificantName) {
for (int ipass = 0; ipass < 2; ipass++) {
const bool approximateMatch = ipass == 1;
auto objects = authorityFactory->createObjectsFromName(
@@ -4278,7 +4278,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
if (authorityFactory) {
- const bool unsignificantName = thisName.empty() ||
+ const bool insignificantName = thisName.empty() ||
ci_equal(thisName, "unknown") ||
ci_equal(thisName, "unnamed");
bool foundEquivalentName = false;
@@ -4304,7 +4304,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
}
}
- } else if (!unsignificantName) {
+ } else if (!insignificantName) {
for (int ipass = 0; ipass < 2; ipass++) {
const bool approximateMatch = ipass == 1;
auto objects = authorityFactory->createObjectsFromNameEx(
@@ -4379,7 +4379,7 @@ ProjectedCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
continue;
}
- addCRS(crs, unsignificantName);
+ addCRS(crs, insignificantName);
}
res.sort(lambdaSort);
@@ -4839,7 +4839,7 @@ CompoundCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
const io::DatabaseContextNNPtr &dbContext =
authorityFactory->databaseContext();
- const bool unsignificantName = thisName.empty() ||
+ const bool insignificantName = thisName.empty() ||
ci_equal(thisName, "unknown") ||
ci_equal(thisName, "unnamed");
bool foundEquivalentName = false;
@@ -4861,7 +4861,7 @@ CompoundCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
}
}
- } else if (!unsignificantName) {
+ } else if (!insignificantName) {
for (int ipass = 0; ipass < 2; ipass++) {
const bool approximateMatch = ipass == 1;
auto objects = authorityFactory->createObjectsFromName(
@@ -4942,7 +4942,7 @@ CompoundCRS::identify(const io::AuthorityFactoryPtr &authorityFactory) const {
}
if (_isEquivalentTo(crs.get(), crsCriterion, dbContext)) {
- res.emplace_back(crs, unsignificantName ? 90 : 70);
+ res.emplace_back(crs, insignificantName ? 90 : 70);
} else {
res.emplace_back(crs, 25);
}
diff --git a/src/iso19111/factory.cpp b/src/iso19111/factory.cpp
index 5da9e6e0..62a309c4 100644
--- a/src/iso19111/factory.cpp
+++ b/src/iso19111/factory.cpp
@@ -3827,7 +3827,7 @@ AuthorityFactory::createFromCoordinateReferenceSystemCodes(
* missing grids should be removed from the result set.
* @param considerKnownGridsAsAvailable Whether known grids should be considered
* as available (typically when network is enabled).
- * @param discardSuperseded Whether cordinate operations that are superseded
+ * @param discardSuperseded Whether coordinate operations that are superseded
* (but not deprecated) should be removed from the result set.
* @param tryReverseOrder whether to search in the reverse order too (and thus
* inverse results found that way)
@@ -4200,7 +4200,7 @@ static bool useIrrelevantPivot(const operation::CoordinateOperationNNPtr &op,
* missing grids should be removed from the result set.
* @param considerKnownGridsAsAvailable Whether known grids should be considered
* as available (typically when network is enabled).
- * @param discardSuperseded Whether cordinate operations that are superseded
+ * @param discardSuperseded Whether coordinate operations that are superseded
* (but not deprecated) should be removed from the result set.
* @param intermediateCRSAuthCodes List of (auth_name, code) of CRS that can be
* used as potential intermediate CRS. If the list is empty, the database will
@@ -5587,7 +5587,7 @@ AuthorityFactory::getDescriptionText(const std::string &code) const {
/** \brief Return a list of information on CRS objects
*
- * This is functionnaly equivalent of listing the codes from an authority,
+ * This is functionally equivalent of listing the codes from an authority,
* instantiating
* a CRS object for each of them and getting the information from this CRS
* object, but this implementation has much less overhead.
@@ -6343,8 +6343,8 @@ AuthorityFactory::createObjectsFromNameEx(
}
// If we found a name that is an exact match, and all objects have the
- // same type, and we are not in approximate mode, only keep the objet(s)
- // with the exact name match.
+ // same type, and we are not in approximate mode, only keep the
+ // object(s) with the exact name match.
if (foundExactMatch && hashCodeFirstMatch != 0 && !approximateMatch) {
std::list<PairObjectName> resTmp;
for (const auto &pair : res) {
diff --git a/src/iso19111/io.cpp b/src/iso19111/io.cpp
index 51162365..184d992f 100644
--- a/src/iso19111/io.cpp
+++ b/src/iso19111/io.cpp
@@ -1504,15 +1504,15 @@ double WKTParser::Private::asDouble(const WKTNodeNNPtr &node) {
IdentifierPtr WKTParser::Private::buildId(const WKTNodeNNPtr &node,
bool tolerant, bool removeInverseOf) {
const auto *nodeP = node->GP();
- const auto &nodeChidren = nodeP->children();
- if (nodeChidren.size() >= 2) {
- auto codeSpace = stripQuotes(nodeChidren[0]);
+ const auto &nodeChildren = nodeP->children();
+ if (nodeChildren.size() >= 2) {
+ auto codeSpace = stripQuotes(nodeChildren[0]);
if (removeInverseOf && starts_with(codeSpace, "INVERSE(") &&
codeSpace.back() == ')') {
codeSpace = codeSpace.substr(strlen("INVERSE("));
codeSpace.resize(codeSpace.size() - 1);
}
- auto code = stripQuotes(nodeChidren[1]);
+ auto code = stripQuotes(nodeChildren[1]);
auto &citationNode = nodeP->lookForChild(WKTConstants::CITATION);
auto &uriNode = nodeP->lookForChild(WKTConstants::URI);
PropertyMap propertiesId;
@@ -1536,9 +1536,9 @@ IdentifierPtr WKTParser::Private::buildId(const WKTNodeNNPtr &node,
stripQuotes(uriNodeP->children()[0]));
}
}
- if (nodeChidren.size() >= 3 &&
- nodeChidren[2]->GP()->childrenSize() == 0) {
- auto version = stripQuotes(nodeChidren[2]);
+ if (nodeChildren.size() >= 3 &&
+ nodeChildren[2]->GP()->childrenSize() == 0) {
+ auto version = stripQuotes(nodeChildren[2]);
propertiesId.set(Identifier::VERSION_KEY, version);
}
return Identifier::create(code, propertiesId);
@@ -3944,7 +3944,7 @@ WKTParser::Private::buildProjectedCRS(const WKTNodeNNPtr &node) {
// It is likely that the ESRI definition of EPSG:32661 (UPS North) &
// EPSG:32761 (UPS South) uses the easting-northing order, instead
// of the EPSG northing-easting order
- // so don't substitue names to avoid confusion.
+ // so don't substitute names to avoid confusion.
if (projCRSName == "UPS_North") {
props.set(IdentifiedObject::NAME_KEY, "WGS 84 / UPS North (E,N)");
} else if (projCRSName == "UPS_South") {
@@ -6607,7 +6607,7 @@ static BaseObjectNNPtr createFromUserInput(const std::string &text,
* order and will expect/output coordinates in radians. ProjectedCRS will have
* easting, northing axis order (except the ones with Transverse Mercator South
* Orientated projection). In that mode, the epsg:XXXX syntax will be also
- * interprated the same way.
+ * interpreted the same way.
* @throw ParsingException
*/
BaseObjectNNPtr createFromUserInput(const std::string &text,
diff --git a/src/iso19111/operation/coordinateoperationfactory.cpp b/src/iso19111/operation/coordinateoperationfactory.cpp
index 4bd68b1d..7509c513 100644
--- a/src/iso19111/operation/coordinateoperationfactory.cpp
+++ b/src/iso19111/operation/coordinateoperationfactory.cpp
@@ -4917,13 +4917,13 @@ void CoordinateOperationFactory::Private::createOperationsCompoundToCompound(
createOperations(sourceCRS, intermGeogSrc, context);
const auto opsGeogToTarget =
createOperations(intermGeogDst, targetCRS, context);
- const bool hasNonTrivalSrcTransf =
+ const bool hasNonTrivialSrcTransf =
!opsSrcToGeog.empty() &&
!opsSrcToGeog.front()->hasBallparkTransformation();
const bool hasNonTrivialTargetTransf =
!opsGeogToTarget.empty() &&
!opsGeogToTarget.front()->hasBallparkTransformation();
- if (hasNonTrivalSrcTransf && hasNonTrivialTargetTransf) {
+ if (hasNonTrivialSrcTransf && hasNonTrivialTargetTransf) {
const auto opsGeogSrcToGeogDst =
createOperations(intermGeogSrc, intermGeogDst, context);
for (const auto &op1 : opsSrcToGeog) {
diff --git a/src/networkfilemanager.cpp b/src/networkfilemanager.cpp
index c22e77fa..fa6375b8 100644
--- a/src/networkfilemanager.cpp
+++ b/src/networkfilemanager.cpp
@@ -2235,7 +2235,7 @@ void proj_grid_cache_clear(PJ_CONTEXT *ctx) {
* the delay between the last time it has been
* verified and the current time exceeds the TTL
* setting. This can save network accesses.
- * If set to TRUE, PROJ will unconditionnally
+ * If set to TRUE, PROJ will unconditionally
* check from the server the recentness of the file.
* @return TRUE if the file must be downloaded with proj_download_file()
* @since 7.0
@@ -2364,7 +2364,7 @@ int proj_is_download_needed(PJ_CONTEXT *ctx, const char *url_or_filename,
* the delay between the last time it has been
* verified and the current time exceeds the TTL
* setting. This can save network accesses.
- * If set to TRUE, PROJ will unconditionnally
+ * If set to TRUE, PROJ will unconditionally
* check from the server the recentness of the file.
* @param progress_cbk Progress callback, or NULL.
* The passed percentage is in the [0, 1] range.
diff --git a/src/proj.h b/src/proj.h
index cc2ac2de..08bab92b 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -612,10 +612,10 @@ PJ_COORD PROJ_DLL proj_geod (const PJ *P, PJ_COORD a, PJ_COORD b);
/* PROJ error codes */
-/** Error codes typically related to coordinate operation initalization
+/** Error codes typically related to coordinate operation initialization
* Note: some of them can also be emitted during coordinate transformation,
* like PROJ_ERR_INVALID_OP_FILE_NOT_FOUND_OR_INVALID in case the resource loading
- * is differed until it is really needed.
+ * is deferred until it is really needed.
*/
#define PROJ_ERR_INVALID_OP 1024 /* other/unspecified error related to coordinate operation initialization */
#define PROJ_ERR_INVALID_OP_WRONG_SYNTAX (PROJ_ERR_INVALID_OP+1) /* invalid pipeline structure, missing +proj argument, etc */
diff --git a/src/projections/healpix.cpp b/src/projections/healpix.cpp
index 0340f7dd..6f34f9f0 100644
--- a/src/projections/healpix.cpp
+++ b/src/projections/healpix.cpp
@@ -124,7 +124,7 @@ static int pnpoly(int nvert, double vert[][2], double testx, double testy) {
double xinters;
PJ_XY p1, p2;
- /* Check for boundrary cases */
+ /* Check for boundary cases */
for (i = 0; i < nvert; i++) {
if (testx == vert[i][0] && testy == vert[i][1]) {
return 1;
diff --git a/src/projections/times.cpp b/src/projections/times.cpp
index 21c6c19a..2cdf0602 100644
--- a/src/projections/times.cpp
+++ b/src/projections/times.cpp
@@ -24,7 +24,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*****************************************************************************
- * Based on describtion of the Times Projection in
+ * Based on description of the Times Projection in
*
* Flattening the Earth, Snyder, J.P., 1993, p.213-214.
*****************************************************************************/
diff --git a/src/sqlite3_utils.cpp b/src/sqlite3_utils.cpp
index 84bbb2ce..f21d67f5 100644
--- a/src/sqlite3_utils.cpp
+++ b/src/sqlite3_utils.cpp
@@ -103,7 +103,7 @@ static int VFSCustomOpen(sqlite3_vfs *vfs, const char *name, sqlite3_file *file,
if (realVFS->fakeSync) {
// Disable xSync because it can be significantly slow and we don't
// need
- // that level of data integrity garanty for the cache.
+ // that level of data integrity guarantee for the cache.
methods->xSync = VSFNoOpLockUnlockSync;
}
if (realVFS->fakeLock) {
diff --git a/src/transformations/deformation.cpp b/src/transformations/deformation.cpp
index 1a04d0f5..56310aeb 100644
--- a/src/transformations/deformation.cpp
+++ b/src/transformations/deformation.cpp
@@ -221,7 +221,7 @@ static PJ_XYZ reverse_shift(PJ *P, PJ_XYZ input, double dt) {
return delta;
}
- /* Store the origial z shift for later application */
+ /* Store the original z shift for later application */
z0 = delta.z;
/* When iterating to find the best horizontal coordinate we also carry */
diff --git a/test/cli/testIGNF b/test/cli/testIGNF
index aa8c3354..75ac2840 100755
--- a/test/cli/testIGNF
+++ b/test/cli/testIGNF
@@ -1,6 +1,6 @@
:
# Script to test some points in IGNF managed SRS.
-# The expected coordinates have been calculed by
+# The expected coordinates have been calculated by
# other means.
# Real points locations are found in proj_outIGNF.dist-real
# while distribution results are found in proj_outIGNF.dist
diff --git a/test/gie/4D-API_cs2cs-style.gie b/test/gie/4D-API_cs2cs-style.gie
index b4ceb4f6..123bf638 100644
--- a/test/gie/4D-API_cs2cs-style.gie
+++ b/test/gie/4D-API_cs2cs-style.gie
@@ -357,7 +357,7 @@ expect 896633.0226 6000000 0 2020
# Datum shift in cartesian space but keeping the height
# (simulates a datum-shift with affin since ISO19111 code
-# currrently obfuscates proj-strings using cart/helmert/invcart)
+# currently obfuscates proj-strings using cart/helmert/invcart)
operation +proj=pipeline +ellps=GRS80 \
+step +proj=push +v_3 \
+step +proj=cart \
diff --git a/test/unit/test_io.cpp b/test/unit/test_io.cpp
index f97e6618..488d9b4b 100644
--- a/test/unit/test_io.cpp
+++ b/test/unit/test_io.cpp
@@ -1760,7 +1760,7 @@ TEST(wkt_parse, wkt2_projected) {
" ID[\"EPSG\",9122]],\n"
" ID[\"EPSG\",8801]],\n"
" PARAMETER[\"Longitude of natural origin\",3,\n"
- // Volontary omit LENGTHUNIT to check the WKT grammar accepts
+ // Voluntary omit LENGTHUNIT to check the WKT grammar accepts
// Check that we default to degree
//" ANGLEUNIT[\"degree\",0.0174532925199433,\n"
//" ID[\"EPSG\",9122]],\n"
@@ -1771,7 +1771,7 @@ TEST(wkt_parse, wkt2_projected) {
//" ID[\"EPSG\",9201]],\n"
" ID[\"EPSG\",8805]],\n"
" PARAMETER[\"False easting\",500000,\n"
- // Volontary omit LENGTHUNIT to check the WKT grammar accepts
+ // Voluntary omit LENGTHUNIT to check the WKT grammar accepts
// Check that we default to metre
//" LENGTHUNIT[\"metre\",1,\n"
//" ID[\"EPSG\",9001]],\n"
diff --git a/test/unit/test_operationfactory.cpp b/test/unit/test_operationfactory.cpp
index 8cc4fa40..0bc88382 100644
--- a/test/unit/test_operationfactory.cpp
+++ b/test/unit/test_operationfactory.cpp
@@ -6213,7 +6213,7 @@ TEST(operation, compoundCRS_to_PROJJSON_with_non_metre_height) {
// The untypical potentially a bit buggy thing (and what caused a bug)
// is the US-ft unit for the vertical axis of the base CRS ...
- // When outputing that to WKT, and
+ // When outputting that to WKT, and
// re-exporting to PROJJSON, one gets metre, which conforms more to the
// official definition of NAD83(2011) 3D.
// The vertical unit of the base CRS shouldn't matter much anyway, so this