813 |
|
*cp = '\0'; |
814 |
|
printheader(sop->ofp, info); |
815 |
|
} |
816 |
+ |
if (!accumulate) { /* global res. for -c- */ |
817 |
+ |
sop->xr = xres; sop->yr = yres; |
818 |
+ |
} |
819 |
|
printresolu(sop->ofp, sop->xr, sop->yr); |
820 |
|
/* play catch-up */ |
821 |
|
for (i = accumulate ? 0 : lastdone; i--; ) { |
1286 |
|
} |
1287 |
|
if ((sout.xr > 0) & (sout.yr > 0) && |
1288 |
|
(!fscnresolu(&xr, &yr, sout.ofp) || |
1289 |
< |
xr != sout.xr || |
1290 |
< |
yr != sout.yr)) { |
1289 |
> |
(xr != sout.xr) | |
1290 |
> |
(yr != sout.yr))) { |
1291 |
|
sprintf(errmsg, "resolution mismatch for '%s'", |
1292 |
|
oname); |
1293 |
|
error(USER, errmsg); |
1303 |
|
if (!get_contrib(rgbv, sout.ofp)) { |
1304 |
|
if (!j) |
1305 |
|
break; /* ignore empty file */ |
1306 |
< |
if (j && j < mp->nbins) { |
1306 |
> |
if (j < mp->nbins) { |
1307 |
|
sprintf(errmsg, "missing data in '%s'", |
1308 |
|
oname); |
1309 |
|
error(USER, errmsg); |
1431 |
|
} |
1432 |
|
if ((xres > 0) & (yres > 0) && |
1433 |
|
(!fscnresolu(&xr, &yr, sout.ofp) || |
1434 |
< |
xr != xres || |
1435 |
< |
yr != yres)) { |
1434 |
> |
(xr != xres) | |
1435 |
> |
(yr != yres))) { |
1436 |
|
sprintf(errmsg, "resolution mismatch for '%s'", |
1437 |
|
oname); |
1438 |
|
error(USER, errmsg); |