diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-05-01 18:42:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-01 18:42:13 +0200 |
| commit | fc48053092b4b6f496bb983765ebf619a356e257 (patch) | |
| tree | 2c53161326b766dc41e4733ce6579503fc702384 /src/projections/urmfps.cpp | |
| parent | e168ad31badb6702240174250894a76385da323b (diff) | |
| parent | eeda5f7e5fd94a0cdcbf90df1f0b04a090f4c037 (diff) | |
| download | PROJ-fc48053092b4b6f496bb983765ebf619a356e257.tar.gz PROJ-fc48053092b4b6f496bb983765ebf619a356e257.zip | |
Merge branch 'master' into check_exported_symbols
Diffstat (limited to 'src/projections/urmfps.cpp')
| -rw-r--r-- | src/projections/urmfps.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/urmfps.cpp b/src/projections/urmfps.cpp index 3a51798b..3f9fdf23 100644 --- a/src/projections/urmfps.cpp +++ b/src/projections/urmfps.cpp @@ -19,7 +19,7 @@ struct pj_opaque { #define Cy 1.139753528477 -static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ +static PJ_XY urmfps_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ PJ_XY xy = {0.0, 0.0}; lp.phi = aasin (P->ctx,static_cast<struct pj_opaque*>(P->opaque)->n * sin (lp.phi)); xy.x = C_x * lp.lam * cos (lp.phi); @@ -28,7 +28,7 @@ static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ } -static PJ_LP s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ +static PJ_LP urmfps_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ PJ_LP lp = {0.0, 0.0}; xy.y /= static_cast<struct pj_opaque*>(P->opaque)->C_y; lp.phi = aasin(P->ctx, sin (xy.y) / static_cast<struct pj_opaque*>(P->opaque)->n); @@ -40,8 +40,8 @@ static PJ_LP s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ static PJ *setup(PJ *P) { static_cast<struct pj_opaque*>(P->opaque)->C_y = Cy / static_cast<struct pj_opaque*>(P->opaque)->n; P->es = 0.; - P->inv = s_inverse; - P->fwd = s_forward; + P->inv = urmfps_s_inverse; + P->fwd = urmfps_s_forward; return P; } |