ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/cmatrix.c

Comparing ray/src/util/cmatrix.c (file contents):
Revision 2.26 by greg, Thu Mar 26 02:48:31 2020 UTC vs.
Revision 2.30 by greg, Fri Jan 15 17:22:23 2021 UTC

#	Line 33 | Line 33 | cm_alloc(int nrows, int ncols)
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;
#	Line 65 | Line 65 | cm_resize(CMATRIX *cm, int 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);
#	Line 181 | Line 181 | cm_load_rgbe(FILE *fp, int nrows, int ncols, COLOR sca
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);
#	Line 242 | Line 238 | cm_load(const char *inspec, int nrows, int ncols, int
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:
#	Line 259 | Line 255 | cm_load(const char *inspec, int nrows, int ncols, int
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'",
#	Line 488 | Line 483 | cm_write(const CMATRIX *cm, int dtype, FILE *fp)
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);
#	Line 503 | Line 499 | cm_write(const CMATRIX *cm, int dtype, FILE *fp)
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);
#	Line 522 | Line 518 | cm_write(const CMATRIX *cm, int dtype, FILE *fp)
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);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)