--- ray/src/util/rmatrix.c	2019/08/12 20:38:19	2.34
+++ ray/src/util/rmatrix.c	2019/12/28 18:05:14	2.39
@@ -1,14 +1,11 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.34 2019/08/12 20:38:19 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.39 2019/12/28 18:05:14 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,10 @@ 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 (!formatval(fmt, s)) {
 		rmx_addinfo(ip, s);
 		return(0);
@@ -137,6 +139,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];
 	    }
@@ -149,9 +153,12 @@ rmx_load_double(RMATRIX *rm, FILE *fp)
 	int	i, j;
 
 	for (i = 0; i < rm->nrows; i++)
-	    for (j = 0; j < rm->ncols; j++)
+	    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 (rm->swapin)
+		    swap64((char *)&rmx_lval(rm,i,j,0), rm->ncomp);
+	    }
 	return(1);
 }
 
@@ -192,7 +199,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,6 +224,7 @@ 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;
 	if (getheader(fp, get_dminfo, &dinfo) < 0) {
 		fclose(fp);
@@ -243,17 +251,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;
@@ -395,6 +405,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 */
@@ -640,7 +652,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);