--- ray/src/px/pcomb.c 1993/04/29 14:32:07 2.10 +++ ray/src/px/pcomb.c 1993/06/14 15:59:46 2.13 @@ -21,8 +21,8 @@ static char SCCSid[] = "$SunId$ LBL"; #include "view.h" #define MAXINP 32 /* maximum number of input files */ -#define WINSIZ 9 /* scanline window size */ -#define MIDSCN 4 /* current scan position */ +#define WINSIZ 17 /* scanline window size */ +#define MIDSCN ((WINSIZ-1)/2+1) struct { char *name; /* file or command name */ @@ -484,9 +484,9 @@ register char *nam; lorg[fn][0] = lorg[fn][1] = lorg[fn][2] = 0.0; ldir[fn][0] = ldir[fn][1] = ldir[fn][2] = 0.0; if (input[fn].vw.type == 0) - errno = ERANGE; + errno = EDOM; else { - pix2loc(loc, &input[fn].rs, xpos, ypos); + pix2loc(loc, &input[fn].rs, xscan, ymax-1-yscan); if (viewray(lorg[fn], ldir[fn], &input[fn].vw, loc[0], loc[1]) < 0) errno = ERANGE;