--- ray/src/common/image.c 2003/08/26 04:24:26 2.19 +++ ray/src/common/image.c 2004/01/01 19:31:45 2.24 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: image.c,v 2.19 2003/08/26 04:24:26 greg Exp $"; +static const char RCSid[] = "$Id: image.c,v 2.24 2004/01/01 19:31:45 greg Exp $"; #endif /* * image.c - routines for image generation. @@ -9,11 +9,9 @@ static const char RCSid[] = "$Id: image.c,v 2.19 2003/ #include "copyright.h" -#include "standard.h" - +#include "rtio.h" #include "view.h" -#include "paths.h" #define FEQ(x,y) (fabs((x)-(y)) <= FTINY) #define VEQ(v,w) (FEQ((v)[0],(w)[0]) && FEQ((v)[1],(w)[1]) \ @@ -394,12 +392,15 @@ register char *s; int na; int nvopts = 0; - while (*s && *s != ' ') + while (*s == ' ') s++; + if (*s != '-') + s = sskip2(s,1); while (*s) { ac = 0; do { - av[ac++] = s; + if (ac || *s == '-') + av[ac++] = s; while (*s && *s != ' ') s++; while (*s == ' ') @@ -489,7 +490,7 @@ int isview(s) /* is this a view string? */ char *s; { - static char *altname[]={NULL,VIEWSTR,"rpict","rview","pinterp",NULL}; + static char *altname[]={NULL,VIEWSTR,"rpict","rvu","rpiece","pinterp",NULL}; extern char *progname; register char *cp; register char **an;