| 184 |
|
sop = (STREAMOUT *)malloc(sizeof(STREAMOUT)); |
| 185 |
|
if (sop == NULL) |
| 186 |
|
error(SYSTEM, "out of memory in getostream"); |
| 187 |
< |
sop->outpipe = oname[0] == '!'; |
| 187 |
> |
sop->outpipe = (oname[0] == '!'); |
| 188 |
|
sop->reclen = 0; |
| 189 |
|
sop->ofp = NULL; /* open iff noopen==0 */ |
| 190 |
|
sop->xr = xres; sop->yr = yres; |
| 194 |
|
errno = EEXIST; /* file exists */ |
| 195 |
|
goto openerr; |
| 196 |
|
} |
| 197 |
+ |
} else if (noopen && outfmt == 'c' && /* stream exists to picture? */ |
| 198 |
+ |
(sop->xr > 0) & (sop->yr > 0)) { |
| 199 |
+ |
if (ofl & OF_BIN) |
| 200 |
+ |
return(NULL); /* let caller offset bins */ |
| 201 |
+ |
sprintf(errmsg, "output '%s' not a valid picture", oname); |
| 202 |
+ |
error(WARNING, errmsg); |
| 203 |
|
} |
| 204 |
|
if (!noopen && sop->ofp == NULL) { /* open output stream */ |
| 205 |
|
if (oname[0] == '!') /* output to command */ |
| 268 |
|
} |
| 269 |
|
break; |
| 270 |
|
case 'f': /* binary float */ |
| 271 |
< |
if (fread((char *)vf, sizeof(float), 3, stdin) != 3) |
| 271 |
> |
if (getbinary((char *)vf, sizeof(float), 3, stdin) != 3) |
| 272 |
|
return(-1); |
| 273 |
|
VCOPY(vec, vf); |
| 274 |
|
break; |
| 275 |
|
case 'd': /* binary double */ |
| 276 |
< |
if (fread((char *)vd, sizeof(double), 3, stdin) != 3) |
| 276 |
> |
if (getbinary((char *)vd, sizeof(double), 3, stdin) != 3) |
| 277 |
|
return(-1); |
| 278 |
|
VCOPY(vec, vd); |
| 279 |
|
break; |
| 309 |
|
scalecolor(fv, sf); |
| 310 |
|
} else |
| 311 |
|
copycolor(fv, cnt); |
| 312 |
< |
fwrite(fv, sizeof(float), 3, fout); |
| 312 |
> |
putbinary(fv, sizeof(float), 3, fout); |
| 313 |
|
break; |
| 314 |
|
case 'd': |
| 315 |
|
if (accumulate > 1) { |
| 316 |
|
DCOLOR dv; |
| 317 |
|
copycolor(dv, cnt); |
| 318 |
|
scalecolor(dv, sf); |
| 319 |
< |
fwrite(dv, sizeof(double), 3, fout); |
| 319 |
> |
putbinary(dv, sizeof(double), 3, fout); |
| 320 |
|
} else |
| 321 |
< |
fwrite(cnt, sizeof(double), 3, fout); |
| 321 |
> |
putbinary(cnt, sizeof(double), 3, fout); |
| 322 |
|
break; |
| 323 |
|
case 'c': |
| 324 |
|
if (accumulate > 1) |
| 325 |
|
setcolr(cv, sf*cnt[0], sf*cnt[1], sf*cnt[2]); |
| 326 |
|
else |
| 327 |
|
setcolr(cv, cnt[0], cnt[1], cnt[2]); |
| 328 |
< |
fwrite(cv, sizeof(cv), 1, fout); |
| 328 |
> |
putbinary(cv, sizeof(cv), 1, fout); |
| 329 |
|
break; |
| 330 |
|
default: |
| 331 |
|
error(INTERNAL, "botched output format"); |
| 337 |
|
void |
| 338 |
|
mod_output(MODCONT *mp) |
| 339 |
|
{ |
| 340 |
< |
STREAMOUT *sop = getostream(mp->outspec, mp->modname, 0, 0); |
| 340 |
> |
STREAMOUT *sop = getostream(mp->outspec, mp->modname, mp->bin0, 0); |
| 341 |
|
int j; |
| 342 |
|
|
| 343 |
|
put_contrib(mp->cbin[0], sop->ofp); |
| 344 |
|
if (mp->nbins > 3 && /* minor optimization */ |
| 345 |
< |
sop == getostream(mp->outspec, mp->modname, 1, 0)) { |
| 345 |
> |
sop == getostream(mp->outspec, mp->modname, mp->bin0+1, 0)) { |
| 346 |
|
for (j = 1; j < mp->nbins; j++) |
| 347 |
|
put_contrib(mp->cbin[j], sop->ofp); |
| 348 |
|
} else { |
| 349 |
|
for (j = 1; j < mp->nbins; j++) { |
| 350 |
< |
sop = getostream(mp->outspec, mp->modname, j, 0); |
| 350 |
> |
sop = getostream(mp->outspec, mp->modname, mp->bin0+j, 0); |
| 351 |
|
put_contrib(mp->cbin[j], sop->ofp); |
| 352 |
|
} |
| 353 |
|
} |
| 400 |
|
case 'a': |
| 401 |
|
return(fscanf(finp,"%lf %lf %lf",&cnt[0],&cnt[1],&cnt[2]) == 3); |
| 402 |
|
case 'f': |
| 403 |
< |
if (fread(fv, sizeof(fv[0]), 3, finp) != 3) |
| 403 |
> |
if (getbinary(fv, sizeof(fv[0]), 3, finp) != 3) |
| 404 |
|
return(0); |
| 405 |
|
copycolor(cnt, fv); |
| 406 |
|
return(1); |
| 407 |
|
case 'd': |
| 408 |
< |
return(fread(cnt, sizeof(cnt[0]), 3, finp) == 3); |
| 408 |
> |
return(getbinary(cnt, sizeof(cnt[0]), 3, finp) == 3); |
| 409 |
|
case 'c': |
| 410 |
< |
if (fread(cv, sizeof(cv), 1, finp) != 1) |
| 410 |
> |
if (getbinary(cv, sizeof(cv), 1, finp) != 1) |
| 411 |
|
return(0); |
| 412 |
|
colr_color(fv, cv); |
| 413 |
|
copycolor(cnt, fv); |
