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.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.c')
| -rw-r--r-- | src/geod.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -52,7 +52,7 @@ do_geod(void) { phil = phi2; laml = lam2; printLL(phi1, lam1); putchar('\n'); - for ( S = del_S = S / n_S; --n_S; S += del_S) { + for ( geod_S = del_S = geod_S / n_S; --n_S; geod_S += del_S) { geod_for(); printLL(phi2, lam2); putchar('\n'); } @@ -84,7 +84,7 @@ process(FILE *fid) { geod_inv(); } else { al12 = dmstor(s, &s); - S = strtod(s, &s) * to_meter; + geod_S = strtod(s, &s) * to_meter; geod_pre(); geod_for(); } @@ -99,21 +99,21 @@ process(FILE *fid) { if (oform) { (void)printf(oform, al12 * RAD_TO_DEG); TAB; (void)printf(oform, al21 * RAD_TO_DEG); TAB; - (void)printf(osform, S * fr_meter); + (void)printf(osform, geod_S * fr_meter); } else { (void)fputs(rtodms(pline, al12, 0, 0), stdout); TAB; (void)fputs(rtodms(pline, al21, 0, 0), stdout); TAB; - (void)printf(osform, S * fr_meter); + (void)printf(osform, geod_S * fr_meter); } } else if (inverse) if (oform) { (void)printf(oform, al12 * RAD_TO_DEG); TAB; (void)printf(oform, al21 * RAD_TO_DEG); TAB; - (void)printf(osform, S * fr_meter); + (void)printf(osform, geod_S * fr_meter); } else { (void)fputs(rtodms(pline, al12, 0, 0), stdout); TAB; (void)fputs(rtodms(pline, al21, 0, 0), stdout); TAB; - (void)printf(osform, S * fr_meter); + (void)printf(osform, geod_S * fr_meter); } else { printLL(phi2, lam2); TAB; |