15 |
|
#include "paths.h" |
16 |
|
#include "resolu.h" |
17 |
|
|
18 |
+ |
const char stdin_name[] = "<stdin>"; |
19 |
+ |
|
20 |
|
const char *cm_fmt_id[] = { |
21 |
|
"unknown", COLRFMT, CIEFMT, |
22 |
|
"float", "ascii", "double" |
35 |
|
if ((nrows <= 0) | (ncols <= 0)) |
36 |
|
error(USER, "attempt to create empty matrix"); |
37 |
|
cm = (CMATRIX *)malloc(sizeof(CMATRIX) + |
38 |
< |
sizeof(COLOR)*(nrows*ncols - 1)); |
38 |
> |
sizeof(COLOR)*((size_t)nrows*ncols - 1)); |
39 |
|
if (!cm) |
40 |
|
error(SYSTEM, "out of memory in cm_alloc()"); |
41 |
|
cm->nrows = nrows; |
67 |
|
cm_free(cm); |
68 |
|
return(NULL); |
69 |
|
} |
70 |
< |
old_size = sizeof(CMATRIX) + sizeof(COLOR)*(cm->nrows*cm->ncols - 1); |
70 |
> |
old_size = sizeof(CMATRIX) + sizeof(COLOR)*((size_t)cm->nrows*cm->ncols - 1); |
71 |
|
adjacent_ra_sizes(ra_bounds, old_size); |
72 |
< |
new_size = sizeof(CMATRIX) + sizeof(COLOR)*(nrows*cm->ncols - 1); |
72 |
> |
new_size = sizeof(CMATRIX) + sizeof(COLOR)*((size_t)nrows*cm->ncols - 1); |
73 |
|
if (nrows < cm->nrows ? new_size <= ra_bounds[0] : |
74 |
|
new_size > ra_bounds[1]) { |
75 |
|
adjacent_ra_sizes(ra_bounds, new_size); |
183 |
|
CMATRIX *cm; |
184 |
|
COLORV *mp; |
185 |
|
/* header already loaded */ |
184 |
– |
if ((nrows <= 0) | (ncols <= 0) && !fscnresolu(&ncols, &nrows, fp)) { |
185 |
– |
error(USER, "bad picture resolution string"); |
186 |
– |
return(NULL); |
187 |
– |
} |
186 |
|
cm = cm_alloc(nrows, ncols); |
187 |
|
if (!cm) |
188 |
|
return(NULL); |
214 |
|
cm_load(const char *inspec, int nrows, int ncols, int dtype) |
215 |
|
{ |
216 |
|
const int ROWINC = 2048; |
219 |
– |
FILE *fp = stdin; |
217 |
|
int swap = 0; |
218 |
+ |
FILE *fp; |
219 |
|
COLOR scale; |
220 |
|
CMATRIX *cm; |
221 |
|
|
222 |
< |
if (!inspec) |
223 |
< |
inspec = "<stdin>"; |
222 |
> |
if (!inspec || !*inspec) |
223 |
> |
return(NULL); |
224 |
> |
if (inspec == stdin_name) |
225 |
> |
fp = stdin; |
226 |
|
else if (inspec[0] == '!') { |
227 |
|
fp = popen(inspec+1, "r"); |
228 |
|
if (!fp) { |
242 |
|
char *err = cm_getheader(&dtype, &nrows, &ncols, &swap, scale, fp); |
243 |
|
if (err) |
244 |
|
error(USER, err); |
245 |
– |
if (ncols <= 0) |
246 |
– |
error(USER, "unspecified number of columns"); |
245 |
|
} |
246 |
+ |
if (ncols <= 0 && !fscnresolu(&ncols, &nrows, fp)) |
247 |
+ |
error(USER, "unspecified number of columns"); |
248 |
|
switch (dtype) { |
249 |
|
case DTascii: |
250 |
|
case DTfloat: |
313 |
|
} |
314 |
|
} else { /* read binary file */ |
315 |
|
if (sizeof(COLOR) == cm_elem_size[dtype]) { |
316 |
< |
int nread = 0; |
316 |
> |
size_t nread = 0; |
317 |
|
do { /* read all we can */ |
318 |
|
nread += getbinary(cm->cmem + 3*nread, |
319 |
|
sizeof(COLOR), |
320 |
< |
cm->nrows*cm->ncols - nread, |
320 |
> |
(size_t)cm->nrows*cm->ncols - nread, |
321 |
|
fp); |
322 |
|
if (nrows <= 0) { /* unknown length */ |
323 |
< |
if (nread == cm->nrows*cm->ncols) |
323 |
> |
if (nread == (size_t)cm->nrows*cm->ncols) |
324 |
|
/* need more space? */ |
325 |
|
cm = cm_resize(cm, cm->nrows+ROWINC); |
326 |
|
else if (nread && !(nread % cm->ncols)) |
328 |
|
cm = cm_resize(cm, nread/cm->ncols); |
329 |
|
else /* ended mid-row */ |
330 |
|
goto EOFerror; |
331 |
< |
} else if (nread < cm->nrows*cm->ncols) |
331 |
> |
} else if (nread < (size_t)cm->nrows*cm->ncols) |
332 |
|
goto EOFerror; |
333 |
< |
} while (nread < cm->nrows*cm->ncols); |
333 |
> |
} while (nread < (size_t)cm->nrows*cm->ncols); |
334 |
|
|
335 |
|
if (swap) { |
336 |
|
if (sizeof(COLORV) == 4) |
337 |
|
swap32((char *)cm->cmem, |
338 |
< |
3*cm->nrows*cm->ncols); |
338 |
> |
3*(size_t)cm->nrows*cm->ncols); |
339 |
|
else /* sizeof(COLORV) == 8 */ |
340 |
|
swap64((char *)cm->cmem, |
341 |
< |
3*cm->nrows*cm->ncols); |
341 |
> |
3*(size_t)cm->nrows*cm->ncols); |
342 |
|
} |
343 |
|
} else if (dtype == DTdouble) { |
344 |
|
double dc[3]; /* load from double */ |
345 |
|
COLORV *cvp = cm->cmem; |
346 |
< |
int n = nrows*ncols; |
346 |
> |
size_t n = (size_t)nrows*ncols; |
347 |
|
|
348 |
|
if (n <= 0) |
349 |
|
goto not_handled; |
357 |
|
} else /* dtype == DTfloat */ { |
358 |
|
float fc[3]; /* load from float */ |
359 |
|
COLORV *cvp = cm->cmem; |
360 |
< |
int n = nrows*ncols; |
360 |
> |
size_t n = (size_t)nrows*ncols; |
361 |
|
|
362 |
|
if (n <= 0) |
363 |
|
goto not_handled; |
487 |
|
static const char tabEOL[2] = {'\t','\n'}; |
488 |
|
const COLORV *mp; |
489 |
|
int r, c; |
490 |
+ |
size_t n, rv; |
491 |
|
|
492 |
|
if (!cm) |
493 |
|
return(0); |
503 |
|
case DTfloat: |
504 |
|
case DTdouble: |
505 |
|
if (sizeof(COLOR) == cm_elem_size[dtype]) { |
506 |
< |
r = cm->ncols*cm->nrows; |
507 |
< |
while (r > 0) { |
508 |
< |
c = putbinary(mp, sizeof(COLOR), r, fp); |
509 |
< |
if (c <= 0) |
506 |
> |
n = (size_t)cm->ncols*cm->nrows; |
507 |
> |
while (n > 0) { |
508 |
> |
rv = fwrite(mp, sizeof(COLOR), n, fp); |
509 |
> |
if (rv <= 0) |
510 |
|
return(0); |
511 |
< |
mp += 3*c; |
512 |
< |
r -= c; |
511 |
> |
mp += 3*rv; |
512 |
> |
n -= rv; |
513 |
|
} |
514 |
|
} else if (dtype == DTdouble) { |
515 |
|
double dc[3]; |
516 |
< |
r = cm->ncols*cm->nrows; |
517 |
< |
while (r--) { |
516 |
> |
n = (size_t)cm->ncols*cm->nrows; |
517 |
> |
while (n--) { |
518 |
|
copycolor(dc, mp); |
519 |
|
if (putbinary(dc, sizeof(double), 3, fp) != 3) |
520 |
|
return(0); |
522 |
|
} |
523 |
|
} else /* dtype == DTfloat */ { |
524 |
|
float fc[3]; |
525 |
< |
r = cm->ncols*cm->nrows; |
526 |
< |
while (r--) { |
525 |
> |
n = (size_t)cm->ncols*cm->nrows; |
526 |
> |
while (n--) { |
527 |
|
copycolor(fc, mp); |
528 |
|
if (putbinary(fc, sizeof(float), 3, fp) != 3) |
529 |
|
return(0); |