--- ray/src/util/cmatrix.c	2019/08/12 18:28:37	2.21
+++ ray/src/util/cmatrix.c	2020/03/25 01:51:09	2.25
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: cmatrix.c,v 2.21 2019/08/12 18:28:37 greg Exp $";
+static const char RCSid[] = "$Id: cmatrix.c,v 2.25 2020/03/25 01:51:09 greg Exp $";
 #endif
 /*
  * Color matrix routines.
@@ -16,8 +16,8 @@ static const char RCSid[] = "$Id: cmatrix.c,v 2.21 201
 #include "resolu.h"
 
 const char	*cm_fmt_id[] = {
-			"unknown", "ascii", COLRFMT, CIEFMT,
-			"float", "double"
+			"unknown", COLRFMT, CIEFMT,
+			"float", "ascii", "double"
 		};
 
 const int	cm_elem_size[] = {
@@ -81,7 +81,9 @@ cm_resize(CMATRIX *cm, int nrows)
 
 typedef struct {
 	int	dtype;		/* data type */
+	int	need2swap;	/* need byte swap? */
 	int	nrows, ncols;	/* matrix size */
+	COLOR	expos;		/* exposure value */
 	char	*err;		/* error message */
 } CMINFO;		/* header info record */
 
@@ -104,6 +106,21 @@ get_cminfo(char *s, void *p)
 		ip->ncols = atoi(s+6);
 		return(0);
 	}
+	if ((i = isbigendian(s)) >= 0) {
+		ip->need2swap = (nativebigendian() != i);
+		return(0);
+	}
+	if (isexpos(s)) {
+		double	d = exposval(s);
+		scalecolor(ip->expos, d);
+		return(0);
+	}
+	if (iscolcor(s)) {
+		COLOR	ctmp;
+		colcorval(ctmp, s);
+		multcolor(ip->expos, ctmp);
+		return(0);
+	}
 	if (!formatval(fmt, s))
 		return(0);
 	for (i = 1; i < DTend; i++)
@@ -114,11 +131,13 @@ get_cminfo(char *s, void *p)
 
 /* Load header to obtain/check data type and number of columns */
 char *
-cm_getheader(int *dt, int *nr, int *nc, FILE *fp)
+cm_getheader(int *dt, int *nr, int *nc, int *swp, COLOR scale, FILE *fp)
 {
 	CMINFO	cmi;
 						/* read header */
 	cmi.dtype = DTfromHeader;
+	cmi.need2swap = 0;
+	cmi.expos[0] = cmi.expos[1] = cmi.expos[2] = 1.f;
 	cmi.nrows = cmi.ncols = 0;
 	cmi.err = "unexpected EOF in header";
 	if (getheader(fp, get_cminfo, &cmi) < 0)
@@ -144,15 +163,62 @@ cm_getheader(int *dt, int *nr, int *nc, FILE *fp)
 		else if ((cmi.ncols > 0) & (*nc != cmi.ncols))
 			return("unexpected column count in header");
 	}
+	if (swp)				/* get/check swap? */
+		*swp = cmi.need2swap;
+	if (scale) {				/* transfer exposure comp. */
+		scale[0] = 1.f/cmi.expos[0];
+		scale[1] = 1.f/cmi.expos[1];
+		scale[2] = 1.f/cmi.expos[2];
+	}
 	return(NULL);
 }
 
+/* Allocate and load image data into matrix */
+static CMATRIX *
+cm_load_rgbe(FILE *fp, int nrows, int ncols, COLOR scale)
+{
+	int	doscale;
+	CMATRIX	*cm;
+	COLORV	*mp;
+						/* header already loaded */
+	if ((nrows <= 0) | (ncols <= 0) && !fscnresolu(&ncols, &nrows, fp)) {
+		error(USER, "bad picture resolution string");
+		return(NULL);
+	}
+	cm = cm_alloc(nrows, ncols);
+	if (!cm)
+		return(NULL);
+	doscale = (scale[0] < .99) | (scale[0] > 1.01) |
+			(scale[1] < .99) | (scale[1] > 1.01) |
+			(scale[2] < .99) | (scale[2] > 1.01) ;
+	mp = cm->cmem;
+	while (nrows--) {
+		if (freadscan((COLOR *)mp, ncols, fp) < 0) {
+			error(USER, "error reading color picture as matrix");
+			cm_free(cm);
+			return(NULL);
+		}
+		if (doscale) {
+			int	i = ncols;
+			while (i--) {
+				*mp++ *= scale[0];
+				*mp++ *= scale[1];
+				*mp++ *= scale[2];
+			}
+		} else
+			mp += 3*ncols;
+	}					/* caller closes stream */
+	return(cm);
+}
+
 /* Allocate and load a matrix from the given input (or stdin if NULL) */
 CMATRIX *
 cm_load(const char *inspec, int nrows, int ncols, int dtype)
 {
 	const int	ROWINC = 2048;
 	FILE		*fp = stdin;
+	int		swap = 0;
+	COLOR		scale;
 	CMATRIX		*cm;
 
 	if (!inspec)
@@ -173,7 +239,7 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 	if (dtype != DTascii)
 		SET_FILE_BINARY(fp);		/* doesn't really work */
 	if (!dtype | !ncols) {			/* expecting header? */
-		char	*err = cm_getheader(&dtype, &nrows, &ncols, fp);
+		char	*err = cm_getheader(&dtype, &nrows, &ncols, &swap, scale, fp);
 		if (err)
 			error(USER, err);
 		if (ncols <= 0)
@@ -184,6 +250,10 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 	case DTfloat:
 	case DTdouble:
 		break;
+	case DTrgbe:
+	case DTxyze:
+		cm = cm_load_rgbe(fp, nrows, ncols, scale);
+		goto cleanup;
 	default:
 		error(USER, "unexpected data type in cm_load()");
 	}
@@ -297,6 +367,13 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 				error(WARNING, errmsg);
 		}
 	}
+	if (swap) {
+		if (dtype == DTfloat)
+			swap32((char *)cm->cmem, 3*cm->nrows*cm->ncols);
+		else if (dtype == DTdouble)
+			swap64((char *)cm->cmem, 3*cm->nrows*cm->ncols);
+	}
+cleanup:
 	if (fp != stdin) {
 		if (inspec[0] != '!')
 			fclose(fp);
@@ -313,6 +390,7 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 EOFerror:
 	sprintf(errmsg, "unexpected EOF reading %s", inspec);
 	error(USER, errmsg);
+	return(NULL);
 not_handled:
 	error(INTERNAL, "unhandled data size or length in cm_load()");
 	return(NULL);	/* gratis return */