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; |
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); |
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 */ |
247 |
|
for (i = 0; i < nsteps; i++) { |
248 |
|
CMATRIX *cvec = cm_column(cmtx, i); |
249 |
|
if (ofspec != NULL) { |
250 |
< |
sprintf(fnbuf, ofspec, i+1); |
250 |
> |
sprintf(fnbuf, ofspec, i); |
251 |
|
if ((ofp = fopen(fnbuf, "wb")) == NULL) { |
252 |
|
fprintf(stderr, |
253 |
|
"%s: cannot open '%s' for output\n", |
258 |
|
printargs(argc, argv, ofp); |
259 |
|
fputnow(ofp); |
260 |
|
} |
261 |
< |
fprintf(ofp, "FRAME=%d\n", i+1); |
261 |
> |
fprintf(ofp, "FRAME=%d\n", i); |
262 |
|
if (!sum_images(argv[a], cvec, ofp)) |
263 |
|
return(1); |
264 |
|
if (ofspec != NULL) { |
282 |
|
const char *wtype = (outfmt==DTascii) ? "w" : "wb"; |
283 |
|
for (i = 0; i < nsteps; i++) { |
284 |
|
CMATRIX *rvec = cm_column(rmtx, i); |
285 |
< |
sprintf(fnbuf, ofspec, i+1); |
285 |
> |
sprintf(fnbuf, ofspec, i); |
286 |
|
if ((ofp = fopen(fnbuf, wtype)) == NULL) { |
287 |
|
fprintf(stderr, |
288 |
|
"%s: cannot open '%s' for output\n", |
296 |
|
newheader("RADIANCE", ofp); |
297 |
|
printargs(argc, argv, ofp); |
298 |
|
fputnow(ofp); |
299 |
< |
fprintf(ofp, "FRAME=%d\n", i+1); |
299 |
> |
fprintf(ofp, "FRAME=%d\n", i); |
300 |
|
fprintf(ofp, "NROWS=%d\n", rvec->nrows); |
301 |
|
fputs("NCOLS=1\nNCOMP=3\n", ofp); |
302 |
|
fputformat((char *)cm_fmt_id[outfmt], ofp); |