Merge pull request #1444 from rouault/disambguish_forward_inverse_names

Prefix inverse and forward functions by their projection names

1 files changed, 4 insertions, 4 deletions

diff --git a/src/projections/bipc.cpp b/src/projections/bipc.cpp
index 5cfef11f..9fd2fc6f 100644
--- a/src/projections/bipc.cpp
+++ b/src/projections/bipc.cpp
@@ -36,7 +36,7 @@ struct pj_opaque {
 } // anonymous namespace
 
 
-static PJ_XY s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
+static PJ_XY bipc_s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
     PJ_XY xy = {0.0,0.0};
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
     double cphi, sphi, tphi, t, al, Az, z, Av, cdlam, sdlam, r;
@@ -113,7 +113,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 bipc_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse */
     PJ_LP lp = {0.0,0.0};
     struct pj_opaque *Q = static_cast<struct pj_opaque*>(P->opaque);
     double t, r, rp, rl, al, z = 0.0, fAz, Az, s, c, Av;
@@ -169,8 +169,8 @@ PJ *PROJECTION(bipc) {
     P->opaque = Q;
 
     Q->noskew = pj_param(P->ctx, P->params, "bns").i;
-    P->inv = s_inverse;
-    P->fwd = s_forward;
+    P->inv = bipc_s_inverse;
+    P->fwd = bipc_s_forward;
     P->es = 0.;
     return P;
 }