diff options
| author | Thomas Knudsen <thokn@sdfe.dk> | 2017-10-06 22:01:23 +0200 |
|---|---|---|
| committer | Thomas Knudsen <thokn@sdfe.dk> | 2017-10-06 22:01:23 +0200 |
| commit | 03123018ea7090b992430ce8dd4fa6980f04d0d3 (patch) | |
| tree | 5716a9475bca96c7d59870eb1673ed2aade87ab3 /src | |
| parent | 8045ecfaaf8943663132ce1eb8673fff636d2ce5 (diff) | |
| download | PROJ-03123018ea7090b992430ce8dd4fa6980f04d0d3.tar.gz PROJ-03123018ea7090b992430ce8dd4fa6980f04d0d3.zip | |
Remove superfluous checks for PJ.left being PJ_IO_UNITS_CLASSIC
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_fwd.c | 4 | ||||
| -rw-r--r-- | src/pj_fwd3d.c | 4 | ||||
| -rw-r--r-- | src/pj_inv.c | 2 | ||||
| -rw-r--r-- | src/pj_inv3d.c | 2 | ||||
| -rw-r--r-- | src/proj.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/pj_fwd.c b/src/pj_fwd.c index 02f18d1c..e010f6ec 100644 --- a/src/pj_fwd.c +++ b/src/pj_fwd.c @@ -17,8 +17,8 @@ pj_fwd(LP lp, PJ *P) { return err; last_errno = proj_errno_reset (P); - /* Check input coordinates if angular */ - if ((P->left==PJ_IO_UNITS_CLASSIC)||(P->left==PJ_IO_UNITS_RADIANS)) { + /* Check validity of angular input coordinates */ + if (P->left==PJ_IO_UNITS_RADIANS) { /* check for forward and latitude or longitude overange */ t = fabs(lp.phi)-M_HALFPI; diff --git a/src/pj_fwd3d.c b/src/pj_fwd3d.c index be683745..d141178f 100644 --- a/src/pj_fwd3d.c +++ b/src/pj_fwd3d.c @@ -20,8 +20,8 @@ XYZ pj_fwd3d(LPZ lpz, PJ *P) { last_errno = proj_errno_reset(P); - /* Check input coordinates if angular */ - if ((P->left==PJ_IO_UNITS_CLASSIC)||(P->left==PJ_IO_UNITS_RADIANS)) { + /* Check validity of angular input coordinates */ + if (P->left==PJ_IO_UNITS_RADIANS) { /* check for forward and latitude or longitude overange */ t = fabs(lpz.phi)-M_HALFPI; diff --git a/src/pj_inv.c b/src/pj_inv.c index 55fc917f..68a5595b 100644 --- a/src/pj_inv.c +++ b/src/pj_inv.c @@ -42,7 +42,7 @@ LP pj_inv(XY xy, PJ *P) { if (P->ctx->last_errno) return err; - if ((P->left==PJ_IO_UNITS_CLASSIC)||(P->left==PJ_IO_UNITS_RADIANS)) { + if (P->left==PJ_IO_UNITS_RADIANS) { /* reduce from del lp.lam */ lp.lam += P->lam0; diff --git a/src/pj_inv3d.c b/src/pj_inv3d.c index a01cfa7e..53e39a76 100644 --- a/src/pj_inv3d.c +++ b/src/pj_inv3d.c @@ -42,7 +42,7 @@ LPZ pj_inv3d (XYZ xyz, PJ *P) { if (P->ctx->last_errno) return err; - if ((P->left==PJ_IO_UNITS_CLASSIC)||(P->left==PJ_IO_UNITS_RADIANS)) { + if (P->left==PJ_IO_UNITS_RADIANS) { /* reduce from del lp.lam */ lpz.lam += P->lam0; @@ -145,7 +145,7 @@ static void process(FILE *fid) { } } else { /* x-y or decimal degree ascii output, scale if warranted by output units */ if (inverse) { - if (Proj->left == PJ_IO_UNITS_RADIANS || Proj->left == PJ_IO_UNITS_CLASSIC) { + if (Proj->left == PJ_IO_UNITS_RADIANS) { data.v *= RAD_TO_DEG; data.u *= RAD_TO_DEG; } |
