Merge pull request #1444 from rouault/disambguish_forward_inverse_names

Prefix inverse and forward functions by their projection names

1 files changed, 8 insertions, 8 deletions

diff --git a/src/projections/cea.cpp b/src/projections/cea.cpp
index a1c9c8b5..a7e5fd04 100644
--- a/src/projections/cea.cpp
+++ b/src/projections/cea.cpp
@@ -17,7 +17,7 @@ PROJ_HEAD(cea, "Equal Area Cylindrical") "\n\tCyl, Sph&Ell\n\tlat_ts=";
 # define EPS    1e-10
 
 
-static PJ_XY e_forward (PJ_LP lp, PJ *P) {          /* Ellipsoidal, forward */
+static PJ_XY cea_e_forward (PJ_LP lp, PJ *P) {          /* Ellipsoidal, forward */
     PJ_XY xy = {0.0,0.0};
     xy.x = P->k0 * lp.lam;
     xy.y = 0.5 * pj_qsfn (sin (lp.phi), P->e, P->one_es) / P->k0;
@@ -25,7 +25,7 @@ static PJ_XY e_forward (PJ_LP lp, PJ *P) {          /* Ellipsoidal, forward */
 }
 
 
-static PJ_XY s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
+static PJ_XY cea_s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
     PJ_XY xy = {0.0,0.0};
     xy.x = P->k0 * lp.lam;
     xy.y = sin(lp.phi) / P->k0;
@@ -33,7 +33,7 @@ static PJ_XY s_forward (PJ_LP lp, PJ *P) {           /* Spheroidal, forward */
 }
 
 
-static PJ_LP e_inverse (PJ_XY xy, PJ *P) {          /* Ellipsoidal, inverse */
+static PJ_LP cea_e_inverse (PJ_XY xy, PJ *P) {          /* Ellipsoidal, inverse */
     PJ_LP lp = {0.0,0.0};
     lp.phi = pj_authlat(asin( 2. * xy.y * P->k0 / static_cast<struct pj_opaque*>(P->opaque)->qp), static_cast<struct pj_opaque*>(P->opaque)->apa);
     lp.lam = xy.x / P->k0;
@@ -41,7 +41,7 @@ static PJ_LP e_inverse (PJ_XY xy, PJ *P) {          /* Ellipsoidal, inverse */
 }
 
 
-static PJ_LP s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse */
+static PJ_LP cea_s_inverse (PJ_XY xy, PJ *P) {           /* Spheroidal, inverse */
     PJ_LP lp = {0.0,0.0};
     double t;
 
@@ -92,11 +92,11 @@ PJ *PROJECTION(cea) {
             return pj_default_destructor(P, ENOMEM);
 
         Q->qp = pj_qsfn(1., P->e, P->one_es);
-        P->inv = e_inverse;
-        P->fwd = e_forward;
+        P->inv = cea_e_inverse;
+        P->fwd = cea_e_forward;
     } else {
-        P->inv = s_inverse;
-        P->fwd = s_forward;
+        P->inv = cea_s_inverse;
+        P->fwd = cea_s_forward;
     }
 
     return P;