diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2002-05-30 13:40:55 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2002-05-30 13:40:55 +0000 |
| commit | f94b4a77d96ede45af76ada8223b915cbb68023d (patch) | |
| tree | 0cfded56aa946ca16ebf81f62057e099bf400db9 /src/geod_set.c | |
| parent | fff37a106352de2e859829710ba2f8e272cd41d8 (diff) | |
| download | PROJ-f94b4a77d96ede45af76ada8223b915cbb68023d.tar.gz PROJ-f94b4a77d96ede45af76ada8223b915cbb68023d.zip | |
use less conflicting names for a, S and f
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1015 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/geod_set.c')
| -rw-r--r-- | src/geod_set.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/geod_set.c b/src/geod_set.c index 76cea729..2f00e9c2 100644 --- a/src/geod_set.c +++ b/src/geod_set.c @@ -19,7 +19,7 @@ geod_set(int argc, char **argv) { else start = curr = pj_mkparam(argv[i]); /* set elliptical parameters */ - if (pj_ell_set(start, &a, &es)) emess(1,"ellipse setup failure"); + if (pj_ell_set(start, &geod_a, &es)) emess(1,"ellipse setup failure"); /* set units */ if (name = pj_param(start, "sunits").s) { char *s; @@ -32,13 +32,13 @@ geod_set(int argc, char **argv) { to_meter = fr_meter = 1.; if (ellipse = es != 0.) { onef = sqrt(1. - es); - f = 1 - onef; - f2 = f/2; - f4 = f/4; - f64 = f*f/64; + geod_f = 1 - onef; + f2 = geod_f/2; + f4 = geod_f/4; + f64 = geod_f*geod_f/64; } else { onef = 1.; - f = f2 = f4 = f64 = 0.; + geod_f = f2 = f4 = f64 = 0.; } /* check if line or arc mode */ if (pj_param(start, "tlat_1").i) { @@ -51,7 +51,7 @@ geod_set(int argc, char **argv) { lam2 = pj_param(start, "rlon_2").f; geod_inv(); geod_pre(); - } else if (S = pj_param(start, "dS").f) { + } else if (geod_S = pj_param(start, "dS").f) { al12 = pj_param(start, "rA").f; geod_pre(); geod_for(); @@ -60,7 +60,7 @@ geod_set(int argc, char **argv) { if (!(del_alpha = pj_param(start, "rdel_A").f)) emess(1,"del azimuth == 0"); } else if (del_S = fabs(pj_param(start, "ddel_S").f)) { - n_S = S / del_S + .5; + n_S = geod_S / del_S + .5; } else if ((n_S = pj_param(start, "in_S").i) <= 0) emess(1,"no interval divisor selected"); } |