--- ray/src/util/cmatrix.c	2021/01/15 02:46:28	2.29
+++ ray/src/util/cmatrix.c	2023/05/18 23:55:10	2.37
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: cmatrix.c,v 2.29 2021/01/15 02:46:28 greg Exp $";
+static const char RCSid[] = "$Id: cmatrix.c,v 2.37 2023/05/18 23:55:10 greg Exp $";
 #endif
 /*
  * Color matrix routines.
@@ -15,6 +15,8 @@ static const char RCSid[] = "$Id: cmatrix.c,v 2.29 202
 #include "paths.h"
 #include "resolu.h"
 
+const char	stdin_name[] = "<stdin>";
+
 const char	*cm_fmt_id[] = {
 			"unknown", COLRFMT, CIEFMT,
 			"float", "ascii", "double"
@@ -65,9 +67,9 @@ cm_resize(CMATRIX *cm, int nrows)
 		cm_free(cm);
 		return(NULL);
 	}
-	old_size = sizeof(CMATRIX) + sizeof(COLOR)*(cm->nrows*cm->ncols - 1);
+	old_size = sizeof(CMATRIX) + sizeof(COLOR)*((size_t)cm->nrows*cm->ncols - 1);
 	adjacent_ra_sizes(ra_bounds, old_size);
-	new_size = sizeof(CMATRIX) + sizeof(COLOR)*(nrows*cm->ncols - 1);
+	new_size = sizeof(CMATRIX) + sizeof(COLOR)*((size_t)nrows*cm->ncols - 1);
 	if (nrows < cm->nrows ? new_size <= ra_bounds[0] :
 				new_size > ra_bounds[1]) {
 		adjacent_ra_sizes(ra_bounds, new_size);
@@ -175,18 +177,14 @@ cm_getheader(int *dt, int *nr, int *nc, int *swp, COLO
 
 /* Allocate and load image data into matrix */
 static CMATRIX *
