--- ray/src/px/pinterp.c 1992/03/23 16:50:26 2.3 +++ ray/src/px/pinterp.c 1992/05/26 15:23:09 2.6 @@ -34,7 +34,7 @@ static char SCCSid[] = "$SunId$ LBL"; #define PACKSIZ 256 /* max. calculation packet size */ -#define RTCOM "rtrace -h- -ovl -fff" +#define RTCOM "rtrace -h- -ovl -fff " #define ABS(x) ((x)>0?(x):-(x)) @@ -161,7 +161,9 @@ char *argv[]; vresolu = atoi(argv[++i]); break; case 'p': /* pixel aspect */ - check(2,"f"); + if (argv[i][2] != 'a') + goto badopt; + check(3,"f"); pixaspect = atof(argv[++i]); break; case 'v': /* view file */ @@ -243,8 +245,6 @@ userr: headline(s) /* process header string */ char *s; { - static char *altname[] = {VIEWSTR,"rpict","rview","pinterp",NULL}; - register char **an; char fmt[32]; if (isformat(s)) { @@ -259,12 +259,8 @@ char *s; theirexp *= exposval(s); return; } - for (an = altname; *an != NULL; an++) - if (!strncmp(*an, s, strlen(*an))) { - if (sscanview(&theirview, s+strlen(*an)) > 0) - gotview++; - break; - } + if (isview(s) && sscanview(&theirview, s) > 0) + gotview++; }