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.28 by greg, Mon Mar 30 20:41:47 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 483 | 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 498 | 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 517 | 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)