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, fp)) != NULL) |
52 |
|
error(USER, err); |
53 |
|
if ((dt != DTrgbe) & (dt != DTxyze) || |
54 |
|
!fscnresolu(&xr, &yr, fp)) { |
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 (freadcolrs(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); |
187 |
|
case 'a': |
188 |
|
outfmt = DTascii; |
189 |
|
break; |
190 |
+ |
case 'c': |
191 |
+ |
outfmt = DTrgbe; |
192 |
+ |
break; |
193 |
|
default: |
194 |
|
goto userr; |
195 |
|
} |
250 |
|
for (i = 0; i < nsteps; i++) { |
251 |
|
CMATRIX *cvec = cm_column(cmtx, i); |
252 |
|
if (ofspec != NULL) { |
253 |
< |
sprintf(fnbuf, ofspec, i+1); |
253 |
> |
sprintf(fnbuf, ofspec, i); |
254 |
|
if ((ofp = fopen(fnbuf, "wb")) == NULL) { |
255 |
|
fprintf(stderr, |
256 |
|
"%s: cannot open '%s' for output\n", |
261 |
|
printargs(argc, argv, ofp); |
262 |
|
fputnow(ofp); |
263 |
|
} |
264 |
< |
fprintf(ofp, "FRAME=%d\n", i+1); |
264 |
> |
fprintf(ofp, "FRAME=%d\n", i); |
265 |
|
if (!sum_images(argv[a], cvec, ofp)) |
266 |
|
return(1); |
267 |
|
if (ofspec != NULL) { |
285 |
|
const char *wtype = (outfmt==DTascii) ? "w" : "wb"; |
286 |
|
for (i = 0; i < nsteps; i++) { |
287 |
|
CMATRIX *rvec = cm_column(rmtx, i); |
288 |
< |
sprintf(fnbuf, ofspec, i+1); |
288 |
> |
sprintf(fnbuf, ofspec, i); |
289 |
|
if ((ofp = fopen(fnbuf, wtype)) == NULL) { |
290 |
|
fprintf(stderr, |
291 |
|
"%s: cannot open '%s' for output\n", |
299 |
|
newheader("RADIANCE", ofp); |
300 |
|
printargs(argc, argv, ofp); |
301 |
|
fputnow(ofp); |
302 |
< |
fprintf(ofp, "FRAME=%d\n", i+1); |
302 |
> |
fprintf(ofp, "FRAME=%d\n", i); |
303 |
|
fprintf(ofp, "NROWS=%d\n", rvec->nrows); |
304 |
|
fputs("NCOLS=1\nNCOMP=3\n", ofp); |
305 |
+ |
if ((outfmt == 'f') | (outfmt == 'd')) |
306 |
+ |
fputendian(ofp); |
307 |
|
fputformat((char *)cm_fmt_id[outfmt], ofp); |
308 |
|
fputc('\n', ofp); |
309 |
|
} |
330 |
|
fprintf(ofp, "NROWS=%d\n", rmtx->nrows); |
331 |
|
fprintf(ofp, "NCOLS=%d\n", rmtx->ncols); |
332 |
|
fputs("NCOMP=3\n", ofp); |
333 |
+ |
if ((outfmt == 'f') | (outfmt == 'd')) |
334 |
+ |
fputendian(ofp); |
335 |
|
fputformat((char *)cm_fmt_id[outfmt], ofp); |
336 |
|
fputc('\n', ofp); |
337 |
|
} |