diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-09-25 15:55:33 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-09-25 15:55:33 +0200 |
| commit | d0941d05cb7f6f951b1ffd3ccc98fcaeaa971655 (patch) | |
| tree | b90e506f923559940fe29e45b553de852e131fdb /src/projections | |
| parent | ecea0e3c5937cda326eaa0d499983f807c49f1ab (diff) | |
| download | PROJ-d0941d05cb7f6f951b1ffd3ccc98fcaeaa971655.tar.gz PROJ-d0941d05cb7f6f951b1ffd3ccc98fcaeaa971655.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')
| -rw-r--r-- | src/projections/hatano.cpp | 4 | ||||
| -rw-r--r-- | src/projections/mbtfpp.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/projections/hatano.cpp b/src/projections/hatano.cpp index 6c125d2e..29a01f80 100644 --- a/src/projections/hatano.cpp +++ b/src/projections/hatano.cpp @@ -11,7 +11,7 @@ PROJ_HEAD(hatano, "Hatano Asymmetrical Equal Area") "\n\tPCyl, Sph"; #define EPS 1e-7 #define ONETOL 1.000001 #define CN 2.67595 -#define CS 2.43763 +#define CSz 2.43763 #define RCN 0.37369906014686373063 #define RCS 0.41023453108141924738 #define FYCN 1.75859 @@ -28,7 +28,7 @@ static PJ_XY hatano_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forwa int i; (void) P; - c = sin(lp.phi) * (lp.phi < 0. ? CS : CN); + c = sin(lp.phi) * (lp.phi < 0. ? CSz : CN); for (i = NITER; i; --i) { lp.phi -= th1 = (lp.phi + sin(lp.phi) - c) / (1. + cos(lp.phi)); if (fabs(th1) < EPS) break; 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; |