diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2004-11-05 06:05:11 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2004-11-05 06:05:11 +0000 |
| commit | f7f8bbe5062ffd32593ba377253cdc8fd6aeb09e (patch) | |
| tree | 370d724bdc3249202ea918ef932a89cec150b094 | |
| parent | 721d37eaaffb65527c16986f295ad879d9e8ccc7 (diff) | |
| download | PROJ-f7f8bbe5062ffd32593ba377253cdc8fd6aeb09e.tar.gz PROJ-f7f8bbe5062ffd32593ba377253cdc8fd6aeb09e.zip | |
Fixed pj_geocentric_to_geodetic() to not try and process HUGE_VAL values
(those that have failed some previous transform step). Related to bug:5B
http://bugzilla.remotesensing.org/show_bug.cgi?id=642
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1279 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/pj_transform.c | 10 |
2 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2004-11-05 Frank Warmerdam <warmerdam@pobox.com> + + * src/pj_transform.c: Fixed pj_geocentric_to_geodetic() to not try + and process HUGE_VAL values (those that have failed some previous + transform step). Related to bug: + http://bugzilla.remotesensing.org/show_bug.cgi?id=642 + 2004-10-30 Frank Warmerdam <warmerdam@pobox.com> * Improved --with-jni support in configure to allow specification diff --git a/src/pj_transform.c b/src/pj_transform.c index 85c782bb..a2411fd5 100644 --- a/src/pj_transform.c +++ b/src/pj_transform.c @@ -30,6 +30,11 @@ ****************************************************************************** * * $Log$ + * Revision 1.14 2004/11/05 06:05:11 fwarmerdam + * Fixed pj_geocentric_to_geodetic() to not try and process HUGE_VAL values + * (those that have failed some previous transform step). Related to bug:5B + * http://bugzilla.remotesensing.org/show_bug.cgi?id=642 + * * Revision 1.13 2004/10/25 15:34:36 fwarmerdam * make names of geodetic funcs from geotrans unique * @@ -341,8 +346,11 @@ int pj_geodetic_to_geocentric( double a, double es, { long io = i * point_offset; + if( x[io] == HUGE_VAL ) + continue; + if( pj_Convert_Geodetic_To_Geocentric( y[io], x[io], z[io], - x+io, y+io, z+io ) != 0 ) + x+io, y+io, z+io ) != 0 ) { pj_errno = PJD_ERR_GEOCENTRIC; return PJD_ERR_GEOCENTRIC; |