--- ray/src/util/rmatrix.c	2016/08/30 14:54:08	2.23
+++ ray/src/util/rmatrix.c	2018/08/02 18:33:50	2.29
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.23 2016/08/30 14:54:08 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.29 2018/08/02 18:33:50 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -9,6 +9,7 @@ static const char RCSid[] = "$Id: rmatrix.c,v 2.23 201
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
+#include <errno.h>
 #include "rtio.h"
 #include "platform.h"
 #include "resolu.h"
@@ -80,7 +81,7 @@ static int
 get_dminfo(char *s, void *p)
 {
 	RMATRIX	*ip = (RMATRIX *)p;
-	char	fmt[64];
+	char	fmt[MAXFMTLEN];
 	int	i;
 
 	if (headidval(fmt, s))
@@ -145,20 +146,12 @@ rmx_load_float(RMATRIX *rm, FILE *fp)
 static int
 rmx_load_double(RMATRIX *rm, FILE *fp)
 {
-	int	i, j, k;
-	double	val[100];
+	int	i, j;
 
-	if (rm->ncomp > 100) {
-		fputs("Unsupported # components in rmx_load_double()\n", stderr);
-		exit(1);
-	}
 	for (i = 0; i < rm->nrows; i++)
-	    for (j = 0; j < rm->ncols; j++) {
-		if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+	    for (j = 0; j < rm->ncols; j++)
+		if (getbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp)
 		    return(0);
-	        for (k = rm->ncomp; k--; )
-		     rmx_lval(rm,i,j,k) = val[k];
-	    }
 	return(1);
 }
 
@@ -333,37 +326,29 @@ rmx_write_float(const RMATRIX *rm, FILE *fp)
 static int
 rmx_write_double(const RMATRIX *rm, FILE *fp)
 {
-	int	i, j, k;
-	double	val[100];
+	int	i, j;
 
-	if (rm->ncomp > 100) {
-		fputs("Unsupported # components in rmx_write_double()\n", stderr);
-		exit(1);
-	}
 	for (i = 0; i < rm->nrows; i++)
-	    for (j = 0; j < rm->ncols; j++) {
-	        for (k = rm->ncomp; k--; )
-		    val[k] = rmx_lval(rm,i,j,k);
-		if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+	    for (j = 0; j < rm->ncols; j++)
+		if (putbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp)
 			return(0);
-	    }
 	return(1);
 }
 
 static int
 rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
 {
-	COLOR	*scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols);
+	COLR	*scan = (COLR *)malloc(sizeof(COLR)*rm->ncols);
 	int	i, j;
 
 	if (scan == NULL)
 		return(0);
 	for (i = 0; i < rm->nrows; i++) {
 	    for (j = rm->ncols; j--; )
-	        setcolor(scan[j],	rmx_lval(rm,i,j,0),
+	        setcolr(scan[j],	rmx_lval(rm,i,j,0),
 					rmx_lval(rm,i,j,1),
 					rmx_lval(rm,i,j,2)	);
-	    if (fwritescan(scan, rm->ncols, fp) < 0) {
+	    if (fwritecolrs(scan, rm->ncols, fp) < 0) {
 		free(scan);
 		return(0);
 	    }
@@ -516,13 +501,69 @@ rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
 	        for (k = mres->ncomp; k--; ) {
 		    long double	d = 0;
 		    for (h = m1->ncols; h--; )
-			d += (long double)rmx_lval(m1,i,h,k) *
-				(long double)rmx_lval(m2,h,j,k);
+			d += rmx_lval(m1,i,h,k) * rmx_lval(m2,h,j,k);
 		    rmx_lval(mres,i,j,k) = (double)d;
 		}
 	return(mres);
 }
 
+/* Element-wise multiplication (or division) of m2 into m1 */
+int
+rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide)
+{
+	int	zeroDivides = 0;
+	int	i, j, k;
+
+	if ((m1 == NULL) | (m2 == NULL) ||
+			(m1->ncols != m2->ncols) | (m1->nrows != m2->nrows))
+		return(0);
+	if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp))
+		return(0);
+	i = rmx_newtype(m1->dtype, m2->dtype);
+	if (i)
+		m1->dtype = i;
+	else
+		rmx_addinfo(m1, rmx_mismatch_warn);
+	for (i = m1->nrows; i--; )
+	    for (j = m1->ncols; j--; )
+		if (divide) {
+		    double	d;
+		    if (m2->ncomp == 1) {
+			d = rmx_lval(m2,i,j,0);
+			if (d == 0) {
+			    ++zeroDivides;
+			    for (k = m1->ncomp; k--; )
+				rmx_lval(m1,i,j,k) = 0;
+			} else {
+			    d = 1./d;
+			    for (k = m1->ncomp; k--; )
+				rmx_lval(m1,i,j,k) *= d;
+			}
+		    } else
+		        for (k = m1->ncomp; k--; ) {
+			    d = rmx_lval(m2,i,j,k);
+			    if (d == 0) {
+			        ++zeroDivides;
+				rmx_lval(m1,i,j,k) = 0;
+			    } else
+				rmx_lval(m1,i,j,k) /= d;
+			}
+		} else {
+		    if (m2->ncomp == 1) {
+			const double	d = rmx_lval(m2,i,j,0);
+		        for (k = m1->ncomp; k--; )
+			    rmx_lval(m1,i,j,k) *= d;
+		    } else
+		        for (k = m1->ncomp; k--; )
+			    rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k);
+		}
+	if (zeroDivides) {
+		fputs("Divide by zero in rmx_elemult()\n", stderr);
+		errno = ERANGE;
+	}
+	return(1);
+}
+
 /* Sum second matrix into first, applying scale factor beforehand */
 int
 rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[])
@@ -570,6 +611,8 @@ rmx_scale(RMATRIX *rm, const double sf[])
 		for (k = rm->ncomp; k--; )
 		    rmx_lval(rm,i,j,k) *= sf[k];
 
+	if (rm->info)
+		rmx_addinfo(rm, "Applied scalar\n");
 	return(1);
 }
 
@@ -585,6 +628,13 @@ rmx_transform(const RMATRIX *msrc, int n, const double
 	dnew = rmx_alloc(msrc->nrows, msrc->ncols, n);
 	if (dnew == NULL)
 		return(NULL);
+	if (msrc->info) {
+		char	buf[128];
+		sprintf(buf, "Applied %dx%d matrix transform\n",
+				dnew->ncomp, msrc->ncomp);
+		rmx_addinfo(dnew, msrc->info);
+		rmx_addinfo(dnew, buf);
+	}
 	dnew->dtype = msrc->dtype;
 	for (i = dnew->nrows; i--; )
 	    for (j = dnew->ncols; j--; )