Merge pull request #853 from rouault/typo_fixes

Typo fixes

11 files changed, 22 insertions, 22 deletions

diff --git a/docs/source/contributing.rst b/docs/source/contributing.rst
index 5f55ed9a..e7a1d711 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/contributing.rst
@@ -172,7 +172,7 @@ pj-prefix pattern. Unless there are obvious reasons not to.
 Legalese
 ~~~~~~~~
 
-Commiters are the front line gatekeepers to keep the code base clear of
+Committers are the front line gatekeepers to keep the code base clear of
 improperly contributed code. It is important to the PROJ users,
 developers and the OSGeo foundation to avoid contributing any code to
 the project without it being clearly licensed under the project license.
@@ -180,9 +180,9 @@ the project without it being clearly licensed under the project license.
 Generally speaking the key issues are that those providing code to be
 included in the repository understand that the code will be released
 under the MIT/X license, and that the person providing the code has the
-right to contribute the code. For the commiter themselves understanding
+right to contribute the code. For the committer themselves understanding
 about the license is hopefully clear. For other contributors, the
-commiter should verify the understanding unless the commiter is very
+committer should verify the understanding unless the committer is very
 comfortable that the contributor understands the license (for instance
 frequent contributors).
 
@@ -199,7 +199,7 @@ license.
 
 All unusual situations need to be discussed and/or documented.
 
-Commiters should adhere to the following guidelines, and may be
+Committers should adhere to the following guidelines, and may be
 personally legally liable for improperly contributing code to the source
 repository:
 
@@ -237,6 +237,6 @@ Acknowledgements
 
 The *code contribution* section of this CONTRIBUTING file is inspired by
 `PDAL's <https://github.com/PDAL/PDAL/blob/master/CONTRIBUTING.md>`__
-and the *legalese* section is modified from `GDAL commiter
+and the *legalese* section is modified from `GDAL committer
 guidelines <https://trac.osgeo.org/gdal/wiki/rfc3_commiters>`__
 
diff --git a/scripts/fix_typos.sh b/scripts/fix_typos.sh
index 9fdb21cf..0e1b5a10 100755
--- a/scripts/fix_typos.sh
+++ b/scripts/fix_typos.sh
@@ -47,7 +47,7 @@ if ! test -d fix_typos; then
 fi
 
 EXCLUDED_FILES="*configure,config.status,config.sub,*/autom4te.cache/*,libtool,aclocal.m4,depcomp,ltmain.sh,*.pdf,./m4/*,./nad/epsg,./fix_typos/*"
-WORDS_WHITE_LIST="metres,als,lsat,twon,ang"
+WORDS_WHITE_LIST="metres,als,lsat,twon,ang,PJD_ERR_UNKNOW_UNIT_ID,PJD_ERR_LSAT_NOT_IN_RANGE,COLOR_GRAT"
 
 python3 fix_typos/codespell/codespell.py -w -i 3 -q 2 -S $EXCLUDED_FILES \
     -x scripts/typos_whitelist.txt --words-white-list=$WORDS_WHITE_LIST \
diff --git a/scripts/typos_whitelist.txt b/scripts/typos_whitelist.txt
index 8b137891..e69de29b 100644
--- a/scripts/typos_whitelist.txt
+++ b/scripts/typos_whitelist.txt
@@ -1 +0,0 @@
-
diff --git a/src/PJ_imw_p.c b/src/PJ_imw_p.c
index bad98456..b731f656 100644
--- a/src/PJ_imw_p.c
+++ b/src/PJ_imw_p.c
@@ -105,7 +105,7 @@ static LP e_inverse (XY xy, PJ *P) {          /* Ellipsoidal, inverse */
     XY t;
     double yc = 0.0;
     int i = 0;
-    const int N_MAX_ITER = 1000; /* Arbitrarily choosen number... */
+    const int N_MAX_ITER = 1000; /* Arbitrarily chosen number... */
 
     lp.phi = Q->phi_2;
     lp.lam = xy.x / cos(lp.phi);
diff --git a/src/PJ_unitconvert.c b/src/PJ_unitconvert.c
index 06224362..a076b76c 100644
--- a/src/PJ_unitconvert.c
+++ b/src/PJ_unitconvert.c
@@ -75,7 +75,7 @@ typedef double (*tconvert)(double);
 
 struct TIME_UNITS {
     char        *id;        /* units keyword */
-    tconvert     t_in;      /* unit -> mod. julian date funtion pointer */
+    tconvert     t_in;      /* unit -> mod. julian date function pointer */
     tconvert     t_out;     /* mod. julian date > unit function pointer */
     char        *name;      /* comments */
 };
@@ -415,7 +415,7 @@ PJ *CONVERSION(unitconvert,0) {
             proj_log_debug(P, "xy_in unit: %s", pj_units[i].name);
         } else {
             if ( (f = pj_param (P->ctx, P->params, "dxy_in").f) == 0.0)
-                return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID);
+                return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID);
         }
         if (f != 0.0)
             Q->xy_factor *= f;
