From d24256162e5bb334e89c03b0f6eff987cda7a540 Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Mon, 25 Oct 2004 15:34:36 +0000
Subject: make names of geodetic funcs from geotrans unique

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1246 4e78687f-474d-0410-85f9-8d5e500ac6b2
---
 src/geocent.c      | 13 ++++++++-----
 src/geocent.h      |  8 ++++----
 src/pj_transform.c | 11 +++++++----
 3 files changed, 19 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/geocent.c b/src/geocent.c
index 5d6a104a..925150e8 100644
--- a/src/geocent.c
+++ b/src/geocent.c
@@ -65,6 +65,9 @@
  *    25-02-97          Original Code
  *
  * $Log$
+ * Revision 1.5  2004/10/25 15:34:36  fwarmerdam
+ * make names of geodetic funcs from geotrans unique
+ *
  * Revision 1.4  2004/05/03 16:28:01  warmerda
  * Apply iterative solution to geocentric_to_geodetic as suggestion from
  * Lothar Gorling.
@@ -125,8 +128,8 @@ double Geocent_ep2 = 0.00673949675658690300; /* 2nd eccentricity squared */
  */
 
 
-long Set_Geocentric_Parameters (double a, 
-                                double b) 
+long pj_Set_Geocentric_Parameters (double a, double b) 
+
 { /* BEGIN Set_Geocentric_Parameters */
 /*
  * The function Set_Geocentric_Parameters receives the ellipsoid parameters
@@ -156,7 +159,7 @@ long Set_Geocentric_Parameters (double a,
 } /* END OF Set_Geocentric_Parameters */
 
 
-void Get_Geocentric_Parameters (double *a, 
+void pj_Get_Geocentric_Parameters (double *a, 
                                 double *b)
 { /* BEGIN Get_Geocentric_Parameters */
 /*
@@ -172,7 +175,7 @@ void Get_Geocentric_Parameters (double *a,
 } /* END OF Get_Geocentric_Parameters */
 
 
-long Convert_Geodetic_To_Geocentric (double Latitude,
+long pj_Convert_Geodetic_To_Geocentric (double Latitude,
                                      double Longitude,
                                      double Height,
                                      double *X,
@@ -243,7 +246,7 @@ long Convert_Geodetic_To_Geocentric (double Latitude,
 
 #define USE_ITERATIVE_METHOD
 
-void Convert_Geocentric_To_Geodetic (double X,
+void pj_Convert_Geocentric_To_Geodetic (double X,
                                      double Y, 
                                      double Z,
                                      double *Latitude,
diff --git a/src/geocent.h b/src/geocent.h
index 58fca48e..34235565 100644
--- a/src/geocent.h
+++ b/src/geocent.h
@@ -93,7 +93,7 @@ extern "C" {
 #endif
 
 
-  long Set_Geocentric_Parameters (double a, 
+  long pj_Set_Geocentric_Parameters (double a, 
                                   double b);
 /*
  * The function Set_Geocentric_Parameters receives the ellipsoid parameters
@@ -104,7 +104,7 @@ extern "C" {
  */
 
 
-  void Get_Geocentric_Parameters (double *a, 
+  void pj_Get_Geocentric_Parameters (double *a, 
                                   double *b);
 /*
  * The function Get_Geocentric_Parameters returns the ellipsoid parameters
@@ -115,7 +115,7 @@ extern "C" {
  */
 
 
-  long Convert_Geodetic_To_Geocentric (double Latitude,
+  long pj_Convert_Geodetic_To_Geocentric (double Latitude,
                                        double Longitude,
                                        double Height,
                                        double *X,
@@ -136,7 +136,7 @@ extern "C" {
  */
 
 
-  void Convert_Geocentric_To_Geodetic (double X,
+  void pj_Convert_Geocentric_To_Geodetic (double X,
                                        double Y, 
                                        double Z,
                                        double *Latitude,
diff --git a/src/pj_transform.c b/src/pj_transform.c
index a933165c..85c782bb 100644
--- a/src/pj_transform.c
+++ b/src/pj_transform.c
@@ -30,6 +30,9 @@
  ******************************************************************************
  *
  * $Log$
+ * Revision 1.13  2004/10/25 15:34:36  fwarmerdam
+ * make names of geodetic funcs from geotrans unique
+ *
  * Revision 1.12  2004/05/03 19:45:23  warmerda
  * Altered so that raw ellpses are treated as a essentially having a
  * +towgs84=0,0,0 specification so ellpisoid shifts are applied.
@@ -328,7 +331,7 @@ int pj_geodetic_to_geocentric( double a, double es,
     else
         b = a * sqrt(1-es);
 
-    if( Set_Geocentric_Parameters( a, b ) != 0 )
+    if( pj_Set_Geocentric_Parameters( a, b ) != 0 )
     {
         pj_errno = PJD_ERR_GEOCENTRIC;
         return pj_errno;
@@ -338,7 +341,7 @@ int pj_geodetic_to_geocentric( double a, double es,
     {
         long io = i * point_offset;
 
-        if( Convert_Geodetic_To_Geocentric( y[io], x[io], z[io], 
+        if( pj_Convert_Geodetic_To_Geocentric( y[io], x[io], z[io], 
                                             x+io, y+io, z+io ) != 0 )
         {
             pj_errno = PJD_ERR_GEOCENTRIC;
@@ -366,7 +369,7 @@ int pj_geocentric_to_geodetic( double a, double es,
     else
         b = a * sqrt(1-es);
 
-    if( Set_Geocentric_Parameters( a, b ) != 0 )
+    if( pj_Set_Geocentric_Parameters( a, b ) != 0 )
     {
         pj_errno = PJD_ERR_GEOCENTRIC;
         return pj_errno;
@@ -379,7 +382,7 @@ int pj_geocentric_to_geodetic( double a, double es,
         if( x[io] == HUGE_VAL )
             continue;
 
-        Convert_Geocentric_To_Geodetic( x[io], y[io], z[io], 
+        pj_Convert_Geocentric_To_Geodetic( x[io], y[io], z[io], 
                                         y+io, x+io, z+io );
     }
 
-- 
cgit v1.2.3