71 |
|
int i; |
72 |
|
|
73 |
|
if (dofilter) { |
74 |
< |
if (fname == NULL) |
75 |
< |
fname = ""; |
76 |
< |
sprintf(buf, FILTER, fname); |
74 |
> |
if (fname == NULL) { |
75 |
> |
sprintf(buf, FILTER, ""); |
76 |
> |
fname = "<stdin>"; |
77 |
> |
} else |
78 |
> |
sprintf(buf, FILTER, fname); |
79 |
|
if ((input = popen(buf, "r")) == NULL) { |
80 |
|
fprintf(stderr, "Cannot execute: %s\n", buf); |
81 |
|
return(-1); |
82 |
|
} |
81 |
– |
fname = buf; |
83 |
|
} else if (fname == NULL) { |
84 |
|
input = stdin; |
85 |
|
fname = "<stdin>"; |
97 |
|
fprintf(stderr, "%s: bad picture size\n", fname); |
98 |
|
return(-1); |
99 |
|
} |
100 |
< |
if (xres > NCOLS || yres > NROWS) { |
100 |
> |
if (xres > NCOLS) { |
101 |
|
fprintf(stderr, "%s: resolution mismatch\n", fname); |
102 |
|
return(-1); |
103 |
|
} |