--- ray/src/util/rmatrix.c	2019/08/12 18:15:44	2.33
+++ ray/src/util/rmatrix.c	2020/05/07 18:45:16	2.44
@@ -1,14 +1,11 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.33 2019/08/12 18:15:44 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.44 2020/05/07 18:45:16 greg Exp $";
 #endif
 /*
  * General matrix operations.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
 #include <errno.h>
 #include "rtio.h"
 #include "platform.h"
@@ -32,6 +29,7 @@ rmx_alloc(int nr, int nc, int n)
 		return(NULL);
 	dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n;
 	dnew->dtype = DTdouble;
+	dnew->swapin = 0;
 	dnew->info = NULL;
 	return(dnew);
 }
@@ -98,6 +96,21 @@ get_dminfo(char *s, void *p)
 		ip->ncols = atoi(s+6);
 		return(0);
 	}
+	if ((i = isbigendian(s)) >= 0) {
+		ip->swapin = (nativebigendian() != i);
+		return(0);
+	}
+	if (isexpos(s)) {
+		double	d = exposval(s);
+		scalecolor(ip->mtx, d);
+		return(0);
+	}
+	if (iscolcor(s)) {
+		COLOR	ctmp;
+		colcorval(ctmp, s);
+		multcolor(ip->mtx, ctmp);
+		return(0);
+	}
 	if (!formatval(fmt, s)) {
 		rmx_addinfo(ip, s);
 		return(0);
@@ -137,6 +150,8 @@ rmx_load_float(RMATRIX *rm, FILE *fp)
 	    for (j = 0; j < rm->ncols; j++) {
 		if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
 		    return(0);
+		if (rm->swapin)
+		    swap32((char *)val, rm->ncomp);
 	        for (k = rm->ncomp; k--; )
 		     rmx_lval(rm,i,j,k) = val[k];
 	    }
@@ -146,12 +161,20 @@ rmx_load_float(RMATRIX *rm, FILE *fp)
 static int
 rmx_load_double(RMATRIX *rm, FILE *fp)
 {
-	int	i, j;
+	int	i;
 
-	for (i = 0; i < rm->nrows; i++)
-	    for (j = 0; j < rm->ncols; j++)
-		if (getbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp)
-		    return(0);
+	if ((char *)&rmx_lval(rm,1,0,0) - (char *)&rmx_lval(rm,0,0,0) !=
+					sizeof(double)*rm->ncols*rm->ncomp) {
+		fputs("Code error in rmx_load_double()\n", stderr);
+		exit(1);
+	}
+	for (i = 0; i < rm->nrows; i++) {
+		if (getbinary(&rmx_lval(rm,i,0,0), sizeof(double)*rm->ncomp,
+					rm->ncols, fp) != rm->ncols)
+			return(0);
+		if (rm->swapin)
+			swap64((char *)&rmx_lval(rm,i,0,0), rm->ncols*rm->ncomp);
+	}
 	return(1);
 }
 
@@ -192,7 +215,7 @@ rmx_load(const char *inspec)
 	} else if (inspec[0] == '!') {
 		if (!(fp = popen(inspec+1, "r")))
 			return(NULL);
-		SET_FILE_BINARY(stdin);
+		SET_FILE_BINARY(fp);
 	} else {
 		const char	*sp = inspec;	/* check suffix */
 		while (*sp)
@@ -217,7 +240,9 @@ rmx_load(const char *inspec)
 #endif
 	dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0;
 	dinfo.dtype = DTascii;			/* assumed w/o FORMAT */
+	dinfo.swapin = 0;
 	dinfo.info = NULL;
+	dinfo.mtx[0] = dinfo.mtx[1] = dinfo.mtx[2] = 1.;
 	if (getheader(fp, get_dminfo, &dinfo) < 0) {
 		fclose(fp);
 		return(NULL);
@@ -243,17 +268,19 @@ rmx_load(const char *inspec)
 	dnew->info = dinfo.info;
 	switch (dinfo.dtype) {
 	case DTascii:
-		SET_FILE_TEXT(stdin);
+		SET_FILE_TEXT(fp);
 		if (!rmx_load_ascii(dnew, fp))
 			goto loaderr;
 		dnew->dtype = DTascii;		/* should leave double? */
 		break;
 	case DTfloat:
+		dnew->swapin = dinfo.swapin;
 		if (!rmx_load_float(dnew, fp))
 			goto loaderr;
 		dnew->dtype = DTfloat;
 		break;
 	case DTdouble:
+		dnew->swapin = dinfo.swapin;
 		if (!rmx_load_double(dnew, fp))
 			goto loaderr;
 		dnew->dtype = DTdouble;
@@ -262,7 +289,14 @@ rmx_load(const char *inspec)
 	case DTxyze:
 		if (!rmx_load_rgbe(dnew, fp))
 			goto loaderr;
-		dnew->dtype = dinfo.dtype;
+		dnew->dtype = dinfo.dtype;	/* undo exposure? */
+		if ((dinfo.mtx[0] != 1.) | (dinfo.mtx[1] != 1.) |
+				(dinfo.mtx[2] != 1.)) {
+			dinfo.mtx[0] = 1./dinfo.mtx[0];
+			dinfo.mtx[1] = 1./dinfo.mtx[1];
+			dinfo.mtx[2] = 1./dinfo.mtx[2];
+			rmx_scale(dnew, dinfo.mtx);
+		}
 		break;
 	default:
 		goto loaderr;
@@ -395,6 +429,8 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 			return(0);
 		rm = mydm;
 	}
+	if ((dtype == DTfloat) | (dtype == DTdouble))
+		fputendian(fp);			/* important to record */
 	fputformat((char *)cm_fmt_id[dtype], fp);
 	fputc('\n', fp);
 	switch (dtype) {			/* write data */
@@ -568,7 +604,7 @@ rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide
 			    rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k);
 		}
 	if (zeroDivides) {
-		fputs("Divide by zero in rmx_elemult()\n", stderr);
+		rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n");
 		errno = ERANGE;
 	}
 	return(1);
@@ -640,7 +676,7 @@ rmx_transform(const RMATRIX *msrc, int n, const double
 		return(NULL);
 	if (msrc->info) {
 		char	buf[128];
-		sprintf(buf, "Applied %dx%d matrix transform\n",
+		sprintf(buf, "Applied %dx%d component transform\n",
 				dnew->ncomp, msrc->ncomp);
 		rmx_addinfo(dnew, msrc->info);
 		rmx_addinfo(dnew, buf);