--- ray/src/util/rmatrix.c	2014/08/05 21:45:05	2.7
+++ ray/src/util/rmatrix.c	2014/12/16 20:21:46	2.11
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.7 2014/08/05 21:45:05 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.11 2014/12/16 20:21:46 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)
@@ -245,6 +246,7 @@ rmx_load(const char *fname)
 	case DTascii:
 		if (!rmx_load_ascii(dnew, fp))
 			goto loaderr;
+		dnew->dtype = DTascii;		/* should leave double? */
 		break;
 	case DTfloat:
 		if (!rmx_load_float(dnew, fp))
@@ -355,7 +357,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;
@@ -370,7 +372,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);
@@ -408,7 +410,7 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 	}
 	ok &= (fflush(fp) == 0);
 	rmx_free(mydm);
-	return(ftell(fp) * ok);		/* return # bytes written */
+	return(ok);
 }
 
 /* Allocate and assign square identity matrix with n components */
@@ -491,9 +493,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;