--- ray/src/util/rmatrix.c	2019/08/14 18:20:02	2.35
+++ ray/src/util/rmatrix.c	2021/01/19 23:32:00	2.46
@@ -1,14 +1,11 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.35 2019/08/14 18:20:02 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.46 2021/01/19 23:32:00 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"
@@ -27,11 +24,12 @@ rmx_alloc(int nr, int nc, int n)
 	if ((nr <= 0) | (nc <= 0) | (n <= 0))
 		return(NULL);
 	dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) +
-					sizeof(dnew->mtx[0])*(n*nr*nc));
+					sizeof(dnew->mtx[0])*n*nr*nc);
 	if (!dnew)
 		return(NULL);
 	dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n;
 	dnew->dtype = DTdouble;
+	dnew->swapin = 0;
 	dnew->info = NULL;
 	return(dnew);
 }
@@ -102,6 +100,17 @@ get_dminfo(char *s, void *p)
 		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);
@@ -152,15 +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,j,0), rm->ncomp);
-	    }
+			swap64((char *)&rmx_lval(rm,i,0,0), rm->ncols*rm->ncomp);
+	}
 	return(1);
 }
 
@@ -189,19 +203,19 @@ rmx_load_rgbe(RMATRIX *rm, FILE *fp)
 
 /* Load matrix from supported file type */
 RMATRIX *
-rmx_load(const char *inspec)
+rmx_load(const char *inspec, RMPref rmp)
 {
-	FILE		*fp = stdin;
+	FILE		*fp;
 	RMATRIX		dinfo;
 	RMATRIX		*dnew;
 
-	if (!inspec) {				/* reading from stdin? */
-		inspec = "<stdin>";
-		SET_FILE_BINARY(stdin);
+	if (!inspec || !*inspec)
+		return(NULL);
+	if (inspec == stdin_name) {		/* reading from stdin? */
+		fp = stdin;
 	} else if (inspec[0] == '!') {
 		if (!(fp = popen(inspec+1, "r")))
 			return(NULL);
-		SET_FILE_BINARY(stdin);
 	} else {
 		const char	*sp = inspec;	/* check suffix */
 		while (*sp)
@@ -209,7 +223,8 @@ rmx_load(const char *inspec)
 		while (sp > inspec && sp[-1] != '.')
 			--sp;
 		if (!strcasecmp(sp, "XML")) {	/* assume it's a BSDF */
-			CMATRIX	*cm = cm_loadBTDF((char *)inspec);
+			CMATRIX	*cm = rmp==RMPtrans ? cm_loadBTDF(inspec) :
+					cm_loadBRDF(inspec, rmp==RMPreflB) ;
 			if (!cm)
 				return(NULL);
 			dnew = rmx_from_cmatrix(cm);
@@ -218,9 +233,10 @@ rmx_load(const char *inspec)
 			return(dnew);
 		}
 						/* else open it ourselves */
-		if (!(fp = fopen(inspec, "rb")))
+		if (!(fp = fopen(inspec, "r")))
 			return(NULL);
 	}
+	SET_FILE_BINARY(fp);
 #ifdef getc_unlocked
 	flockfile(fp);
 #endif
@@ -228,6 +244,7 @@ rmx_load(const char *inspec)
 	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);
@@ -253,7 +270,7 @@ 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? */
@@ -274,7 +291,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;
@@ -654,7 +678,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);