diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2004-10-25 15:34:36 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2004-10-25 15:34:36 +0000 |
| commit | d24256162e5bb334e89c03b0f6eff987cda7a540 (patch) | |
| tree | a26434688829e8e5a7089459dd9a71d4de6fa007 /src/geocent.c | |
| parent | 5bd1f5c43cb7f471d27b36c11ede600a8f42a95f (diff) | |
| download | PROJ-d24256162e5bb334e89c03b0f6eff987cda7a540.tar.gz PROJ-d24256162e5bb334e89c03b0f6eff987cda7a540.zip | |
make names of geodetic funcs from geotrans unique
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1246 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/geocent.c')
| -rw-r--r-- | src/geocent.c | 13 |
1 files changed, 8 insertions, 5 deletions
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, |