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_gridinfo.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_gridinfo.c')
| -rw-r--r-- | src/pj_gridinfo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c index 08eb80f3..48ef7b87 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -244,8 +244,8 @@ int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi ) cvs = ct_tmp.cvs + (row) * gi->ct->lim.lam + (gi->ct->lim.lam - i - 1); - cvs->phi = *(diff_seconds++) * ((PI/180.0) / 3600.0); - cvs->lam = *(diff_seconds++) * ((PI/180.0) / 3600.0); + cvs->phi = *(diff_seconds++) * ((M_PI/180.0) / 3600.0); + cvs->lam = *(diff_seconds++) * ((M_PI/180.0) / 3600.0); } } @@ -324,8 +324,8 @@ int pj_gridinfo_load( projCtx ctx, PJ_GRIDINFO *gi ) cvs = ct_tmp.cvs + (row) * gi->ct->lim.lam + (gi->ct->lim.lam - i - 1); - cvs->phi = *(diff_seconds++) * ((PI/180.0) / 3600.0); - cvs->lam = *(diff_seconds++) * ((PI/180.0) / 3600.0); + cvs->phi = *(diff_seconds++) * ((M_PI/180.0) / 3600.0); + cvs->lam = *(diff_seconds++) * ((M_PI/180.0) / 3600.0); diff_seconds += 2; /* skip accuracy values */ } } |