--- ray/src/px/oki20c.c 1992/04/11 16:31:32 2.5 +++ ray/src/px/oki20c.c 1992/07/03 08:59:26 2.7 @@ -71,14 +71,15 @@ char *fname; int i; if (dofilter) { - if (fname == NULL) - fname = ""; - sprintf(buf, FILTER, fname); + if (fname == NULL) { + sprintf(buf, FILTER, ""); + fname = ""; + } else + sprintf(buf, FILTER, fname); if ((input = popen(buf, "r")) == NULL) { fprintf(stderr, "Cannot execute: %s\n", buf); return(-1); } - fname = buf; } else if (fname == NULL) { input = stdin; fname = ""; @@ -96,7 +97,7 @@ char *fname; fprintf(stderr, "%s: bad picture size\n", fname); return(-1); } - if (xres > NCOLS || yres > NROWS) { + if (xres > NCOLS) { fprintf(stderr, "%s: resolution mismatch\n", fname); return(-1); }