--- ray/src/util/rmatrix.c	2020/05/07 18:45:16	2.44
+++ ray/src/util/rmatrix.c	2022/03/03 03:55:13	2.49
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.44 2020/05/07 18:45:16 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.49 2022/03/03 03:55:13 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -24,7 +24,7 @@ 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;
@@ -203,19 +203,21 @@ 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 = stdin_name;
+	else if (!*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(fp);
 	} else {
 		const char	*sp = inspec;	/* check suffix */
 		while (*sp)
@@ -223,7 +225,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);
@@ -232,9 +235,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
@@ -394,6 +398,23 @@ rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
 	return(1);
 }
 
+/* Check if CIE XYZ primaries were specified */
+static int
+findCIEprims(const char *info)
+{
+	RGBPRIMS	prims;
+
+	if (!info)
+		return(0);
+	info = strstr(info, PRIMARYSTR);
+	if (!info || !primsval(prims, info))
+		return(0);
+
+	return((prims[RED][CIEX] > .99) & (prims[RED][CIEY] < .01) &&
+			(prims[GRN][CIEX] < .01) & (prims[GRN][CIEY] > .99) &&
+			(prims[BLU][CIEX] < .01) & (prims[BLU][CIEY] < .01));
+}
+
 /* Write matrix to file type indicated by dtype */
 int
 rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
@@ -411,7 +432,8 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 		fputs(rm->info, fp);
 	if (dtype == DTfromHeader)
 		dtype = rm->dtype;
-	else if ((dtype == DTrgbe) & (rm->dtype == DTxyze))
+	else if (dtype == DTrgbe && (rm->dtype == DTxyze ||
+					findCIEprims(rm->info)))
 		dtype = DTxyze;
 	else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
 		dtype = DTrgbe;
@@ -431,7 +453,7 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 	}
 	if ((dtype == DTfloat) | (dtype == DTdouble))
 		fputendian(fp);			/* important to record */
-	fputformat((char *)cm_fmt_id[dtype], fp);
+	fputformat(cm_fmt_id[dtype], fp);
 	fputc('\n', fp);
 	switch (dtype) {			/* write data */
 	case DTascii: