aboutsummaryrefslogtreecommitdiff
path: root/src/projections/robin.cpp
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2019-05-01 18:42:13 +0200
committerGitHub <noreply@github.com>2019-05-01 18:42:13 +0200
commitfc48053092b4b6f496bb983765ebf619a356e257 (patch)
tree2c53161326b766dc41e4733ce6579503fc702384 /src/projections/robin.cpp
parente168ad31badb6702240174250894a76385da323b (diff)
parenteeda5f7e5fd94a0cdcbf90df1f0b04a090f4c037 (diff)
downloadPROJ-fc48053092b4b6f496bb983765ebf619a356e257.tar.gz
PROJ-fc48053092b4b6f496bb983765ebf619a356e257.zip
Merge branch 'master' into check_exported_symbols
Diffstat (limited to 'src/projections/robin.cpp')
-rw-r--r--src/projections/robin.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/projections/robin.cpp b/src/projections/robin.cpp
index dfb750dd..c08ac0e2 100644
--- a/src/projections/robin.cpp
+++ b/src/projections/robin.cpp
@@ -77,7 +77,7 @@ static const struct COEFS Y[] = {
/* Not sure at all of the appropriate number for MAX_ITER... */
#define MAX_ITER 100
-static PJ_XY s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
+static PJ_XY robin_s_forward (PJ_LP lp, PJ *P) { /* Spheroidal, forward */
PJ_XY xy = {0.0,0.0};
long i;
double dphi;
@@ -99,7 +99,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 robin_s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */
PJ_LP lp = {0.0,0.0};
long i;
double t, t1;
@@ -149,8 +149,8 @@ static PJ_LP s_inverse (PJ_XY xy, PJ *P) { /* Spheroidal, inverse */
PJ *PROJECTION(robin) {
P->es = 0.;
- P->inv = s_inverse;
- P->fwd = s_forward;
+ P->inv = robin_s_inverse;
+ P->fwd = robin_s_forward;
return P;
}