--- ray/src/px/pcond.c 2004/11/14 22:19:50 3.23 +++ ray/src/px/pcond.c 2014/10/20 13:42:13 3.25 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: pcond.c,v 3.23 2004/11/14 22:19:50 greg Exp $"; +static const char RCSid[] = "$Id: pcond.c,v 3.25 2014/10/20 13:42:13 greg Exp $"; #endif /* * Condition Radiance picture for display/output @@ -261,7 +261,7 @@ getahead(void) /* load picture header */ exit(1); } if (!gotview || ourview.type == VT_PAR || - ourview.horiz <= 5. | ourview.vert <= 5.) { + (ourview.horiz <= 5.) | (ourview.vert <= 5.)) { ourview = stdview; ourview.type = VT_PER; if (pixaspect*inpres.yr < inpres.xr) { @@ -344,6 +344,7 @@ getfovimg(void) /* load foveal sampled image */ sprintf(combuf, "pfilt -1 -b -pa 0 -x %d -y %d \"%s\"", fvxr, fvyr, infn); if ((fp = popen(combuf, "r")) == NULL) syserror("popen"); + SET_FILE_BINARY(fp); getheader(fp, NULL, NULL); /* skip header */ if (fgetresolu(&x, &y, fp) < 0 || (x != fvxr) | (y != fvyr)) goto readerr;