diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2004-09-08 15:23:37 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2004-09-08 15:23:37 +0000 |
| commit | 92489e4408d4aa0a4a145e389687a4587766973a (patch) | |
| tree | b489a1a34e648a08f84b69c0e34c1b6be662c7aa | |
| parent | 531b737b6dac86fbc1c7f9b7353b88ff326e931f (diff) | |
| download | PROJ-92489e4408d4aa0a4a145e389687a4587766973a.tar.gz PROJ-92489e4408d4aa0a4a145e389687a4587766973a.zip | |
added new error for unknown prime meridians
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1221 4e78687f-474d-0410-85f9-8d5e500ac6b2
| -rw-r--r-- | src/pj_init.c | 7 | ||||
| -rw-r--r-- | src/pj_strerrno.c | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/pj_init.c b/src/pj_init.c index 04dfa9a5..489a6b82 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -30,6 +30,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.16 2004/09/08 15:23:37 warmerda + * added new error for unknown prime meridians + * * Revision 1.15 2004/05/05 01:45:41 warmerda * Made sword even longer. * @@ -347,11 +350,11 @@ pj_init(int argc, char **argv) { } if( value == NULL - && dmstor(name,&next_str) != 0.0 + && (dmstor(name,&next_str) != 0.0 || *name == '0') && *next_str == '\0' ) value = name; - if (!value) { pj_errno = -7; goto bum_call; } + if (!value) { pj_errno = -46; goto bum_call; } PIN->from_greenwich = dmstor(value,NULL); } else diff --git a/src/pj_strerrno.c b/src/pj_strerrno.c index a64fa9e3..03191d77 100644 --- a/src/pj_strerrno.c +++ b/src/pj_strerrno.c @@ -53,6 +53,7 @@ pj_err_list[] = { "lat_0 is pi/2 from mean lat", /* -43 */ "unparseable coordinate system definition", /* -44 */ "geocentric transformation missing z or ellps", /* -45 */ + "unknown prime meridian conversion id", /* -46 */ }; char * pj_strerrno(int err) { |