diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/PJ_aitoff.c | 2 | ||||
| -rw-r--r-- | src/PJ_healpix.c | 4 | ||||
| -rw-r--r-- | src/PJ_isea.c | 8 | ||||
| -rw-r--r-- | src/PJ_omerc.c | 2 | ||||
| -rw-r--r-- | src/cs2cs.c | 4 | ||||
| -rw-r--r-- | src/dmstor.c | 2 | ||||
| -rw-r--r-- | src/emess.h | 2 | ||||
| -rw-r--r-- | src/geocent.c | 8 | ||||
| -rw-r--r-- | src/geodesic.c | 6 | ||||
| -rw-r--r-- | src/geodesic.h | 6 | ||||
| -rw-r--r-- | src/jniproj.c | 2 | ||||
| -rw-r--r-- | src/pj_apply_gridshift.c | 4 | ||||
| -rw-r--r-- | src/pj_apply_vgridshift.c | 2 | ||||
| -rw-r--r-- | src/pj_gridlist.c | 2 | ||||
| -rw-r--r-- | src/pj_init.c | 2 | ||||
| -rw-r--r-- | src/pj_mlfn.c | 2 | ||||
| -rw-r--r-- | src/pj_transform.c | 2 | ||||
| -rw-r--r-- | src/proj.c | 2 | ||||
| -rw-r--r-- | src/projects.h | 2 |
19 files changed, 32 insertions, 32 deletions
diff --git a/src/PJ_aitoff.c b/src/PJ_aitoff.c index ef6e7d71..68d95ef8 100644 --- a/src/PJ_aitoff.c +++ b/src/PJ_aitoff.c @@ -94,7 +94,7 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ if ((fabs(xy.x) < EPSILON) && (fabs(xy.y) < EPSILON )) { lp.phi = 0.; lp.lam = 0.; return lp; } - /* intial values for Newton-Raphson method */ + /* initial values for Newton-Raphson method */ lp.phi = xy.y; lp.lam = xy.x; do { iter = 0; diff --git a/src/PJ_healpix.c b/src/PJ_healpix.c index 318f42bc..8fd2c829 100644 --- a/src/PJ_healpix.c +++ b/src/PJ_healpix.c @@ -183,7 +183,7 @@ int in_image(double x, double y, int proj, int north_square, int south_square) { * Before C99 this was not allowed and to keep as portable as * possible we do it the C89 way here. * We need to assign the array this way because the input is - * dynamic (north_square and south_square vars are unknow at + * dynamic (north_square and south_square vars are unknown at * compile time). **/ double rhealpixVertsJit[12][2]; @@ -221,7 +221,7 @@ int in_image(double x, double y, int proj, int north_square, int south_square) { /** * Return the authalic latitude of latitude alpha (if inverse=0) or * return the approximate latitude of authalic latitude alpha (if inverse=1). - * P contains the relavent ellipsoid parameters. + * P contains the relevant ellipsoid parameters. **/ double auth_lat(PJ *P, double alpha, int inverse) { struct pj_opaque *Q = P->opaque; diff --git a/src/PJ_isea.c b/src/PJ_isea.c index 34a2aac8..ab9a5a8c 100644 --- a/src/PJ_isea.c +++ b/src/PJ_isea.c @@ -485,15 +485,15 @@ isea_snyder_forward(struct isea_geo * ll, struct isea_pt * out) exit(EXIT_FAILURE); /* not reached */ - return 0; /* supresses a warning */ + return 0; /* suppresses a warning */ } /* - * return the new coordinates of any point in orginal coordinate system. - * Define a point (newNPold) in orginal coordinate system as the North Pole in + * return the new coordinates of any point in original coordinate system. + * Define a point (newNPold) in original coordinate system as the North Pole in * new coordinate system, and the great circle connect the original and new * North Pole as the lon0 longitude in new coordinate system, given any point - * in orginal coordinate system, this function return the new coordinates. + * in original coordinate system, this function return the new coordinates. */ #define PRECISION 0.0000000000005 diff --git a/src/PJ_omerc.c b/src/PJ_omerc.c index 6abd2d33..8874784d 100644 --- a/src/PJ_omerc.c +++ b/src/PJ_omerc.c @@ -140,7 +140,7 @@ PJ *PROJECTION(omerc) { if (alp || gam) { lamc = pj_param(P->ctx, P->params, "rlonc").f; no_off = - /* For libproj4 compatability */ + /* For libproj4 compatibility */ pj_param(P->ctx, P->params, "tno_off").i /* for backward compatibility */ || pj_param(P->ctx, P->params, "tno_uoff").i; diff --git a/src/cs2cs.c b/src/cs2cs.c index 90369326..83e2d3f0 100644 --- a/src/cs2cs.c +++ b/src/cs2cs.c @@ -404,7 +404,7 @@ int main(int argc, char **argv) if( use_env_locale ) { - /* Restore C locale to avoid issues in parsing/outputing numbers*/ + /* Restore C locale to avoid issues in parsing/outputting numbers*/ setlocale(LC_ALL, "C"); } @@ -415,7 +415,7 @@ int main(int argc, char **argv) pj_pr_list(toProj); } - /* set input formating control */ + /* set input formatting control */ if( !fromProj->is_latlong ) informat = strtod; else { diff --git a/src/dmstor.c b/src/dmstor.c index 9665d5a9..b994589f 100644 --- a/src/dmstor.c +++ b/src/dmstor.c @@ -5,7 +5,7 @@ static double proj_strtod(char *nptr, char **endptr); -/* following should be sufficient for all but the rediculous */ +/* following should be sufficient for all but the ridiculous */ #define MAX_WORK 64 static const char *sym = "NnEeSsWw"; diff --git a/src/emess.h b/src/emess.h index 4106e11d..b8203246 100644 --- a/src/emess.h +++ b/src/emess.h @@ -6,7 +6,7 @@ struct EMESS { char *File_name, /* input file name */ *Prog_name; /* name of program */ int File_line; /* approximate line read - where error occured */ + where error occurred */ }; #ifdef EMESS_ROUTINE /* use type */ diff --git a/src/geocent.c b/src/geocent.c index 6ac6c40b..66e2c314 100644 --- a/src/geocent.c +++ b/src/geocent.c @@ -320,7 +320,7 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, * das Gravitationspotential der Erde. Wiss. Arb. Univ. Hannover * Nr. 137, p. 130-131. -* Programmed by GGA- Leibniz-Institue of Applied Geophysics +* Programmed by GGA- Leibniz-Institute of Applied Geophysics * Stilleweg 2 * D-30655 Hannover * Federal Republic of Germany @@ -344,7 +344,7 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, * (e.g. -6300000.m), algorithm needs about 15 steps. */ -/* local defintions and variables */ +/* local definitions and variables */ /* end-criterium of loop, accuracy of sin(Latitude) */ #define genau 1.E-12 #define genau2 (genau*genau) @@ -362,7 +362,7 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, double CPHI; /* cos of searched geodetic latitude */ double SPHI; /* sin of searched geodetic latitude */ double SDPHI; /* end-criterium: addition-theorem of sin(Latitude(iter)-Latitude(iter-1)) */ - int iter; /* # of continous iteration, max. 30 is always enough (s.a.) */ + int iter; /* # of continuous iteration, max. 30 is always enough (s.a.) */ P = sqrt(X*X+Y*Y); RR = sqrt(X*X+Y*Y+Z*Z); @@ -389,7 +389,7 @@ void pj_Convert_Geocentric_To_Geodetic (GeocentricInfo *gi, } /* -------------------------------------------------------------- - * Following iterative algorithm was developped by + * Following iterative algorithm was developed by * "Institut für Erdmessung", University of Hannover, July 1988. * Internet: www.ife.uni-hannover.de * Iterative computation of CPHI,SPHI and Height. diff --git a/src/geodesic.c b/src/geodesic.c index e897e89e..ad4a2686 100644 --- a/src/geodesic.c +++ b/src/geodesic.c @@ -896,7 +896,7 @@ static real geod_geninverse_int(const struct geod_geodesic* g, continue; } } - /* Either dv was not postive or updated value was outside legal + /* Either dv was not positive or updated value was outside legal * range. Use the midpoint of the bracket as the next estimate. * This mechanism is not needed for the WGS84 ellipsoid, but it does * catch problems with more eccentric ellipsoids. Its efficacy is @@ -1484,7 +1484,7 @@ real A3f(const struct geod_geodesic* g, real eps) { void C3f(const struct geod_geodesic* g, real eps, real c[]) { /* Evaluate C3 coeffs - * Elements c[1] thru c[nC3 - 1] are set */ + * Elements c[1] through c[nC3 - 1] are set */ real mult = 1; int o = 0, l; for (l = 1; l < nC3; ++l) { /* l is index of C3[l] */ @@ -1497,7 +1497,7 @@ void C3f(const struct geod_geodesic* g, real eps, real c[]) { void C4f(const struct geod_geodesic* g, real eps, real c[]) { /* Evaluate C4 coeffs - * Elements c[0] thru c[nC4 - 1] are set */ + * Elements c[0] through c[nC4 - 1] are set */ real mult = 1; int o = 0, l; for (l = 0; l < nC4; ++l) { /* l is index of C4[l] */ diff --git a/src/geodesic.h b/src/geodesic.h index c3f28c79..ff10c906 100644 --- a/src/geodesic.h +++ b/src/geodesic.h @@ -448,7 +448,7 @@ extern "C" { * * This function sets point 3 of the geod_geodesicline to correspond to point * 2 of the direct geodesic problem. See geod_lineinit() for more - * informaion. + * information. **********************************************************************/ void geod_directline(struct geod_geodesicline* l, const struct geod_geodesic* g, @@ -478,7 +478,7 @@ extern "C" { * * This function sets point 3 of the geod_geodesicline to correspond to point * 2 of the direct geodesic problem. See geod_lineinit() for more - * informaion. + * information. **********************************************************************/ void geod_gendirectline(struct geod_geodesicline* l, const struct geod_geodesic* g, @@ -504,7 +504,7 @@ extern "C" { * * This function sets point 3 of the geod_geodesicline to correspond to point * 2 of the inverse geodesic problem. See geod_lineinit() for more - * informaion. + * information. **********************************************************************/ void geod_inverseline(struct geod_geodesicline* l, const struct geod_geodesic* g, diff --git a/src/jniproj.c b/src/jniproj.c index 6094d577..85d984da 100644 --- a/src/jniproj.c +++ b/src/jniproj.c @@ -454,7 +454,7 @@ JNIEXPORT jstring JNICALL Java_org_proj4_PJ_getLastError * This method will also set the Java "ptr" final field to 0 as a safety. In theory we are not * supposed to change the value of a final field. But no Java code should use this field, and * the PJ object is being garbage collected anyway. We set the field to 0 as a safety in case - * some user invoked the finalize() method explicitely despite our warning in the Javadoc to + * some user invoked the finalize() method explicitly despite our warning in the Javadoc to * never do such thing. * * \param env - The JNI environment. diff --git a/src/pj_apply_gridshift.c b/src/pj_apply_gridshift.c index d6141905..40fe7cdc 100644 --- a/src/pj_apply_gridshift.c +++ b/src/pj_apply_gridshift.c @@ -72,7 +72,7 @@ int pj_apply_gridshift( projCtx ctx, const char *nadgrids, int inverse, /************************************************************************/ /* pj_apply_gridshift_2() */ /* */ -/* This implmentation takes uses the gridlist from a coordinate */ +/* This implementation takes uses the gridlist from a coordinate */ /* system definition. If the gridlist has not yet been */ /* populated in the coordinate system definition we set it up */ /* now. */ @@ -228,7 +228,7 @@ int pj_apply_gridshift_3( projCtx ctx, PJ_GRIDINFO **tables, int grid_count, * We don't actually have any machinery currently to set the * following macro, so this is mostly kept here to make it clear * how we ought to operate if we wanted to make it super clear - * that an error has occured when points are outside our available + * that an error has occurred when points are outside our available * datum shift areas. But if this is on, we will find that "low * value" points on the fringes of some datasets will completely * fail causing lots of problems when it is more or less ok to diff --git a/src/pj_apply_vgridshift.c b/src/pj_apply_vgridshift.c index 297211c1..7c498085 100644 --- a/src/pj_apply_vgridshift.c +++ b/src/pj_apply_vgridshift.c @@ -35,7 +35,7 @@ /************************************************************************/ /* pj_apply_vgridshift() */ /* */ -/* This implmentation takes uses the gridlist from a coordinate */ +/* This implementation takes uses the gridlist from a coordinate */ /* system definition. If the gridlist has not yet been */ /* populated in the coordinate system definition we set it up */ /* now. */ diff --git a/src/pj_gridlist.c b/src/pj_gridlist.c index a54dbe6f..6b7e2ffa 100644 --- a/src/pj_gridlist.c +++ b/src/pj_gridlist.c @@ -92,7 +92,7 @@ static int pj_gridlist_merge_gridfile( projCtx ctx, { got_match = 1; - /* dont add to the list if it is invalid. */ + /* don't add to the list if it is invalid. */ if( this_grid->ct == NULL ) return 0; diff --git a/src/pj_init.c b/src/pj_init.c index d5fe2433..c468f1d7 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -290,7 +290,7 @@ get_init(projCtx ctx, paralist **start, paralist *next, char *name, /* pj_init_plus() */ /* */ /* Same as pj_init() except it takes one argument string with */ -/* individual arguments preceeded by '+', such as "+proj=utm */ +/* individual arguments preceded by '+', such as "+proj=utm */ /* +zone=11 +ellps=WGS84". */ /************************************************************************/ diff --git a/src/pj_mlfn.c b/src/pj_mlfn.c index aeab6117..2b823026 100644 --- a/src/pj_mlfn.c +++ b/src/pj_mlfn.c @@ -1,6 +1,6 @@ #include <projects.h> /* meridinal distance for ellipsoid and inverse -** 8th degree - accurate to < 1e-5 meters when used in conjuction +** 8th degree - accurate to < 1e-5 meters when used in conjunction ** with typical major axis values. ** Inverse determines phi to EPS (1e-11) radians, about 1e-6 seconds. */ diff --git a/src/pj_transform.c b/src/pj_transform.c index 1794678b..cf840db4 100644 --- a/src/pj_transform.c +++ b/src/pj_transform.c @@ -555,7 +555,7 @@ int pj_compare_datums( PJ *srcdefn, PJ *dstdefn ) else if( srcdefn->a_orig != dstdefn->a_orig || ABS(srcdefn->es_orig - dstdefn->es_orig) > 0.000000000050 ) { - /* the tolerence for es is to ensure that GRS80 and WGS84 are + /* the tolerance for es is to ensure that GRS80 and WGS84 are considered identical */ return 0; } @@ -441,7 +441,7 @@ int main(int argc, char **argv) { gen_cheb(inverse, int_proj, cheby_str, Proj, iargc, iargv); exit(0); } - /* set input formating control */ + /* set input formatting control */ if (mon) { pj_pr_list(Proj); if (very_verby) { diff --git a/src/projects.h b/src/projects.h index 47a3364a..33af9ca7 100644 --- a/src/projects.h +++ b/src/projects.h @@ -443,7 +443,7 @@ struct FACTORS { #define PJD_3PARAM 1 #define PJD_7PARAM 2 #define PJD_GRIDSHIFT 3 -#define PJD_WGS84 4 /* WGS84 (or anything considered equivelent) */ +#define PJD_WGS84 4 /* WGS84 (or anything considered equivalent) */ /* library errors */ #define PJD_ERR_GEOCENTRIC -45 |
