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; |
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); |