diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-03-11 22:28:47 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-03-11 22:28:47 +0100 |
| commit | 79fa26dcf4cccc16ab95f46ac3f7f6e87767680c (patch) | |
| tree | 18027c321e76e51529c7623e7eb7e48a7043a949 /src/pj_inv.c | |
| parent | cf3066e1967d54148756c65a813abd0e935f7ba9 (diff) | |
| download | PROJ-79fa26dcf4cccc16ab95f46ac3f7f6e87767680c.tar.gz PROJ-79fa26dcf4cccc16ab95f46ac3f7f6e87767680c.zip | |
Make sure that transient errors are returned correctly
The prepare/finalize steps in pj_fwd*/pj_inv* now checks the error level
of the PJ object before returning the coordinate. If an error is
detected proj_coord_error() is returned.
Diffstat (limited to 'src/pj_inv.c')
| -rw-r--r-- | src/pj_inv.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/pj_inv.c b/src/pj_inv.c index 1e84ff30..f9f11f56 100644 --- a/src/pj_inv.c +++ b/src/pj_inv.c @@ -198,6 +198,12 @@ LP pj_inv(XY xy, PJ *P) { if (!P->skip_inv_finalize) coo = inv_finalize (P, coo); + + if (proj_errno(P)) { + proj_errno_reset(P); + return proj_coord_error().lp; + } + return coo.lp; } @@ -228,6 +234,12 @@ LPZ pj_inv3d (XYZ xyz, PJ *P) { if (!P->skip_inv_finalize) coo = inv_finalize (P, coo); + + if (proj_errno(P)) { + proj_errno_reset(P); + return proj_coord_error().lpz; + } + return coo.lpz; } @@ -255,5 +267,11 @@ PJ_COORD pj_inv4d (PJ_COORD coo, PJ *P) { if (!P->skip_inv_finalize) coo = inv_finalize (P, coo); + + if (proj_errno(P)) { + proj_errno_reset(P); + return proj_coord_error(); + } + return coo; } |
