181 |
|
CMATRIX *cm; |
182 |
|
COLORV *mp; |
183 |
|
/* header already loaded */ |
184 |
– |
if ((nrows <= 0) | (ncols <= 0) && !fscnresolu(&ncols, &nrows, fp)) { |
185 |
– |
error(USER, "bad picture resolution string"); |
186 |
– |
return(NULL); |
187 |
– |
} |
184 |
|
cm = cm_alloc(nrows, ncols); |
185 |
|
if (!cm) |
186 |
|
return(NULL); |
238 |
|
char *err = cm_getheader(&dtype, &nrows, &ncols, &swap, scale, fp); |
239 |
|
if (err) |
240 |
|
error(USER, err); |
245 |
– |
if (ncols <= 0) |
246 |
– |
error(USER, "unspecified number of columns"); |
241 |
|
} |
242 |
+ |
if (ncols <= 0 && !fscnresolu(&ncols, &nrows, fp)) |
243 |
+ |
error(USER, "unspecified number of columns"); |
244 |
|
switch (dtype) { |
245 |
|
case DTascii: |
246 |
|
case DTfloat: |
255 |
|
} |
256 |
|
if (nrows <= 0) { /* don't know length? */ |
257 |
|
int guessrows = 147; /* usually big enough */ |
258 |
< |
if ((dtype != DTascii) & (fp != stdin) & (inspec[0] != '!')) { |
258 |
> |
if (cm_elem_size[dtype] && (fp != stdin) & (inspec[0] != '!')) { |
259 |
|
long startpos = ftell(fp); |
260 |
|
if (fseek(fp, 0L, SEEK_END) == 0) { |
261 |
+ |
long rowsiz = (long)ncols*cm_elem_size[dtype]; |
262 |
|
long endpos = ftell(fp); |
266 |
– |
long elemsiz = 3*(dtype==DTfloat ? |
267 |
– |
sizeof(float) : sizeof(double)); |
263 |
|
|
264 |
< |
if ((endpos - startpos) % (ncols*elemsiz)) { |
264 |
> |
if ((endpos - startpos) % rowsiz) { |
265 |
|
sprintf(errmsg, |
266 |
|
"improper length for binary file '%s'", |
267 |
|
inspec); |
268 |
|
error(USER, errmsg); |
269 |
|
} |
270 |
< |
guessrows = (endpos - startpos)/(ncols*elemsiz); |
270 |
> |
guessrows = (endpos - startpos)/rowsiz; |
271 |
|
if (fseek(fp, startpos, SEEK_SET) < 0) { |
272 |
|
sprintf(errmsg, |
273 |
|
"fseek() error on file '%s'", |