@@ -429,7 +429,7 @@ PJ *CONVERSION(unitconvert,0) {
             proj_log_debug(P, "xy_out unit: %s", pj_units[i].name);
         } else {
             if ( (f = pj_param (P->ctx, P->params, "dxy_out").f) == 0.0)
-                return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID);
+                return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID);
         }
         if (f != 0.0)
             Q->xy_factor /= f;
@@ -443,7 +443,7 @@ PJ *CONVERSION(unitconvert,0) {
             proj_log_debug(P, "z_in unit: %s", pj_units[i].name);
         } else {
             if ( (f = pj_param (P->ctx, P->params, "dz_in").f) == 0.0)
-                return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID);
+                return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID);
         }
         if (f != 0.0)
             Q->z_factor *= f;
@@ -457,7 +457,7 @@ PJ *CONVERSION(unitconvert,0) {
             proj_log_debug(P, "z_out unit: %s", pj_units[i].name);
         } else {
             if ( (f = pj_param (P->ctx, P->params, "dz_out").f) == 0.0)
-                return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID);
+                return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID);
         }
         if (f != 0.0)
             Q->z_factor /= f;
@@ -467,7 +467,7 @@ PJ *CONVERSION(unitconvert,0) {
     if ((name = pj_param (P->ctx, P->params, "st_in").s) != NULL) {
         for (i = 0; (s = time_units[i].id) && strcmp(name, s) ; ++i);
 
-        if (!s) return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID); /* unknown unit conversion id */
+        if (!s) return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); /* unknown unit conversion id */
 
         Q->t_in_id = i;
         proj_log_debug(P, "t_in unit: %s", time_units[i].name);
