diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2021-03-07 20:29:06 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2021-03-07 20:31:43 +0100 |
| commit | d7a2bdefb8d47e8ca18c8cbceb1a07290cb46ff7 (patch) | |
| tree | c4dccaa34df9e76d40f510f6519563cbd5212d1a /src/apps | |
| parent | 36a5a178cbd8c338a294ed5528462e65faf20a3d (diff) | |
| download | PROJ-d7a2bdefb8d47e8ca18c8cbceb1a07290cb46ff7.tar.gz PROJ-d7a2bdefb8d47e8ca18c8cbceb1a07290cb46ff7.zip | |
typo fixes
Diffstat (limited to 'src/apps')
| -rw-r--r-- | src/apps/gie.cpp | 2 | ||||
| -rw-r--r-- | src/apps/optargpm.h | 2 | ||||
| -rw-r--r-- | src/apps/proj.cpp | 4 | ||||
| -rw-r--r-- | src/apps/projinfo.cpp | 38 |
4 files changed, 23 insertions, 23 deletions
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; } |
