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/pj_transform.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/pj_transform.c')
| -rw-r--r-- | src/pj_transform.c | 11 |
1 files changed, 7 insertions, 4 deletions
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 ); } |