aboutsummaryrefslogtreecommitdiff
path: root/src/PJ_isea.c
diff options
context:
space:
mode:
authorKristian Evers <kristianevers@gmail.com>2017-07-17 23:10:09 +0200
committerKristian Evers <kristianevers@gmail.com>2017-07-18 11:47:20 +0200
commitad7a7c1b1d54c69b9df442797a809418d00d647d (patch)
treead9a4dd1bb9aa1fcbc17e82508ec0482d1d6d06d /src/PJ_isea.c
parent2ec0759b8cdd45deae8b9aba70ec7d23c7c3ddd8 (diff)
downloadPROJ-ad7a7c1b1d54c69b9df442797a809418d00d647d.tar.gz
PROJ-ad7a7c1b1d54c69b9df442797a809418d00d647d.zip
Expanded *_ERROR* macros.
Expanded *_ERROR* macros with calls to proj_errno_set() and proper returns when necessary. Defined a bunch of new PJD_ERR_ constants in projects.h that corresponds to the error numbers in pj_strerrno.c. A few unknown error numbers were replaced by existing ones in pj_strerrno.c.
Diffstat (limited to 'src/PJ_isea.c')
-rw-r--r--src/PJ_isea.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/PJ_isea.c b/src/PJ_isea.c
index 6bc6a66c..deaecb0f 100644
--- a/src/PJ_isea.c
+++ b/src/PJ_isea.c
@@ -1034,7 +1034,8 @@ isea_forward(struct isea_dgg *g, struct isea_geo *in)
*/
#define PJ_LIB__
-#include <projects.h>
+#include <proj.h>
+#include "projects.h"
PROJ_HEAD(isea, "Icosahedral Snyder Equal Area") "\n\tSph";
@@ -1099,7 +1100,8 @@ PJ *PROJECTION(isea) {
} else if (!strcmp(opt, "pole")) {
isea_orient_pole(&Q->dgg);
} else {
- E_ERROR(-34);
+ proj_errno_set(P, PJD_ERR_ELLIPSOID_USE_REQUIRED);
+ return freeup_new(P);
}
}
@@ -1138,7 +1140,8 @@ PJ *PROJECTION(isea) {
}
else {
/* TODO verify error code. Possibly eliminate magic */
- E_ERROR(-34);
+ proj_errno_set(P, PJD_ERR_ELLIPSOID_USE_REQUIRED);
+ return freeup_new(P);
}
}