--- ray/src/util/pictool.c 2016/07/14 17:32:12 2.3 +++ ray/src/util/pictool.c 2020/05/14 20:58:03 2.7 @@ -1,10 +1,10 @@ #ifndef lint -static const char RCSid[] = "$Id: pictool.c,v 2.3 2016/07/14 17:32:12 greg Exp $"; +static const char RCSid[] = "$Id: pictool.c,v 2.7 2020/05/14 20:58:03 greg Exp $"; #endif #include "pictool.h" #include "g3sphere.h" #include -#include +#include "rtio.h" #define index strchr @@ -217,8 +217,11 @@ gethinfo( /* get view from header */ ) { if(strstr(s, EXPOSSTR) != NULL && strstr(s, "\t") != NULL) { - fprintf(stderr,"error: header contains invalid exposure !!!!\n"); - fprintf(stderr,"check exposure and remove tab !\n"); + + fprintf(stderr,"error: header contains invalid exposure entry!!!!\n"); + fprintf(stderr,"check exposure and correct header setting !\n"); + + fprintf(stderr,"stopping !!!!\n"); exit(1); } @@ -686,8 +689,7 @@ int pict_locate(pict* p,FVECT pt,int* x,int* y) return 0; } - viewloc(pp,&(p->view),pt); - if (pp[2] < 0) + if (viewloc(pp,&(p->view),pt) != VL_GOOD) return 0; loc2pix(res,&(p->resol),pp[0],pp[1]); *x = res[0];