From 812c666a90f48933e75bf9556f8cb0b7b0398488 Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Thu, 9 Jun 2011 14:25:33 +0000 Subject: fix for +axis validation (#87) git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2049 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- ChangeLog | 6 +++++- src/pj_init.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dbb5502d..06d1a531 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ +2011-06-09 Frank Warmerdam + + * src/pj_init.c: fix for +axis validation (#87) + 2011-05-31 Frank Warmerdam - * src/PJ_igh.c: use pj_dalloc() instead of free() in FREEUP (#112). + * src/PJ_igh.c: use project free instead of free() in FREEUP (#112). * src/projects.h: memset PJ structure to zeros after allocation to avoid problems getting everything initialized properly (#112). diff --git a/src/pj_init.c b/src/pj_init.c index 5058fd39..8d52debd 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -345,7 +345,7 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) { if( strchr( axis_legal, axis_arg[0] ) == NULL || strchr( axis_legal, axis_arg[1] ) == NULL - || (axis_arg[2] && strchr( axis_legal, axis_arg[1] ) == NULL)) + || strchr( axis_legal, axis_arg[2] ) == NULL) { pj_ctx_set_errno( ctx, PJD_ERR_AXIS ); goto bum_call; -- cgit v1.2.3