@@ -477,7 +477,7 @@ PJ *CONVERSION(unitconvert,0) {
     if ((name = pj_param (P->ctx, P->params, "st_out").s) != NULL) {
         for (i = 0; (s = time_units[i].id) && strcmp(name, s) ; ++i);
 
-        if (!s) return pj_default_destructor(P, PJD_ERR_UNKNOW_UNIT_ID); /* unknown unit conversion id */
+        if (!s) return pj_default_destructor(P, PJD_ERR_UNKNOWN_UNIT_ID); /* unknown unit conversion id */
 
         Q->t_out_id = i;
         proj_log_debug(P, "t_out unit: %s", time_units[i].name);
diff --git a/src/gie.c b/src/gie.c
index 19c0b0da..1079c7fb 100644
--- a/src/gie.c
+++ b/src/gie.c
@@ -1931,7 +1931,7 @@ static int pj_cart_selftest (void) {
     if (proj_angular_output (P, PJ_INV)) return 123;
 
     /* We specified "no_defs" but didn't give any ellipsoid info */
-    /* pj_init_ctx should defualt to WGS84 */
+    /* pj_init_ctx should default to WGS84 */
     if (P->a != 6378137.0) return 124;
     if (P->f != 1.0/298.257223563) return 125;
     proj_destroy(P);
diff --git a/src/pj_ell_set.c b/src/pj_ell_set.c
index d1f8f601..1f9bbd91 100644
--- a/src/pj_ell_set.c
+++ b/src/pj_ell_set.c
@@ -20,7 +20,7 @@ static const PJ_ELLPS *pj_find_ellps (char *name);
 /***************************************************************************************/
 int pj_ellipsoid (PJ *P) {
 /****************************************************************************************
-    This is a replacement for the clasic PROJ pj_ell_set function. The main difference
+    This is a replacement for the classic PROJ pj_ell_set function. The main difference
     is that pj_ellipsoid augments the PJ object with a copy of the exact tags used to
     define its related ellipsoid.
 
diff --git a/src/pj_init.c b/src/pj_init.c
index cd8b67d9..3ea2aea0 100644
--- a/src/pj_init.c
+++ b/src/pj_init.c
@@ -689,7 +689,7 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) {
     if ((name = pj_param(ctx, start, "sunits").s) != NULL) {
         for (i = 0; (s = pj_units[i].id) && strcmp(name, s) ; ++i) ;
         if (!s)
-            return pj_default_destructor (PIN, PJD_ERR_UNKNOW_UNIT_ID);
+            return pj_default_destructor (PIN, PJD_ERR_UNKNOWN_UNIT_ID);
         s = pj_units[i].to_meter;
     }
     if (s || (s = pj_param(ctx, start, "sto_meter").s)) {
@@ -717,7 +717,7 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) {
     if ((name = pj_param(ctx, start, "svunits").s) != NULL) {
         for (i = 0; (s = pj_units[i].id) && strcmp(name, s) ; ++i) ;
         if (!s)
-            return pj_default_destructor (PIN, PJD_ERR_UNKNOW_UNIT_ID);
+            return pj_default_destructor (PIN, PJD_ERR_UNKNOWN_UNIT_ID);
         s = pj_units[i].to_meter;
     }
     if (s || (s = pj_param(ctx, start, "svto_meter").s)) {
diff --git a/src/pj_internal.c b/src/pj_internal.c
index 9b96444c..40f06bd6 100644
--- a/src/pj_internal.c
+++ b/src/pj_internal.c
@@ -209,7 +209,7 @@ consuming their surrounding whitespace.
     /* First collapse repeated whitespace (including +/;) */
     for (i = j = 0, ws = 0;  j < n;  j++) {
 
-        /* Eliminate prefix '+', only if preceeded by whitespace */
+        /* Eliminate prefix '+', only if preceded by whitespace */
         /* (i.e. keep it in 1.23e+08) */
         if ((i > 0) && ('+'==c[j]) && ws)
             c[j] = ' ';
diff --git a/src/proj_4D_api.c b/src/proj_4D_api.c
index b9f3d9bf..d9fa8c28 100644
--- a/src/proj_4D_api.c
+++ b/src/proj_4D_api.c
@@ -1036,7 +1036,7 @@ PJ_FACTORS proj_factors(PJ *P, PJ_COORD lp) {
     Characteristics include meridian, parallel and areal scales, angular
     distortion, meridian/parallel, meridian convergence and scale error.
 
-    returns PJ_FACTORS. If unsuccessfull, error number is set and the
+    returns PJ_FACTORS. If unsuccessful, error number is set and the
     struct returned contains NULL data.
 ******************************************************************************/
     PJ_FACTORS factors = {0,0,0,  0,0,0,  0,0,  0,0,0,0};
diff --git a/src/projects.h b/src/projects.h
index 25ff82a4..5c8d1301 100644
--- a/src/projects.h
+++ b/src/projects.h
@@ -535,7 +535,8 @@ enum deprecated_constants_for_now_dropped_analytical_factors {
 #define PJD_ERR_PROJ_NOT_NAMED           -4
 #define PJD_ERR_UNKNOWN_PROJECTION_ID    -5
 #define PJD_ERR_ECCENTRICITY_IS_ONE      -6
-#define PJD_ERR_UNKNOW_UNIT_ID           -7
+#define PJD_ERR_UNKNOW_UNIT_ID           -7  /* deprecated: typo */
+#define PJD_ERR_UNKNOWN_UNIT_ID          -7
 #define PJD_ERR_INVALID_BOOLEAN_PARAM    -8
 #define PJD_ERR_UNKNOWN_ELLP_PARAM       -9
 #define PJD_ERR_REV_FLATTENING_IS_ZERO  -10