8 |
|
*/ |
9 |
|
|
10 |
|
#include <ctype.h> |
11 |
+ |
#include "platform.h" |
12 |
|
#include "standard.h" |
13 |
|
#include "cmatrix.h" |
14 |
|
#include "platform.h" |
21 |
|
sum_images(const char *fspec, const CMATRIX *cv, FILE *fout) |
22 |
|
{ |
23 |
|
int myDT = DTfromHeader; |
24 |
< |
COLOR *scanline = NULL; |
24 |
> |
COLR *scanline = NULL; |
25 |
|
CMATRIX *pmat = NULL; |
26 |
|
int myXR=0, myYR=0; |
27 |
|
int i, y; |
30 |
|
error(INTERNAL, "expected vector in sum_images()"); |
31 |
|
for (i = 0; i < cv->nrows; i++) { |
32 |
|
const COLORV *scv = cv_lval(cv,i); |
33 |
+ |
int flat_file = 0; |
34 |
|
char fname[1024]; |
35 |
|
FILE *fp; |
36 |
+ |
long data_start; |
37 |
|
int dt, xr, yr; |
38 |
|
COLORV *psp; |
39 |
|
char *err; |
48 |
|
error(SYSTEM, errmsg); |
49 |
|
} |
50 |
|
dt = DTfromHeader; |
51 |
< |
if ((err = cm_getheader(&dt, NULL, NULL, fp)) != NULL) |
51 |
> |
if ((err = cm_getheader(&dt, NULL, NULL, NULL, NULL, fp)) != NULL) |
52 |
|
error(USER, err); |
53 |
|
if ((dt != DTrgbe) & (dt != DTxyze) || |
54 |
|
!fscnresolu(&xr, &yr, fp)) { |
58 |
|
if (myDT == DTfromHeader) { /* on first one */ |
59 |
|
myDT = dt; |
60 |
|
myXR = xr; myYR = yr; |
61 |
< |
scanline = (COLOR *)malloc(sizeof(COLOR)*myXR); |
61 |
> |
scanline = (COLR *)malloc(sizeof(COLR)*myXR); |
62 |
|
if (scanline == NULL) |
63 |
|
error(SYSTEM, "out of memory in sum_images()"); |
64 |
|
pmat = cm_alloc(myYR, myXR); |
65 |
|
memset(pmat->cmem, 0, sizeof(COLOR)*myXR*myYR); |
66 |
|
/* finish header */ |
67 |
< |
fputformat((char *)cm_fmt_id[myDT], fout); |
67 |
> |
fputformat(cm_fmt_id[myDT], fout); |
68 |
|
fputc('\n', fout); |
69 |
|
fflush(fout); |
70 |
|
} else if ((dt != myDT) | (xr != myXR) | (yr != myYR)) { |
72 |
|
fname); |
73 |
|
error(USER, errmsg); |
74 |
|
} |
75 |
+ |
/* flat file check */ |
76 |
+ |
if ((data_start = ftell(fp)) > 0 && fseek(fp, 0L, SEEK_END) == 0) { |
77 |
+ |
flat_file = (ftell(fp) == data_start + sizeof(COLR)*xr*yr); |
78 |
+ |
if (fseek(fp, data_start, SEEK_SET) < 0) { |
79 |
+ |
sprintf(errmsg, "cannot seek on picture '%s'", fname); |
80 |
+ |
error(SYSTEM, errmsg); |
81 |
+ |
} |
82 |
+ |
} |
83 |
|
psp = pmat->cmem; |
84 |
|
for (y = 0; y < yr; y++) { /* read it in */ |
85 |
+ |
COLOR col; |
86 |
|
int x; |
87 |
< |
if (freadscan(scanline, xr, fp) < 0) { |
87 |
> |
if (flat_file ? getbinary(scanline, sizeof(COLR), xr, fp) != xr : |
88 |
> |
freadcolrs(scanline, xr, fp) < 0) { |
89 |
|
sprintf(errmsg, "error reading picture '%s'", |
90 |
|
fname); |
91 |
|
error(SYSTEM, errmsg); |
92 |
|
} |
93 |
|
/* sum in scanline */ |
94 |
|
for (x = 0; x < xr; x++, psp += 3) { |
95 |
< |
multcolor(scanline[x], scv); |
96 |
< |
addcolor(psp, scanline[x]); |
95 |
> |
if (!scanline[x][EXP]) |
96 |
> |
continue; /* skip zeroes */ |
97 |
> |
colr_color(col, scanline[x]); |
98 |
> |
multcolor(col, scv); |
99 |
> |
addcolor(psp, col); |
100 |
|
} |
101 |
|
} |
102 |
|
fclose(fp); /* done this picture */ |
187 |
|
case 'a': |
188 |
|
outfmt = DTascii; |
189 |
|
break; |
190 |
+ |
case 'c': |
191 |
+ |
outfmt = DTrgbe; |
192 |
+ |
break; |
193 |
|
default: |
194 |
|
goto userr; |
195 |
|
} |
240 |
|
ofspec = NULL; /* only need to open once */ |
241 |
|
} |
242 |
|
if (hasNumberFormat(argv[a])) { /* generating image(s) */ |
243 |
+ |
if (outfmt != DTrgbe) { |
244 |
+ |
error(WARNING, "changing output type to -oc"); |
245 |
+ |
outfmt = DTrgbe; |
246 |
+ |
} |
247 |
|
if (ofspec == NULL) { |
248 |
|
SET_FILE_BINARY(ofp); |
249 |
|
newheader("RADIANCE", ofp); |
254 |
|
for (i = 0; i < nsteps; i++) { |
255 |
|
CMATRIX *cvec = cm_column(cmtx, i); |
256 |
|
if (ofspec != NULL) { |
257 |
< |
sprintf(fnbuf, ofspec, i+1); |
257 |
> |
sprintf(fnbuf, ofspec, i); |
258 |
|
if ((ofp = fopen(fnbuf, "wb")) == NULL) { |
259 |
|
fprintf(stderr, |
260 |
|
"%s: cannot open '%s' for output\n", |
265 |
|
printargs(argc, argv, ofp); |
266 |
|
fputnow(ofp); |
267 |
|
} |
268 |
< |
fprintf(ofp, "FRAME=%d\n", i+1); |
268 |
> |
fprintf(ofp, "FRAME=%d\n", i); |
269 |
|
if (!sum_images(argv[a], cvec, ofp)) |
270 |
|
return(1); |
271 |
|
if (ofspec != NULL) { |
289 |
|
const char *wtype = (outfmt==DTascii) ? "w" : "wb"; |
290 |
|
for (i = 0; i < nsteps; i++) { |
291 |
|
CMATRIX *rvec = cm_column(rmtx, i); |
292 |
< |
sprintf(fnbuf, ofspec, i+1); |
292 |
> |
sprintf(fnbuf, ofspec, i); |
293 |
|
if ((ofp = fopen(fnbuf, wtype)) == NULL) { |
294 |
|
fprintf(stderr, |
295 |
|
"%s: cannot open '%s' for output\n", |
303 |
|
newheader("RADIANCE", ofp); |
304 |
|
printargs(argc, argv, ofp); |
305 |
|
fputnow(ofp); |
306 |
< |
fprintf(ofp, "FRAME=%d\n", i+1); |
306 |
> |
fprintf(ofp, "FRAME=%d\n", i); |
307 |
|
fprintf(ofp, "NROWS=%d\n", rvec->nrows); |
308 |
|
fputs("NCOLS=1\nNCOMP=3\n", ofp); |
309 |
< |
fputformat((char *)cm_fmt_id[outfmt], ofp); |
309 |
> |
if ((outfmt == 'f') | (outfmt == 'd')) |
310 |
> |
fputendian(ofp); |
311 |
> |
fputformat(cm_fmt_id[outfmt], ofp); |
312 |
|
fputc('\n', ofp); |
313 |
|
} |
314 |
|
cm_write(rvec, outfmt, ofp); |
334 |
|
fprintf(ofp, "NROWS=%d\n", rmtx->nrows); |
335 |
|
fprintf(ofp, "NCOLS=%d\n", rmtx->ncols); |
336 |
|
fputs("NCOMP=3\n", ofp); |
337 |
< |
fputformat((char *)cm_fmt_id[outfmt], ofp); |
337 |
> |
if ((outfmt == 'f') | (outfmt == 'd')) |
338 |
> |
fputendian(ofp); |
339 |
> |
fputformat(cm_fmt_id[outfmt], ofp); |
340 |
|
fputc('\n', ofp); |
341 |
|
} |
342 |
|
cm_write(rmtx, outfmt, ofp); |
350 |
|
cm_free(cmtx); |
351 |
|
return(0); |
352 |
|
userr: |
353 |
< |
fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d}] DCspec [skyf]\n", |
353 |
> |
fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d|c}] DCspec [skyf]\n", |
354 |
|
progname); |
355 |
< |
fprintf(stderr, " or: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d}] Vspec Tbsdf Dmat.dat [skyf]\n", |
355 |
> |
fprintf(stderr, " or: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d|c}] Vspec Tbsdf Dmat.dat [skyf]\n", |
356 |
|
progname); |
357 |
|
return(1); |
358 |
|
} |