--- ray/src/common/image.c 2004/01/01 19:47:05 2.25 +++ ray/src/common/image.c 2004/02/12 18:55:50 2.27 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: image.c,v 2.25 2004/01/01 19:47:05 greg Exp $"; +static const char RCSid[] = "$Id: image.c,v 2.27 2004/02/12 18:55:50 greg Exp $"; #endif /* * image.c - routines for image generation. @@ -10,6 +10,7 @@ static const char RCSid[] = "$Id: image.c,v 2.25 2004/ #include "copyright.h" #include "rtio.h" +#include "paths.h" #include "view.h" @@ -19,7 +20,9 @@ static const char RCSid[] = "$Id: image.c,v 2.25 2004/ VIEW stdview = STDVIEW; /* default view parameters */ +static gethfunc gethview; + char * setview(v) /* set hvec and vvec, return message on error */ register VIEW *v; @@ -522,12 +525,13 @@ struct myview { static int -gethview(s, v) /* get view from header */ -char *s; -register struct myview *v; +gethview( /* get view from header */ + char *s, + void *v +) { - if (isview(s) && sscanview(v->hv, s) > 0) - v->ok++; + if (isview(s) && sscanview(((struct myview*)v)->hv, s) > 0) + ((struct myview*)v)->ok++; return(0); } @@ -549,7 +553,7 @@ RESOLU *rp; mvs.hv = vp; mvs.ok = 0; - getheader(fp, (int (*)(char *, char *))&gethview, (char *)&mvs); + getheader(fp, gethview, &mvs); if (rp != NULL && !fgetsresolu(rp, fp)) mvs.ok = 0;