21 |
|
}; |
22 |
|
|
23 |
|
const int cm_elem_size[] = { |
24 |
< |
0, 0, 4, 4, 3*sizeof(float), 3*sizeof(double) |
24 |
> |
0, 4, 4, 3*sizeof(float), 0, 3*sizeof(double) |
25 |
|
}; |
26 |
|
|
27 |
|
/* Allocate a color coefficient matrix */ |
33 |
|
if ((nrows <= 0) | (ncols <= 0)) |
34 |
|
error(USER, "attempt to create empty matrix"); |
35 |
|
cm = (CMATRIX *)malloc(sizeof(CMATRIX) + |
36 |
< |
sizeof(COLOR)*(nrows*ncols - 1)); |
36 |
> |
sizeof(COLOR)*((size_t)nrows*ncols - 1)); |
37 |
|
if (!cm) |
38 |
|
error(SYSTEM, "out of memory in cm_alloc()"); |
39 |
|
cm->nrows = nrows; |
65 |
|
cm_free(cm); |
66 |
|
return(NULL); |
67 |
|
} |
68 |
< |
old_size = sizeof(CMATRIX) + sizeof(COLOR)*(cm->nrows*cm->ncols - 1); |
68 |
> |
old_size = sizeof(CMATRIX) + sizeof(COLOR)*((size_t)cm->nrows*cm->ncols - 1); |
69 |
|
adjacent_ra_sizes(ra_bounds, old_size); |
70 |
< |
new_size = sizeof(CMATRIX) + sizeof(COLOR)*(nrows*cm->ncols - 1); |
70 |
> |
new_size = sizeof(CMATRIX) + sizeof(COLOR)*((size_t)nrows*cm->ncols - 1); |
71 |
|
if (nrows < cm->nrows ? new_size <= ra_bounds[0] : |
72 |
|
new_size > ra_bounds[1]) { |
73 |
|
adjacent_ra_sizes(ra_bounds, new_size); |
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'", |
309 |
|
} |
310 |
|
} else { /* read binary file */ |
311 |
|
if (sizeof(COLOR) == cm_elem_size[dtype]) { |
312 |
< |
int nread = 0; |
312 |
> |
size_t nread = 0; |
313 |
|
do { /* read all we can */ |
314 |
|
nread += getbinary(cm->cmem + 3*nread, |
315 |
|
sizeof(COLOR), |
316 |
< |
cm->nrows*cm->ncols - nread, |
316 |
> |
(size_t)cm->nrows*cm->ncols - nread, |
317 |
|
fp); |
318 |
|
if (nrows <= 0) { /* unknown length */ |
319 |
< |
if (nread == cm->nrows*cm->ncols) |
319 |
> |
if (nread == (size_t)cm->nrows*cm->ncols) |
320 |
|
/* need more space? */ |
321 |
|
cm = cm_resize(cm, cm->nrows+ROWINC); |
322 |
|
else if (nread && !(nread % cm->ncols)) |
324 |
|
cm = cm_resize(cm, nread/cm->ncols); |
325 |
|
else /* ended mid-row */ |
326 |
|
goto EOFerror; |
327 |
< |
} else if (nread < cm->nrows*cm->ncols) |
327 |
> |
} else if (nread < (size_t)cm->nrows*cm->ncols) |
328 |
|
goto EOFerror; |
329 |
< |
} while (nread < cm->nrows*cm->ncols); |
329 |
> |
} while (nread < (size_t)cm->nrows*cm->ncols); |
330 |
|
|
331 |
+ |
if (swap) { |
332 |
+ |
if (sizeof(COLORV) == 4) |
333 |
+ |
swap32((char *)cm->cmem, |
334 |
+ |
3*(size_t)cm->nrows*cm->ncols); |
335 |
+ |
else /* sizeof(COLORV) == 8 */ |
336 |
+ |
swap64((char *)cm->cmem, |
337 |
+ |
3*(size_t)cm->nrows*cm->ncols); |
338 |
+ |
} |
339 |
|
} else if (dtype == DTdouble) { |
340 |
|
double dc[3]; /* load from double */ |
341 |
|
COLORV *cvp = cm->cmem; |
342 |
< |
int n = nrows*ncols; |
342 |
> |
size_t n = (size_t)nrows*ncols; |
343 |
|
|
344 |
|
if (n <= 0) |
345 |
|
goto not_handled; |
346 |
|
while (n--) { |
347 |
|
if (getbinary(dc, sizeof(double), 3, fp) != 3) |
348 |
|
goto EOFerror; |
349 |
+ |
if (swap) swap64((char *)dc, 3); |
350 |
|
copycolor(cvp, dc); |
351 |
|
cvp += 3; |
352 |
|
} |
353 |
|
} else /* dtype == DTfloat */ { |
354 |
|
float fc[3]; /* load from float */ |
355 |
|
COLORV *cvp = cm->cmem; |
356 |
< |
int n = nrows*ncols; |
356 |
> |
size_t n = (size_t)nrows*ncols; |
357 |
|
|
358 |
|
if (n <= 0) |
359 |
|
goto not_handled; |
360 |
|
while (n--) { |
361 |
|
if (getbinary(fc, sizeof(float), 3, fp) != 3) |
362 |
|
goto EOFerror; |
363 |
+ |
if (swap) swap32((char *)fc, 3); |
364 |
|
copycolor(cvp, fc); |
365 |
|
cvp += 3; |
366 |
|
} |
372 |
|
error(WARNING, errmsg); |
373 |
|
} |
374 |
|
} |
370 |
– |
if (swap) { |
371 |
– |
if (dtype == DTfloat) |
372 |
– |
swap32((char *)cm->cmem, 3*cm->nrows*cm->ncols); |
373 |
– |
else if (dtype == DTdouble) |
374 |
– |
swap64((char *)cm->cmem, 3*cm->nrows*cm->ncols); |
375 |
– |
} |
375 |
|
cleanup: |
376 |
|
if (fp != stdin) { |
377 |
|
if (inspec[0] != '!') |
483 |
|
static const char tabEOL[2] = {'\t','\n'}; |
484 |
|
const COLORV *mp; |
485 |
|
int r, c; |
486 |
+ |
size_t n, rv; |
487 |
|
|
488 |
|
if (!cm) |
489 |
|
return(0); |
499 |
|
case DTfloat: |
500 |
|
case DTdouble: |
501 |
|
if (sizeof(COLOR) == cm_elem_size[dtype]) { |
502 |
< |
r = cm->ncols*cm->nrows; |
503 |
< |
while (r > 0) { |
504 |
< |
c = putbinary(mp, sizeof(COLOR), r, fp); |
505 |
< |
if (c <= 0) |
502 |
> |
n = (size_t)cm->ncols*cm->nrows; |
503 |
> |
while (n > 0) { |
504 |
> |
rv = fwrite(mp, sizeof(COLOR), n, fp); |
505 |
> |
if (rv <= 0) |
506 |
|
return(0); |
507 |
< |
mp += 3*c; |
508 |
< |
r -= c; |
507 |
> |
mp += 3*rv; |
508 |
> |
n -= rv; |
509 |
|
} |
510 |
|
} else if (dtype == DTdouble) { |
511 |
|
double dc[3]; |
512 |
< |
r = cm->ncols*cm->nrows; |
513 |
< |
while (r--) { |
512 |
> |
n = (size_t)cm->ncols*cm->nrows; |
513 |
> |
while (n--) { |
514 |
|
copycolor(dc, mp); |
515 |
|
if (putbinary(dc, sizeof(double), 3, fp) != 3) |
516 |
|
return(0); |
518 |
|
} |
519 |
|
} else /* dtype == DTfloat */ { |
520 |
|
float fc[3]; |
521 |
< |
r = cm->ncols*cm->nrows; |
522 |
< |
while (r--) { |
521 |
> |
n = (size_t)cm->ncols*cm->nrows; |
522 |
> |
while (n--) { |
523 |
|
copycolor(fc, mp); |
524 |
|
if (putbinary(fc, sizeof(float), 3, fp) != 3) |
525 |
|
return(0); |