diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2015-06-28 18:29:23 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2015-06-28 18:29:23 +0200 |
| commit | 02232fd5fe58783a40a8cf124170d9ad4629b1ce (patch) | |
| tree | d2bfb849bd3ad4d952bc8e5db0e859b8cef8d0d7 /src/PJ_fahey.c | |
| parent | f89810c45ab97baf2847855eb6cd57619a806279 (diff) | |
| parent | 6073f5f3d33d401a7140611b8f3570caf5d17a3b (diff) | |
| download | PROJ-02232fd5fe58783a40a8cf124170d9ad4629b1ce.tar.gz PROJ-02232fd5fe58783a40a8cf124170d9ad4629b1ce.zip | |
Merge branch '4-warning-fixes' of github.com:QuLogic/proj.4
Diffstat (limited to 'src/PJ_fahey.c')
| -rw-r--r-- | src/PJ_fahey.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/PJ_fahey.c b/src/PJ_fahey.c index 93e9b38d..007fc906 100644 --- a/src/PJ_fahey.c +++ b/src/PJ_fahey.c @@ -3,11 +3,13 @@ PROJ_HEAD(fahey, "Fahey") "\n\tPcyl, Sph."; #define TOL 1e-6 FORWARD(s_forward); /* spheroid */ + (void) P; xy.y = 1.819152 * ( xy.x = tan(0.5 * lp.phi) ); xy.x = 0.819152 * lp.lam * asqrt(1 - xy.x * xy.x); return (xy); } INVERSE(s_inverse); /* spheroid */ + (void) P; lp.phi = 2. * atan(xy.y /= 1.819152); lp.lam = fabs(xy.y = 1. - xy.y * xy.y) < TOL ? 0. : xy.x / (0.819152 * sqrt(xy.y)); |