diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-09-25 13:55:33 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-09-25 13:55:33 +0000 |
| commit | 7806af71e85f17c5bce0eb9d070fea1dbb40f38d (patch) | |
| tree | ead29edcad8b5a3085ddcee9d94d311fc8bebe1e /src/projections/mbtfpp.cpp | |
| parent | 3854668626445d20ff28b87fcacadf64f75460a8 (diff) | |
| download | PROJ-7806af71e85f17c5bce0eb9d070fea1dbb40f38d.tar.gz PROJ-7806af71e85f17c5bce0eb9d070fea1dbb40f38d.zip | |
hatano/mbtfpp: do not use CS to fix Solaris build issue
Patches proj-6.2.0-hanato.gpatch and proj-6.2.0-mbtfpp.gpatch from Eric Dechaux
Diffstat (limited to 'src/projections/mbtfpp.cpp')
| -rw-r--r-- | src/projections/mbtfpp.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/projections/mbtfpp.cpp b/src/projections/mbtfpp.cpp index a4ab60b9..6cc7c466 100644 --- a/src/projections/mbtfpp.cpp +++ b/src/projections/mbtfpp.cpp @@ -7,7 +7,7 @@ PROJ_HEAD(mbtfpp, "McBride-Thomas Flat-Polar Parabolic") "\n\tCyl, Sph"; -#define CS .95257934441568037152 +#define CSy .95257934441568037152 #define FXC .92582009977255146156 #define FYC 3.40168025708304504493 #define C23 .66666666666666666666 @@ -19,7 +19,7 @@ static PJ_XY mbtfpp_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forwa PJ_XY xy = {0.0,0.0}; (void) P; - lp.phi = asin(CS * sin(lp.phi)); + lp.phi = asin(CSy * sin(lp.phi)); xy.x = FXC * lp.lam * (2. * cos(C23 * lp.phi) - 1.); xy.y = FYC * sin(C13 * lp.phi); return xy; @@ -41,7 +41,7 @@ static PJ_LP mbtfpp_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inver lp.phi = asin(lp.phi); lp.lam = xy.x / ( FXC * (2. * cos(C23 * (lp.phi *= 3.)) - 1.) ); - if (fabs(lp.phi = sin(lp.phi) / CS) >= 1.) { + if (fabs(lp.phi = sin(lp.phi) / CSy) >= 1.) { if (fabs(lp.phi) > ONEEPS) { proj_errno_set(P, PJD_ERR_TOLERANCE_CONDITION); return lp; |