diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-03-12 13:38:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 13:38:03 +0100 |
| commit | d422d4547a1e99ecdedc3bde146ab3c304bc5c6a (patch) | |
| tree | 3a556f186a77c1fdce10bc972556348fa7964a9b /src | |
| parent | a5ee6c5543aa0d81f37adafc0efc7bffec476e5c (diff) | |
| parent | 22203cc0677f7f60fd81f719125c3c1768e498ac (diff) | |
| download | PROJ-d422d4547a1e99ecdedc3bde146ab3c304bc5c6a.tar.gz PROJ-d422d4547a1e99ecdedc3bde146ab3c304bc5c6a.zip | |
Merge pull request #857 from kbevers/return-error-instead-of-zeros
Make sure that transient errors are returned correctly
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_fwd.c | 25 | ||||
| -rw-r--r-- | src/pj_inv.c | 25 |
2 files changed, 44 insertions, 6 deletions
diff --git a/src/pj_fwd.c b/src/pj_fwd.c index b2e6afd5..ef05962d 100644 --- a/src/pj_fwd.c +++ b/src/pj_fwd.c @@ -174,11 +174,22 @@ static PJ_COORD fwd_finalize (PJ *P, PJ_COORD coo) { } +static PJ_COORD error_or_coord(PJ *P, PJ_COORD coord, int last_errno) { + if (proj_errno(P)) + return proj_coord_error(); + + proj_errno_restore(P, last_errno); + return coord; +} + XY pj_fwd(LP lp, PJ *P) { + int last_errno; PJ_COORD coo = {{0,0,0,0}}; coo.lp = lp; + last_errno = proj_errno_reset(P); + if (!P->skip_fwd_prepare) coo = fwd_prepare (P, coo); if (HUGE_VAL==coo.v[0]) @@ -200,15 +211,19 @@ XY pj_fwd(LP lp, PJ *P) { if (!P->skip_fwd_finalize) coo = fwd_finalize (P, coo); - return coo.xy; + + return error_or_coord(P, coo, last_errno).xy; } XYZ pj_fwd3d(LPZ lpz, PJ *P) { + int last_errno; PJ_COORD coo = {{0,0,0,0}}; coo.lpz = lpz; + last_errno = proj_errno_reset(P); + if (!P->skip_fwd_prepare) coo = fwd_prepare (P, coo); if (HUGE_VAL==coo.v[0]) @@ -230,12 +245,15 @@ XYZ pj_fwd3d(LPZ lpz, PJ *P) { if (!P->skip_fwd_finalize) coo = fwd_finalize (P, coo); - return coo.xyz; + + return error_or_coord(P, coo, last_errno).xyz; } PJ_COORD pj_fwd4d (PJ_COORD coo, PJ *P) { + int last_errno = proj_errno_reset(P); + if (!P->skip_fwd_prepare) coo = fwd_prepare (P, coo); if (HUGE_VAL==coo.v[0]) @@ -257,5 +275,6 @@ PJ_COORD pj_fwd4d (PJ_COORD coo, PJ *P) { if (!P->skip_fwd_finalize) coo = fwd_finalize (P, coo); - return coo; + + return error_or_coord(P, coo, last_errno); } diff --git a/src/pj_inv.c b/src/pj_inv.c index 1e84ff30..4c2266fb 100644 --- a/src/pj_inv.c +++ b/src/pj_inv.c @@ -172,11 +172,22 @@ static PJ_COORD inv_finalize (PJ *P, PJ_COORD coo) { } +static PJ_COORD error_or_coord(PJ *P, PJ_COORD coord, int last_errno) { + if (proj_errno(P)) + return proj_coord_error(); + + proj_errno_restore(P, last_errno); + return coord; +} + LP pj_inv(XY xy, PJ *P) { + int last_errno; PJ_COORD coo = {{0,0,0,0}}; coo.xy = xy; + last_errno = proj_errno_reset(P); + if (!P->skip_inv_prepare) coo = inv_prepare (P, coo); if (HUGE_VAL==coo.v[0]) @@ -198,15 +209,19 @@ LP pj_inv(XY xy, PJ *P) { if (!P->skip_inv_finalize) coo = inv_finalize (P, coo); - return coo.lp; + + return error_or_coord(P, coo, last_errno).lp; } LPZ pj_inv3d (XYZ xyz, PJ *P) { + int last_errno; PJ_COORD coo = {{0,0,0,0}}; coo.xyz = xyz; + last_errno = proj_errno_reset(P); + if (!P->skip_inv_prepare) coo = inv_prepare (P, coo); if (HUGE_VAL==coo.v[0]) @@ -228,12 +243,15 @@ LPZ pj_inv3d (XYZ xyz, PJ *P) { if (!P->skip_inv_finalize) coo = inv_finalize (P, coo); - return coo.lpz; + + return error_or_coord(P, coo, last_errno).lpz; } PJ_COORD pj_inv4d (PJ_COORD coo, PJ *P) { + int last_errno = proj_errno_reset(P); + if (!P->skip_inv_prepare) coo = inv_prepare (P, coo); if (HUGE_VAL==coo.v[0]) @@ -255,5 +273,6 @@ PJ_COORD pj_inv4d (PJ_COORD coo, PJ *P) { if (!P->skip_inv_finalize) coo = inv_finalize (P, coo); - return coo; + + return error_or_coord(P, coo, last_errno); } |