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_for.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_for.c')
| -rw-r--r-- | src/geod_for.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/geod_for.c b/src/geod_for.c index 3411f0f5..5fe2021b 100644 --- a/src/geod_for.c +++ b/src/geod_for.c @@ -32,7 +32,7 @@ geod_pre(void) { D *= D; P = c2 / D; } else { - c1 = f * M; + c1 = geod_f * M; c2 = f4 * (1. - M * M); D = (1. - c2)*(1. - c2 - c1 * M); P = (1. + .5 * c1 * M) * c2 / D; @@ -50,7 +50,7 @@ geod_for(void) { double d,sind,u,V,X,ds,cosds,sinds,ss,de; if (ellipse) { - d = S / (D * a); + d = geod_S / (D * geod_a); if (signS) d = -d; u = 2. * (s1 - d); V = cos(u + d); @@ -58,7 +58,7 @@ geod_for(void) { ds = d + X - 2. * P * V * (1. - 2. * P * cos(u)) * sind; ss = s1 + s1 - ds; } else { - ds = S / a; + ds = geod_S / geod_a; if (signS) ds = - ds; } cosds = cos(ds); |