aboutsummaryrefslogtreecommitdiff
path: root/src/gie.c
diff options
context:
space:
mode:
authorThomas Knudsen <busstoptaktik@users.noreply.github.com>2017-11-25 01:40:37 +0100
committerGitHub <noreply@github.com>2017-11-25 01:40:37 +0100
commitbea0c8b0c015ef0a5c136b904d63ad7f4a4427bf (patch)
tree6ba55090efcbb1f0f3223e9eede71016b13d65c0 /src/gie.c
parenta7a2c3d62570cf78c95650586ce36b522128892b (diff)
downloadPROJ-bea0c8b0c015ef0a5c136b904d63ad7f4a4427bf.tar.gz
PROJ-bea0c8b0c015ef0a5c136b904d63ad7f4a4427bf.zip
Overhaul ellipsoid handling (#682)
Improve error messaging for cct and gie, and do some clean ups in the ellipsoid handling - partially to squash bugs, partially to improve naming consistency which, in turn, improves the readability of the ellipsoid handling code. Renamed functions: pj_inherit_ellipsoid_defs has been renamed pj_inherit_ellipsoid_def, while pj_calc_ellps_params has been renamed pj_calc_ellipsoid_params. The code in get_opt (part of pj_init.c), which handles whether or not an ellipsoid definition should be dragged in from proj_def.dat, has been rewritten. I suspect this was buggy beforehand, and at least the new code is easier to follow (although it may be slightly slower, which is not really a problem as it sits in the setup code, and hence is executed only once).
Diffstat (limited to 'src/gie.c')
-rw-r--r--src/gie.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gie.c b/src/gie.c
index ac738926..9553cbe3 100644
--- a/src/gie.c
+++ b/src/gie.c
@@ -662,7 +662,8 @@ static int expect (char *args) {
if (0==T.P && !expect_failure) {
banner (T.operation);
- errmsg(3, "%sInvalid operation definition in line no. %d\n", delim, (int) T.operation_lineno);
+ errmsg(3, "%sInvalid operation definition in line no. %d: %s\n",
+ delim, (int) T.operation_lineno, pj_strerrno(proj_errno(T.P)));
return another_failure ();
}