--- ray/src/util/rmatrix.c	2014/08/02 17:10:43	2.6
+++ ray/src/util/rmatrix.c	2014/08/28 05:59:42	2.9
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.6 2014/08/02 17:10:43 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.9 2014/08/28 05:59:42 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -59,9 +59,10 @@ rmx_addinfo(RMATRIX *rm, const char *info)
 {
 	if (!info || !*info)
 		return(0);
-	if (!rm->info)
+	if (!rm->info) {
 		rm->info = (char *)malloc(strlen(info)+1);
-	else
+		if (rm->info) rm->info[0] = '\0';
+	} else
 		rm->info = (char *)realloc(rm->info,
 				strlen(rm->info)+strlen(info)+1);
 	if (!rm->info)
@@ -191,6 +192,9 @@ rmx_load(const char *fname)
 
 	if (fname == NULL) {			/* reading from stdin? */
 		fname = "<stdin>";
+#ifdef _WIN32
+		_setmode(fileno(stdin), _O_BINARY);
+#endif
 	} else {
 		const char	*sp = fname;	/* check suffix */
 		while (*sp)
@@ -367,7 +371,7 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 		dtype = rm->dtype;
 	else if ((dtype == DTrgbe) & (rm->dtype == DTxyze))
 		dtype = DTxyze;
-	else if ((dtype = DTxyze) & (rm->dtype == DTrgbe))
+	else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
 		dtype = DTrgbe;
 	if ((dtype != DTrgbe) & (dtype != DTxyze)) {
 		fprintf(fp, "NROWS=%d\n", rm->nrows);
@@ -488,9 +492,9 @@ rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
 		rmx_addinfo(mres, rmx_mismatch_warn);
 	for (i = mres->nrows; i--; )
 	    for (j = mres->ncols; j--; )
-	        for (h = m1->ncols; h--; ) {
+	        for (k = mres->ncomp; k--; ) {
 		    long double	d = 0;
-		    for (k = mres->ncomp; k--; )
+		    for (h = m1->ncols; h--; )
 			d += (long double)rmx_lval(m1,i,h,k) *
 				(long double)rmx_lval(m2,h,j,k);
 		    rmx_lval(mres,i,j,k) = (double)d;