--- ray/src/util/cmatrix.c	2019/08/12 18:28:37	2.21
+++ ray/src/util/cmatrix.c	2019/10/23 17:00:14	2.23
@@ -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.23 2019/10/23 17:00:14 greg Exp $";
 #endif
 /*
  * Color matrix routines.
@@ -81,6 +81,7 @@ cm_resize(CMATRIX *cm, int nrows)
 
 typedef struct {
 	int	dtype;		/* data type */
+	int	need2swap;	/* need byte swap? */
 	int	nrows, ncols;	/* matrix size */
 	char	*err;		/* error message */
 } CMINFO;		/* header info record */
@@ -104,6 +105,10 @@ 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 (!formatval(fmt, s))
 		return(0);
 	for (i = 1; i < DTend; i++)
@@ -114,11 +119,12 @@ 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, FILE *fp)
 {
 	CMINFO	cmi;
 						/* read header */
 	cmi.dtype = DTfromHeader;
+	cmi.need2swap = 0;
 	cmi.nrows = cmi.ncols = 0;
 	cmi.err = "unexpected EOF in header";
 	if (getheader(fp, get_cminfo, &cmi) < 0)
@@ -144,15 +150,44 @@ 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;
 	return(NULL);
 }
 
+/* Allocate and load image data into matrix */
+static CMATRIX *
+cm_load_rgbe(FILE *fp, int nrows, int ncols)
+{
+	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);
+	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);
+		}
+		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;
 	CMATRIX		*cm;
 
 	if (!inspec)
@@ -173,7 +208,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, fp);
 		if (err)
 			error(USER, err);
 		if (ncols <= 0)
@@ -184,6 +219,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);
+		goto cleanup;
 	default:
 		error(USER, "unexpected data type in cm_load()");
 	}
@@ -297,6 +336,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 +359,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 */