--- ray/src/px/pcomb.c 2005/01/24 19:29:39 2.35 +++ ray/src/px/pcomb.c 2005/03/01 23:16:42 2.37 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: pcomb.c,v 2.35 2005/01/24 19:29:39 greg Exp $"; +static const char RCSid[] = "$Id: pcomb.c,v 2.37 2005/03/01 23:16:42 greg Exp $"; #endif /* * Combine picture files according to calcomp functions. @@ -439,11 +439,8 @@ advance(void) /* read in data for next scanline */ eputs(": read error\n"); quit(1); } - if (fabs(colval(input[i].coef,RED)-1.0) > 1e-3 || - fabs(colval(input[i].coef,GRN)-1.0) > 1e-3 || - fabs(colval(input[i].coef,BLU)-1.0) > 1e-3) - for (j = 0; j < xmax; j++) /* adjust color */ - multcolor(st[j], input[i].coef); + for (j = 0; j < xmax; j++) /* adjust color */ + multcolor(st[j], input[i].coef); } } @@ -601,7 +598,7 @@ l_psize(char *nm) /* compute pixel size in steradians if (input[fn].vw.type == 0) errno = EDOM; else if (input[fn].vw.type != VT_PAR && - funvalue(vray[6], 1, &d) > FTINY) { + funvalue(vray[6], 1, &d) >= -FTINY) { for (i = 0; i < 3; i++) dir0[i] = funvalue(vray[3+i], 1, &d); pix2loc(locx, &input[fn].rs, xscan+1, ymax-1-yscan);