--- ray/src/util/rmatrix.c	2015/01/23 01:14:20	2.12
+++ ray/src/util/rmatrix.c	2017/08/28 15:59:46	2.25
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.12 2015/01/23 01:14:20 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.25 2017/08/28 15:59:46 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -9,7 +9,11 @@ static const char RCSid[] = "$Id: rmatrix.c,v 2.12 201
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
+#include <errno.h>
+#include "rtio.h"
+#include "platform.h"
 #include "resolu.h"
+#include "paths.h"
 #include "rmatrix.h"
 
 static char	rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
@@ -46,7 +50,9 @@ rmx_free(RMATRIX *rm)
 int
 rmx_newtype(int dtyp1, int dtyp2)
 {
-	if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) && dtyp1 != dtyp2)
+	if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) |
+			(dtyp2==DTxyze) | (dtyp2==DTrgbe)
+			&& dtyp1 != dtyp2)
 		return(0);
 	if (dtyp1 < dtyp2)
 		return(dtyp1);
@@ -108,9 +114,7 @@ static int
 rmx_load_ascii(RMATRIX *rm, FILE *fp)
 {
 	int	i, j, k;
-#ifdef _WIN32
-	_setmode(fileno(fp), _O_TEXT);
-#endif
+
 	for (i = 0; i < rm->nrows; i++)
 	    for (j = 0; j < rm->ncols; j++)
 	        for (k = 0; k < rm->ncomp; k++)
@@ -131,7 +135,7 @@ rmx_load_float(RMATRIX *rm, FILE *fp)
 	}
 	for (i = 0; i < rm->nrows; i++)
 	    for (j = 0; j < rm->ncols; j++) {
-		if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+		if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
 		    return(0);
 	        for (k = rm->ncomp; k--; )
 		     rmx_lval(rm,i,j,k) = val[k];
@@ -151,7 +155,7 @@ rmx_load_double(RMATRIX *rm, FILE *fp)
 	}
 	for (i = 0; i < rm->nrows; i++)
 	    for (j = 0; j < rm->ncols; j++) {
-		if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+		if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
 		    return(0);
 	        for (k = rm->ncomp; k--; )
 		     rmx_lval(rm,i,j,k) = val[k];
@@ -184,33 +188,36 @@ rmx_load_rgbe(RMATRIX *rm, FILE *fp)
 
 /* Load matrix from supported file type */
 RMATRIX *
-rmx_load(const char *fname)
+rmx_load(const char *inspec)
 {
 	FILE		*fp = stdin;
 	RMATRIX		dinfo;
 	RMATRIX		*dnew;
 
-	if (fname == NULL) {			/* reading from stdin? */
-		fname = "<stdin>";
-#ifdef _WIN32
-		_setmode(fileno(stdin), _O_BINARY);
-#endif
+	if (inspec == NULL) {			/* reading from stdin? */
+		inspec = "<stdin>";
+		SET_FILE_BINARY(stdin);
+	} else if (inspec[0] == '!') {
+		if ((fp = popen(inspec+1, "r")) == NULL)
+			return(NULL);
+		SET_FILE_BINARY(stdin);
 	} else {
-		const char	*sp = fname;	/* check suffix */
+		const char	*sp = inspec;	/* check suffix */
 		while (*sp)
 			++sp;
-		while (sp > fname && sp[-1] != '.')
+		while (sp > inspec && sp[-1] != '.')
 			--sp;
 		if (!strcasecmp(sp, "XML")) {	/* assume it's a BSDF */
-			CMATRIX	*cm = cm_loadBTDF((char *)fname);
+			CMATRIX	*cm = cm_loadBTDF((char *)inspec);
 			if (cm == NULL)
 				return(NULL);
 			dnew = rmx_from_cmatrix(cm);
 			cm_free(cm);
+			dnew->dtype = DTascii;
 			return(dnew);
 		}
 						/* else open it ourselves */
-		if ((fp = fopen(fname, "rb")) == NULL)
+		if ((fp = fopen(inspec, "rb")) == NULL)
 			return(NULL);
 	}
 #ifdef getc_unlocked
@@ -244,6 +251,7 @@ rmx_load(const char *fname)
 	dnew->info = dinfo.info;
 	switch (dinfo.dtype) {
 	case DTascii:
+		SET_FILE_TEXT(stdin);
 		if (!rmx_load_ascii(dnew, fp))
 			goto loaderr;
 		dnew->dtype = DTascii;		/* should leave double? */
@@ -267,11 +275,22 @@ rmx_load(const char *fname)
 	default:
 		goto loaderr;
 	}
-	if (fp != stdin)
-		fclose(fp);
+	if (fp != stdin) {
+		if (inspec[0] == '!')
+			pclose(fp);
+		else
+			fclose(fp);
+	}
+#ifdef getc_unlocked
+	else
+		funlockfile(fp);
+#endif
 	return(dnew);
 loaderr:					/* should report error? */
-	fclose(fp);
+	if (inspec[0] == '!')
+		pclose(fp);
+	else
+		fclose(fp);
 	rmx_free(dnew);
 	return(NULL);
 }
@@ -280,9 +299,7 @@ static int
 rmx_write_ascii(const RMATRIX *rm, FILE *fp)
 {
 	int	i, j, k;
-#ifdef _WIN32
-	_setmode(fileno(fp), _O_TEXT);
-#endif
+
 	for (i = 0; i < rm->nrows; i++) {
 	    for (j = 0; j < rm->ncols; j++) {
 	        for (k = 0; k < rm->ncomp; k++)
@@ -308,7 +325,7 @@ rmx_write_float(const RMATRIX *rm, FILE *fp)
 	    for (j = 0; j < rm->ncols; j++) {
 	        for (k = rm->ncomp; k--; )
 		    val[k] = (float)rmx_lval(rm,i,j,k);
-		if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+		if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
 			return(0);
 	    }
 	return(1);
@@ -328,7 +345,7 @@ rmx_write_double(const RMATRIX *rm, FILE *fp)
 	    for (j = 0; j < rm->ncols; j++) {
 	        for (k = rm->ncomp; k--; )
 		    val[k] = rmx_lval(rm,i,j,k);
-		if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+		if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
 			return(0);
 	    }
 	return(1);
@@ -365,6 +382,9 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 
 	if ((rm == NULL) | (fp == NULL))
 		return(0);
+#ifdef getc_unlocked
+	flockfile(fp);
+#endif
 						/* complete header */
 	if (rm->info)
 		fputs(rm->info, fp);
@@ -409,6 +429,9 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 		return(0);
 	}
 	ok &= (fflush(fp) == 0);
+#ifdef getc_unlocked
+	funlockfile(fp);
+#endif
 	rmx_free(mydm);
 	return(ok);
 }
@@ -494,11 +517,67 @@ 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 */