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_mill.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_mill.c')
| -rw-r--r-- | src/PJ_mill.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/PJ_mill.c b/src/PJ_mill.c index 2c7fa266..c4af4c51 100644 --- a/src/PJ_mill.c +++ b/src/PJ_mill.c @@ -8,7 +8,7 @@ static XY s_forward (LP lp, PJ *P) { /* Spheroidal, forward */ (void) P; xy.x = lp.lam; - xy.y = log(tan(FORTPI + lp.phi * .4)) * 1.25; + xy.y = log(tan(M_FORTPI + lp.phi * .4)) * 1.25; return (xy); } @@ -19,7 +19,7 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ (void) P; lp.lam = xy.x; - lp.phi = 2.5 * (atan(exp(.8 * xy.y)) - FORTPI); + lp.phi = 2.5 * (atan(exp(.8 * xy.y)) - M_FORTPI); return (lp); } |