--- ray/src/util/rmatrix.c	2014/08/28 05:59:42	2.9
+++ ray/src/util/rmatrix.c	2016/02/02 18:02:32	2.19
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.9 2014/08/28 05:59:42 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.19 2016/02/02 18:02:32 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -10,6 +10,7 @@ static const char RCSid[] = "$Id: rmatrix.c,v 2.9 2014
 #include <string.h>
 #include <fcntl.h>
 #include "resolu.h"
+#include "paths.h"
 #include "rmatrix.h"
 
 static char	rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
@@ -46,7 +47,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 +111,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++)
@@ -184,33 +185,40 @@ 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>";
+	if (inspec == NULL) {			/* reading from stdin? */
+		inspec = "<stdin>";
 #ifdef _WIN32
 		_setmode(fileno(stdin), _O_BINARY);
 #endif
+	} else if (inspec[0] == '!') {
+		if ((fp = popen(inspec+1, "r")) == NULL)
+			return(NULL);
+#ifdef _WIN32
+		_setmode(fileno(fp), _O_BINARY);
+#endif
 	} 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,8 +252,12 @@ rmx_load(const char *fname)
 	dnew->info = dinfo.info;
 	switch (dinfo.dtype) {
 	case DTascii:
+#ifdef _WIN32
+		_setmode(fileno(fp), _O_TEXT);
+#endif
 		if (!rmx_load_ascii(dnew, fp))
 			goto loaderr;
+		dnew->dtype = DTascii;		/* should leave double? */
 		break;
 	case DTfloat:
 		if (!rmx_load_float(dnew, fp))
@@ -266,11 +278,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);
 }
@@ -279,9 +302,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++)
@@ -356,7 +377,7 @@ rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
 }
 
 /* Write matrix to file type indicated by dtype */
-long
+int
 rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 {
 	RMATRIX	*mydm = NULL;
@@ -364,6 +385,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);
@@ -408,8 +432,11 @@ 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(ftell(fp) * ok);		/* return # bytes written */
+	return(ok);
 }
 
 /* Allocate and assign square identity matrix with n components */
@@ -417,16 +444,14 @@ RMATRIX *
 rmx_identity(const int dim, const int n)
 {
 	RMATRIX	*rid = rmx_alloc(dim, dim, n);
-	int	i;
+	int	i, k;
 
 	if (rid == NULL)
 		return(NULL);
-	memset(rid->mtx, 0, sizeof(rid->mtx[0])*dim*dim);
+	memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim);
 	for (i = dim; i--; )
-		rmx_lval(rid,i,i,0) = 1;
-	for (i = n; --i; )
-		memcpy(rid->mtx+i*(dim*dim), rid->mtx,
-				sizeof(rid->mtx[0])*dim*dim);
+	    for (k = n; k--; )
+		rmx_lval(rid,i,i,k) = 1;
 	return(rid);
 }
 
@@ -495,8 +520,7 @@ 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);