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