diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2001-04-05 19:32:19 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2001-04-05 19:32:19 +0000 |
| commit | 70e770fb65c773e38d929d97be3d3e9d14f5628f (patch) | |
| tree | 24ace4e29d26c429ec366ea38f8f7b063939a68d /src/cs2cs.c | |
| parent | ed56bd05dada24911c4ea458cb3e1f6b030e24c2 (diff) | |
| download | PROJ-70e770fb65c773e38d929d97be3d3e9d14f5628f.tar.gz PROJ-70e770fb65c773e38d929d97be3d3e9d14f5628f.zip | |
use projPJ, and pj_is_latlong()
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@940 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/cs2cs.c')
| -rw-r--r-- | src/cs2cs.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/cs2cs.c b/src/cs2cs.c index 76e60e23..54c63f6f 100644 --- a/src/cs2cs.c +++ b/src/cs2cs.c @@ -29,6 +29,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.4 2001/04/05 19:32:19 warmerda + * use projPJ, and pj_is_latlong() + * * Revision 1.3 2001/04/05 04:23:28 warmerda * use pj_latlong_from_proj * @@ -51,7 +54,7 @@ #define MAX_LINE 200 #define MAX_PARGS 100 -static PJ *fromProj, *toProj; +static projPJ fromProj, toProj; static int reversein = 0, /* != 0 reverse input arguments */ @@ -134,7 +137,7 @@ static void process(FILE *fid) if (data.u == HUGE_VAL) /* error output */ fputs(oterr, stdout); - else if (toProj->is_latlong && !oform) { /*ascii DMS output */ + else if (pj_is_latlong(toProj) && !oform) { /*ascii DMS output */ if (reverseout) { fputs(rtodms(pline, data.v, 'N', 'S'), stdout); putchar('\t'); @@ -146,7 +149,7 @@ static void process(FILE *fid) } } else { /* x-y or decimal degree ascii output */ - if ( toProj->is_latlong ) { + if ( pj_is_latlong(toProj) ) { data.v *= RAD_TO_DEG; data.u *= RAD_TO_DEG; } |