-cm_load_rgbe(FILE *fp, int nrows, int ncols, COLOR scale)
+cm_load_rgbe(FILE *fp, int nrows, int ncols)
 {
-	int	doscale;
 	CMATRIX	*cm;
 	COLORV	*mp;
 						/* header already loaded */
 	cm = cm_alloc(nrows, ncols);
 	if (!cm)
 		return(NULL);
-	doscale = (scale[0] < .99) | (scale[0] > 1.01) |
-			(scale[1] < .99) | (scale[1] > 1.01) |
-			(scale[2] < .99) | (scale[2] > 1.01) ;
 	mp = cm->cmem;
 	while (nrows--) {
 		if (freadscan((COLOR *)mp, ncols, fp) < 0) {
@@ -194,15 +192,7 @@ cm_load_rgbe(FILE *fp, int nrows, int ncols, COLOR sca
 			cm_free(cm);
 			return(NULL);
 		}
-		if (doscale) {
-			int	i = ncols;
-			while (i--) {
-				*mp++ *= scale[0];
-				*mp++ *= scale[1];
-				*mp++ *= scale[2];
-			}
-		} else
-			mp += 3*ncols;
+		mp += 3*ncols;
 	}					/* caller closes stream */
 	return(cm);
 }
@@ -212,14 +202,19 @@ CMATRIX *
 cm_load(const char *inspec, int nrows, int ncols, int dtype)
 {
 	const int	ROWINC = 2048;
-	FILE		*fp = stdin;
+	int		dimsOK = (dtype == DTascii) | (nrows > 0) && ncols;
 	int		swap = 0;
+	FILE		*fp;
 	COLOR		scale;
 	CMATRIX		*cm;
 
 	if (!inspec)
-		inspec = "<stdin>";
-	else if (inspec[0] == '!') {
+		inspec = stdin_name;
+	else if (!*inspec)
+		return(NULL);
+	if (inspec == stdin_name) {		/* reading from stdin? */
+		fp = stdin;
+	} else if (inspec[0] == '!') {
 		fp = popen(inspec+1, "r");
 		if (!fp) {
 			sprintf(errmsg, "cannot start command '%s'", inspec);
@@ -234,13 +229,15 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 #endif
 	if (dtype != DTascii)
 		SET_FILE_BINARY(fp);		/* doesn't really work */
-	if (!dtype | !ncols) {			/* expecting header? */
+	if (!dtype | !dimsOK) {			/* expecting header? */
 		char	*err = cm_getheader(&dtype, &nrows, &ncols, &swap, scale, fp);
 		if (err)
 			error(USER, err);
+		dimsOK = ncols > 0 && ( nrows > 0 ||
+				(dtype != DTrgbe) & (dtype != DTxyze) );
 	}
-	if (ncols <= 0 && !fscnresolu(&ncols, &nrows, fp))
-		error(USER, "unspecified number of columns");
+	if (!dimsOK && !fscnresolu(&ncols, &nrows, fp))
+		error(USER, "unspecified matrix size");
 	switch (dtype) {
 	case DTascii:
 	case DTfloat:
@@ -248,7 +245,7 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 		break;
 	case DTrgbe:
 	case DTxyze:
-		cm = cm_load_rgbe(fp, nrows, ncols, scale);
+		cm = cm_load_rgbe(fp, nrows, ncols);
 		goto cleanup;
 	default:
 		error(USER, "unexpected data type in cm_load()");
@@ -309,14 +306,14 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 			}
 	} else {					/* read binary file */
 		if (sizeof(COLOR) == cm_elem_size[dtype]) {
-			int	nread = 0;
+			size_t	nread = 0;
 			do {				/* read all we can */
 				nread += getbinary(cm->cmem + 3*nread,
 						sizeof(COLOR),
-						cm->nrows*cm->ncols - nread,
+						(size_t)cm->nrows*cm->ncols - nread,
 						fp);
 				if (nrows <= 0) {	/* unknown length */
-					if (nread == cm->nrows*cm->ncols)
+					if (nread == (size_t)cm->nrows*cm->ncols)
 							/* need more space? */
 						cm = cm_resize(cm, cm->nrows+ROWINC);
 					else if (nread && !(nread % cm->ncols))
@@ -324,22 +321,22 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 						cm = cm_resize(cm, nread/cm->ncols);
 					else		/* ended mid-row */
 						goto EOFerror;
-				} else if (nread < cm->nrows*cm->ncols)
+				} else if (nread < (size_t)cm->nrows*cm->ncols)
 					goto EOFerror;
-			} while (nread < cm->nrows*cm->ncols);
+			} while (nread < (size_t)cm->nrows*cm->ncols);
 
 			if (swap) {
 				if (sizeof(COLORV) == 4)
 					swap32((char *)cm->cmem,
-							3*cm->nrows*cm->ncols);
+							3*(size_t)cm->nrows*cm->ncols);
 				else /* sizeof(COLORV) == 8 */
 					swap64((char *)cm->cmem,
-							3*cm->nrows*cm->ncols);
+							3*(size_t)cm->nrows*cm->ncols);
 			}
 		} else if (dtype == DTdouble) {
 			double	dc[3];			/* load from double */
 			COLORV	*cvp = cm->cmem;
-			int	n = nrows*ncols;
+			size_t	n = (size_t)nrows*ncols;
 
 			if (n <= 0)
 				goto not_handled;
@@ -353,7 +350,7 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 		} else /* dtype == DTfloat */ {
 			float	fc[3];			/* load from float */
 			COLORV	*cvp = cm->cmem;
-			int	n = nrows*ncols;
+			size_t	n = (size_t)nrows*ncols;
 
 			if (n <= 0)
 				goto not_handled;
@@ -385,6 +382,17 @@ cleanup:
 	else
 		funlockfile(fp);
 #endif
+	if ((scale[0] < .99) | (scale[0] > 1.01) |
+			(scale[1] < .99) | (scale[1] > 1.01) |
+			(scale[2] < .99) | (scale[2] > 1.01)) {
+		size_t	n = (size_t)ncols*nrows;
+		COLORV	*mp = cm->cmem;
+		while (n--) {		/* apply exposure scaling */
+			*mp++ *= scale[0];
+			*mp++ *= scale[1];
+			*mp++ *= scale[2];
+		}
+	}
 	return(cm);
 EOFerror:
 	sprintf(errmsg, "unexpected EOF reading %s", inspec);
@@ -483,6 +491,7 @@ cm_write(const CMATRIX *cm, int dtype, FILE *fp)
 	static const char	tabEOL[2] = {'\t','\n'};
 	const COLORV		*mp;
 	int			r, c;
+	size_t			n, rv;
 
 	if (!cm)
 		return(0);
@@ -498,18 +507,18 @@ cm_write(const CMATRIX *cm, int dtype, FILE *fp)
 	case DTfloat:
 	case DTdouble:
 		if (sizeof(COLOR) == cm_elem_size[dtype]) {
-			r = cm->ncols*cm->nrows;
-			while (r > 0) {
-				c = putbinary(mp, sizeof(COLOR), r, fp);
-				if (c <= 0)
+			n = (size_t)cm->ncols*cm->nrows;
+			while (n > 0) {
+				rv = fwrite(mp, sizeof(COLOR), n, fp);
+				if (rv <= 0)
 					return(0);
-				mp += 3*c;
-				r -= c;
+				mp += 3*rv;
+				n -= rv;
 			}
 		} else if (dtype == DTdouble) {
 			double	dc[3];
-			r = cm->ncols*cm->nrows;
-			while (r--) {
+			n = (size_t)cm->ncols*cm->nrows;
+			while (n--) {
 				copycolor(dc, mp);
 				if (putbinary(dc, sizeof(double), 3, fp) != 3)
 					return(0);
@@ -517,8 +526,8 @@ cm_write(const CMATRIX *cm, int dtype, FILE *fp)
 			}
 		} else /* dtype == DTfloat */ {
 			float	fc[3];
-			r = cm->ncols*cm->nrows;
-			while (r--) {
+			n = (size_t)cm->ncols*cm->nrows;
+			while (n--) {
 				copycolor(fc, mp);
 				if (putbinary(fc, sizeof(float), 3, fp) != 3)
 					return(0);