| 8 |
|
|
| 9 |
|
#include "rcontrib.h" |
| 10 |
|
#include "resolu.h" |
| 11 |
< |
#include "platform.h" |
| 11 |
> |
#include <ctype.h> |
| 12 |
|
|
| 13 |
|
/* Close output stream and free record */ |
| 14 |
|
static void |
| 112 |
|
printargs(gargc-1, gargv, fout); /* add our command */ |
| 113 |
|
fprintf(fout, "SOFTWARE= %s\n", VersionID); |
| 114 |
|
fputnow(fout); |
| 115 |
+ |
fputs("NCOMP=3\n", fout); /* always RGB */ |
| 116 |
|
if (info != NULL) /* add extra info if given */ |
| 117 |
|
fputs(info, fout); |
| 118 |
|
fputformat(formstr(outfmt), fout); |
| 133 |
|
STREAMOUT * |
| 134 |
|
getostream(const char *ospec, const char *mname, int bn, int noopen) |
| 135 |
|
{ |
| 135 |
– |
/* static const DCOLOR nocontrib = BLKCOLOR; */ |
| 136 |
|
static STREAMOUT stdos; |
| 137 |
+ |
char info[1024]; |
| 138 |
|
int ofl; |
| 139 |
|
char oname[1024]; |
| 140 |
|
LUENT *lep; |
| 141 |
|
STREAMOUT *sop; |
| 142 |
+ |
char *cp; |
| 143 |
|
|
| 144 |
|
if (ospec == NULL) { /* use stdout? */ |
| 145 |
|
if (!noopen & !using_stdout) { |
| 146 |
|
if (outfmt != 'a') |
| 147 |
|
SET_FILE_BINARY(stdout); |
| 148 |
< |
if (header) |
| 149 |
< |
printheader(stdout, NULL); |
| 150 |
< |
printresolu(stdout, xres, yres); |
| 148 |
> |
if (header) { |
| 149 |
> |
cp = info; |
| 150 |
> |
if (yres > 0) { |
| 151 |
> |
sprintf(cp, "NROWS=%d\n", yres * |
| 152 |
> |
(xres + !xres) ); |
| 153 |
> |
while (*cp) ++cp; |
| 154 |
> |
} |
| 155 |
> |
if ((xres <= 0) | (stdos.reclen > 1)) |
| 156 |
> |
sprintf(cp, "NCOLS=%d\n", stdos.reclen); |
| 157 |
> |
printheader(stdout, info); |
| 158 |
> |
} |
| 159 |
> |
if (stdos.reclen == 1) |
| 160 |
> |
printresolu(stdout, xres, yres); |
| 161 |
|
if (waitflush > 0) |
| 162 |
|
fflush(stdout); |
| 163 |
|
stdos.xr = xres; stdos.yr = yres; |
| 164 |
< |
#ifdef getc_unlocked |
| 164 |
> |
#if 0 |
| 165 |
|
flockfile(stdout); /* avoid lock/unlock overhead */ |
| 166 |
|
#endif |
| 167 |
|
using_stdout = 1; |
| 195 |
|
} |
| 196 |
|
} |
| 197 |
|
if (!noopen && sop->ofp == NULL) { /* open output stream */ |
| 186 |
– |
long i; |
| 198 |
|
if (oname[0] == '!') /* output to command */ |
| 199 |
|
sop->ofp = popen(oname+1, "w"); |
| 200 |
|
else /* else open file */ |
| 203 |
|
goto openerr; |
| 204 |
|
if (outfmt != 'a') |
| 205 |
|
SET_FILE_BINARY(sop->ofp); |
| 206 |
< |
#ifdef getc_unlocked |
| 206 |
> |
#if 0 |
| 207 |
|
flockfile(sop->ofp); /* avoid lock/unlock overhead */ |
| 208 |
|
#endif |
| 209 |
+ |
if (accumulate > 0) { /* global resolution */ |
| 210 |
+ |
sop->xr = xres; sop->yr = yres; |
| 211 |
+ |
} |
| 212 |
|
if (header) { |
| 213 |
< |
char info[512]; |
| 200 |
< |
char *cp = info; |
| 213 |
> |
cp = info; |
| 214 |
|
if (ofl & OF_MODIFIER || sop->reclen == 1) { |
| 215 |
|
sprintf(cp, "MODIFIER=%s\n", mname); |
| 216 |
|
while (*cp) ++cp; |
| 219 |
|
sprintf(cp, "BIN=%d\n", bn); |
| 220 |
|
while (*cp) ++cp; |
| 221 |
|
} |
| 222 |
< |
*cp = '\0'; |
| 222 |
> |
if (sop->yr > 0) { |
| 223 |
> |
sprintf(cp, "NROWS=%d\n", sop->yr * |
| 224 |
> |
(sop->xr + !sop->xr) ); |
| 225 |
> |
while (*cp) ++cp; |
| 226 |
> |
} |
| 227 |
> |
if ((sop->xr <= 0) | (sop->reclen > 1)) |
| 228 |
> |
sprintf(cp, "NCOLS=%d\n", sop->reclen); |
| 229 |
|
printheader(sop->ofp, info); |
| 230 |
|
} |
| 231 |
< |
if (accumulate > 0) { /* global resolution */ |
| 232 |
< |
sop->xr = xres; sop->yr = yres; |
| 214 |
< |
} |
| 215 |
< |
printresolu(sop->ofp, sop->xr, sop->yr); |
| 216 |
< |
#if 0 |
| 217 |
< |
/* play catch-up */ |
| 218 |
< |
for (i = accumulate > 0 ? lastdone/accumulate : 0; i--; ) { |
| 219 |
< |
int j = sop->reclen; |
| 220 |
< |
if (j <= 0) j = 1; |
| 221 |
< |
while (j--) |
| 222 |
< |
put_contrib(nocontrib, sop->ofp); |
| 223 |
< |
if (outfmt == 'a') |
| 224 |
< |
putc('\n', sop->ofp); |
| 225 |
< |
} |
| 226 |
< |
#endif |
| 231 |
> |
if (sop->reclen == 1) |
| 232 |
> |
printresolu(sop->ofp, sop->xr, sop->yr); |
| 233 |
|
if (waitflush > 0) |
| 234 |
|
fflush(sop->ofp); |
| 235 |
|
} |
| 370 |
|
end_record() |
| 371 |
|
{ |
| 372 |
|
--waitflush; |
| 373 |
< |
lu_doall(&ofiletab, puteol, NULL); |
| 373 |
> |
lu_doall(&ofiletab, &puteol, NULL); |
| 374 |
|
if (using_stdout & (outfmt == 'a')) |
| 375 |
|
putc('\n', stdout); |
| 376 |
|
if (!waitflush) { |
| 474 |
|
error(WARNING, errmsg); |
| 475 |
|
break; |
| 476 |
|
} |
| 477 |
< |
#ifdef getc_unlocked |
| 477 |
> |
#if 0 |
| 478 |
|
flockfile(sout.ofp); |
| 479 |
|
#endif |
| 480 |
|
if (header && checkheader(sout.ofp, outvfmt, NULL) != 1) { |
| 520 |
|
*(STREAMOUT *)oent->data = sout; |
| 521 |
|
} |
| 522 |
|
} |
| 523 |
< |
lu_doall(&ofiletab, myclose, NULL); /* close all files */ |
| 523 |
> |
lu_doall(&ofiletab, &myclose, NULL); /* close all files */ |
| 524 |
|
} |
| 525 |
|
|
| 526 |
|
|
| 676 |
|
} |
| 677 |
|
/* seek on all files */ |
| 678 |
|
nvals = lastout * outvsiz; |
| 679 |
< |
lu_doall(&ofiletab, myseeko, &nvals); |
| 679 |
> |
lu_doall(&ofiletab, &myseeko, &nvals); |
| 680 |
|
/* skip repeated input */ |
| 681 |
|
lastout *= accumulate; |
| 682 |
|
for (nvals = 0; nvals < lastout; nvals++) { |
