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/putp3.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/putp3.cpp')
| -rw-r--r-- | src/projections/putp3.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/projections/putp3.cpp b/src/projections/putp3.cpp index bc4a02e4..c2df20e8 100644 --- a/src/projections/putp3.cpp +++ b/src/projections/putp3.cpp @@ -17,7 +17,7 @@ PROJ_HEAD(putp3p, "Putnins P3'") "\n\tPCyl, Sph"; #define RPISQ 0.1013211836 -static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ +static PJ_XY putp3_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */ PJ_XY xy = {0.0,0.0}; xy.x = C * lp.lam * (1. - static_cast<struct pj_opaque*>(P->opaque)->A * lp.phi * lp.phi); @@ -27,7 +27,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 putp3_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */ PJ_LP lp = {0.0,0.0}; lp.phi = xy.y / C; @@ -46,8 +46,8 @@ PJ *PROJECTION(putp3) { Q->A = 4. * RPISQ; P->es = 0.; - P->inv = s_inverse; - P->fwd = s_forward; + P->inv = putp3_s_inverse; + P->fwd = putp3_s_forward; return P; } @@ -61,8 +61,8 @@ PJ *PROJECTION(putp3p) { Q->A = 2. * RPISQ; P->es = 0.; - P->inv = s_inverse; - P->fwd = s_forward; + P->inv = putp3_s_inverse; + P->fwd = putp3_s_forward; return P; } |