diff options
| author | Micah Cochran <micahcochran@users.noreply.github.com> | 2016-05-28 11:26:35 -0500 |
|---|---|---|
| committer | Micah Cochran <micahcochran@users.noreply.github.com> | 2016-05-28 11:26:35 -0500 |
| commit | 3043b2f7fcf4471983c8d4472b17ccf9df1710c8 (patch) | |
| tree | 94e63e8367dad31a6f0fe1703050d0ad79340785 /src/PJ_aeqd.c | |
| parent | a112ea3172e89230fa307567be3d70e286b1eeb5 (diff) | |
| download | PROJ-3043b2f7fcf4471983c8d4472b17ccf9df1710c8.tar.gz PROJ-3043b2f7fcf4471983c8d4472b17ccf9df1710c8.zip | |
Change math constants, similar to PR #372. Use M_ namespace with the de facto standard M_PI and its ilk. Change names that are widely used in the project to be in the M_ namespace, so HALFPI becomes M_HALFPI. HALFPI is #defined as M_PI_2 (the defacto standard name). #defines _USE_MATH_DEFINES for MS Visual Studio (I didn't personally test this part, but Appveyor will not build otherwise).
Diffstat (limited to 'src/PJ_aeqd.c')
| -rw-r--r-- | src/PJ_aeqd.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/PJ_aeqd.c b/src/PJ_aeqd.c index 560d5a91..2b832edd 100644 --- a/src/PJ_aeqd.c +++ b/src/PJ_aeqd.c @@ -139,8 +139,8 @@ oblcon: lp.phi = -lp.phi; coslam = -coslam; case S_POLE: - if (fabs(lp.phi - HALFPI) < EPS10) F_ERROR; - xy.x = (xy.y = (HALFPI + lp.phi)) * sin(lp.lam); + if (fabs(lp.phi - M_HALFPI) < EPS10) F_ERROR; + xy.x = (xy.y = (M_HALFPI + lp.phi)) * sin(lp.lam); xy.y *= coslam; break; } @@ -203,9 +203,9 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ struct pj_opaque *Q = P->opaque; double cosc, c_rh, sinc; - if ((c_rh = hypot(xy.x, xy.y)) > PI) { - if (c_rh - EPS10 > PI) I_ERROR; - c_rh = PI; + if ((c_rh = hypot(xy.x, xy.y)) > M_PI) { + if (c_rh - EPS10 > M_PI) I_ERROR; + c_rh = M_PI; } else if (c_rh < EPS10) { lp.phi = P->phi0; lp.lam = 0.; @@ -226,10 +226,10 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ } lp.lam = xy.y == 0. ? 0. : atan2(xy.x, xy.y); } else if (Q->mode == N_POLE) { - lp.phi = HALFPI - c_rh; + lp.phi = M_HALFPI - c_rh; lp.lam = atan2(xy.x, -xy.y); } else { - lp.phi = c_rh - HALFPI; + lp.phi = c_rh - M_HALFPI; lp.lam = atan2(xy.x, xy.y); } return lp; @@ -263,7 +263,7 @@ PJ *PROJECTION(aeqd) { geod_init(&Q->g, P->a, P->es / (1 + sqrt(P->one_es))); P->phi0 = pj_param(P->ctx, P->params, "rlat_0").f; - if (fabs(fabs(P->phi0) - HALFPI) < EPS10) { + if (fabs(fabs(P->phi0) - M_HALFPI) < EPS10) { Q->mode = P->phi0 < 0. ? S_POLE : N_POLE; Q->sinph0 = P->phi0 < 0. ? -1. : 1.; Q->cosph0 = 0.; @@ -288,10 +288,10 @@ PJ *PROJECTION(aeqd) { } else { switch (Q->mode) { case N_POLE: - Q->Mp = pj_mlfn(HALFPI, 1., 0., Q->en); + Q->Mp = pj_mlfn(M_HALFPI, 1., 0., Q->en); break; case S_POLE: - Q->Mp = pj_mlfn(-HALFPI, -1., 0., Q->en); + Q->Mp = pj_mlfn(-M_HALFPI, -1., 0., Q->en); break; case EQUIT: case OBLIQ: |