--- ray/src/util/rmatrix.c	2014/07/24 16:28:17	2.4
+++ ray/src/util/rmatrix.c	2022/03/14 23:28:14	2.57
@@ -1,45 +1,125 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.4 2014/07/24 16:28:17 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.57 2022/03/14 23:28: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"
 #include "resolu.h"
+#include "paths.h"
 #include "rmatrix.h"
+#if !defined(_WIN32) && !defined(_WIN64)
+#include <sys/mman.h>
+#endif
 
-typedef struct {
-	int	nrows, ncols, ncomp;
-	int	dtype;
-} DMINFO;
+static char	rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
 
-/* Allocate a nr x nc matrix with n components */
+#define array_size(rm)	(sizeof(double)*(rm)->nrows*(rm)->ncols*(rm)->ncomp)
+#define mapped_size(rm)	((char *)(rm)->mtx + array_size(rm) - (char *)(rm)->mapped)
+
+/* Initialize a RMATRIX struct but don't allocate array space */
 RMATRIX *
+rmx_new(int nr, int nc, int n)
+{
+	RMATRIX	*dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX));
+
+	if (dnew) {
+		dnew->dtype = DTdouble;
+		dnew->nrows = nr;
+		dnew->ncols = nc;
+		dnew->ncomp = n;
+	}
+	return(dnew);
+}
+
+/* Prepare a RMATRIX for writing (allocate array if needed) */
+int
+rmx_prepare(RMATRIX *rm)
+{
+	if (!rm) return(0);
+	if (rm->mtx)
+		return(1);
+	rm->mtx = (double *)malloc(array_size(rm));
+	return(rm->mtx != NULL);
+}
+
+/* Call rmx_new() and rmx_prepare() */
+RMATRIX	*
 rmx_alloc(int nr, int nc, int n)
 {
-	RMATRIX	*dnew;
+	RMATRIX	*dnew = rmx_new(nr, nc, 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));
-	if (dnew == NULL)
-		return(NULL);
-	dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n;
+	if (dnew && !rmx_prepare(dnew)) {
+		rmx_free(dnew);
+		dnew = NULL;
+	}
 	return(dnew);
 }
 
+/* Free a RMATRIX array */
+void
+rmx_free(RMATRIX *rm)
+{
+	if (!rm) return;
+	if (rm->info)
+		free(rm->info);
+#ifdef MAP_FILE
+	if (rm->mapped)
+		munmap(rm->mapped, mapped_size(rm));
+	else
+#endif
+		free(rm->mtx);
+	free(rm);
+}
+
+/* Resolve data type based on two input types (returns 0 for mismatch) */
+int
+rmx_newtype(int dtyp1, int dtyp2)
+{
+	if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) |
+			(dtyp2==DTxyze) | (dtyp2==DTrgbe)
+			&& dtyp1 != dtyp2)
+		return(0);
+	if (dtyp1 < dtyp2)
+		return(dtyp1);
+	return(dtyp2);
+}
+
+/* Append header information associated with matrix data */
+int
+rmx_addinfo(RMATRIX *rm, const char *info)
+{
+	int	oldlen = 0;
+
+	if (!rm || !info || !*info)
+		return(0);
+	if (!rm->info) {
+		rm->info = (char *)malloc(strlen(info)+1);
+		if (rm->info) rm->info[0] = '\0';
+	} else {
+		oldlen = strlen(rm->info);
+		rm->info = (char *)realloc(rm->info,
+				oldlen+strlen(info)+1);
+	}
+	if (!rm->info)
+		return(0);
+	strcpy(rm->info+oldlen, info);
+	return(1);
+}
+
 static int
 get_dminfo(char *s, void *p)
 {
-	DMINFO	*ip = (DMINFO *)p;
-	char	fmt[32];
+	RMATRIX	*ip = (RMATRIX *)p;
+	char	fmt[MAXFMTLEN];
 	int	i;
 
+	if (headidval(fmt, s))
+		return(0);
 	if (!strncmp(s, "NCOMP=", 6)) {
 		ip->ncomp = atoi(s+6);
 		return(0);
@@ -52,8 +132,25 @@ get_dminfo(char *s, void *p)
 		ip->ncols = atoi(s+6);
 		return(0);
 	}
-	if (!formatval(fmt, s))
+	if ((i = isbigendian(s)) >= 0) {
+		ip->swapin = (nativebigendian() != i);
 		return(0);
+	}
+	if (isexpos(s)) {
+		float	f = exposval(s);
+		scalecolor(ip->cexp, f);
+		return(0);
+	}
+	if (iscolcor(s)) {
+		COLOR	ctmp;
+		colcorval(ctmp, s);
+		multcolor(ip->cexp, ctmp);
+		return(0);
+	}
+	if (!formatval(fmt, s)) {
+		rmx_addinfo(ip, s);
+		return(0);
+	}			/* else check format */
 	for (i = 1; i < DTend; i++)
 		if (!strcmp(fmt, cm_fmt_id[i])) {
 			ip->dtype = i;
@@ -66,14 +163,16 @@ static int
 rmx_load_ascii(RMATRIX *rm, FILE *fp)
 {
 	int	i, j, k;
-#ifdef _WIN32
-	_setmode(fileno(fp), _O_TEXT);
-#endif
+
+	if (!rmx_prepare(rm))
+		return(0);
 	for (i = 0; i < rm->nrows; i++)
-	    for (j = 0; j < rm->ncols; j++)
+	    for (j = 0; j < rm->ncols; j++) {
+	    	double	*dp = rmx_lval(rm,i,j);
 	        for (k = 0; k < rm->ncomp; k++)
-		    if (fscanf(fp, "%lf", &rmx_lval(rm,i,j,k)) != 1)
+		    if (fscanf(fp, "%lf", &dp[k]) != 1)
 			return(0);
+	    }
 	return(1);
 }
 
@@ -87,12 +186,17 @@ rmx_load_float(RMATRIX *rm, FILE *fp)
 		fputs("Unsupported # components in rmx_load_float()\n", stderr);
 		exit(1);
 	}
+	if (!rmx_prepare(rm))
+		return(0);
 	for (i = 0; i < rm->nrows; i++)
 	    for (j = 0; j < rm->ncols; j++) {
-		if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+	    	double	*dp = rmx_lval(rm,i,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];
+		     dp[k] = val[k];
 	    }
 	return(1);
 }
@@ -100,20 +204,29 @@ rmx_load_float(RMATRIX *rm, FILE *fp)
 static int
 rmx_load_double(RMATRIX *rm, FILE *fp)
 {
-	int	i, j, k;
-	double	val[100];
-
-	if (rm->ncomp > 100) {
-		fputs("Unsupported # components in rmx_load_double()\n", stderr);
-		exit(1);
+	int	i;
+#ifdef MAP_FILE
+	long	pos;		/* map memory for file > 1MB if possible */
+	if (!rm->swapin && array_size(rm) >= 1L<<20 &&
+			(pos = ftell(fp)) >= 0 && !(pos % sizeof(double))) {
+		rm->mapped = mmap(NULL, array_size(rm)+pos, PROT_READ|PROT_WRITE,
+					MAP_PRIVATE, fileno(fp), 0);
+		if (rm->mapped != MAP_FAILED) {
+			rm->mtx = (double *)rm->mapped + pos/sizeof(double);
+			return(1);
+		}		/* else fall back on reading into memory */
+		rm->mapped = NULL;
 	}
-	for (i = 0; i < rm->nrows; i++)
-	    for (j = 0; j < rm->ncols; j++) {
-		if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
-		    return(0);
-	        for (k = rm->ncomp; k--; )
-		     rmx_lval(rm,i,j,k) = val[k];
-	    }
+#endif
+	if (!rmx_prepare(rm))
+		return(0);
+	for (i = 0; i < rm->nrows; i++) {
+		if (getbinary(rmx_lval(rm,i,0), sizeof(double)*rm->ncomp,
+					rm->ncols, fp) != rm->ncols)
+			return(0);
+		if (rm->swapin)
+			swap64((char *)rmx_lval(rm,i,0), rm->ncols*rm->ncomp);
+	}
 	return(1);
 }
 
@@ -123,17 +236,20 @@ rmx_load_rgbe(RMATRIX *rm, FILE *fp)
 	COLOR	*scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols);
 	int	i, j;
 
-	if (scan == NULL)
+	if (!scan)
 		return(0);
+	if (!rmx_prepare(rm))
+		return(0);
 	for (i = 0; i < rm->nrows; i++) {
+	    double	*dp = rmx_lval(rm,i,0);
 	    if (freadscan(scan, rm->ncols, fp) < 0) {
 		free(scan);
 		return(0);
 	    }
-	    for (j = rm->ncols; j--; ) {
-	        rmx_lval(rm,i,j,0) = colval(scan[j],RED);
-	        rmx_lval(rm,i,j,1) = colval(scan[j],GRN);
-	        rmx_lval(rm,i,j,2) = colval(scan[j],BLU);
+	    for (j = 0; j < rm->ncols; j++, dp += 3) {
+	        dp[0] = colval(scan[j],RED);
+	        dp[1] = colval(scan[j],GRN);
+	        dp[2] = colval(scan[j],BLU);
 	    }
 	}
 	free(scan);
@@ -142,85 +258,116 @@ rmx_load_rgbe(RMATRIX *rm, FILE *fp)
 
 /* Load matrix from supported file type */
 RMATRIX *
-rmx_load(const char *fname)
+rmx_load(const char *inspec, RMPref rmp)
 {
-	FILE		*fp = stdin;
-	DMINFO		dinfo;
+	FILE		*fp;
 	RMATRIX		*dnew;
 
-	if (fname == NULL) {			/* reading from stdin? */
-		fname = "<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);
 	} else {
-		const char	*sp = fname;	/* check suffix */
+		const char	*sp = inspec;	/* check suffix */
 		while (*sp)
 			++sp;
-		while (sp > fname && sp[-1] != '.')
+		while (sp > inspec && sp[-1] != '.')
 			--sp;
 		if (!strcasecmp(sp, "XML")) {	/* assume it's a BSDF */
-			CMATRIX	*cm = cm_loadBTDF((char *)fname);
-			if (cm == NULL)
+			CMATRIX	*cm = rmp==RMPtrans ? cm_loadBTDF(inspec) :
+					cm_loadBRDF(inspec, rmp==RMPreflB) ;
+			if (!cm)
 				return(NULL);
 			dnew = rmx_from_cmatrix(cm);
 			cm_free(cm);
+			dnew->dtype = DTascii;
 			return(dnew);
 		}
 						/* else open it ourselves */
-		if ((fp = fopen(fname, "rb")) == NULL)
+		if (!(fp = fopen(inspec, "r")))
 			return(NULL);
 	}
+	SET_FILE_BINARY(fp);
 #ifdef getc_unlocked
 	flockfile(fp);
 #endif
-	dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0;
-	dinfo.dtype = DTascii;
-	if (getheader(fp, get_dminfo, &dinfo) < 0) {
+	if (!(dnew = rmx_new(0,0,3))) {
 		fclose(fp);
 		return(NULL);
 	}
-	if ((dinfo.nrows <= 0) | (dinfo.ncols <= 0)) {
-		if (!fscnresolu(&dinfo.ncols, &dinfo.nrows, fp)) {
+	dnew->dtype = DTascii;			/* assumed w/o FORMAT */
+	dnew->cexp[0] = dnew->cexp[1] = dnew->cexp[2] = 1.f;
+	if (getheader(fp, get_dminfo, dnew) < 0) {
+		fclose(fp);
+		return(NULL);
+	}
+	if ((dnew->nrows <= 0) | (dnew->ncols <= 0)) {
+		if (!fscnresolu(&dnew->ncols, &dnew->nrows, fp)) {
 			fclose(fp);
 			return(NULL);
 		}
-		if (dinfo.ncomp <= 0)
-			dinfo.ncomp = 3;
-		else if ((dinfo.dtype == DTrgbe) | (dinfo.dtype == DTxyze) &&
-				dinfo.ncomp != 3) {
+		if ((dnew->dtype == DTrgbe) | (dnew->dtype == DTxyze) &&
+				dnew->ncomp != 3) {
 			fclose(fp);
 			return(NULL);
 		}
 	}
-	dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp);
-	if (dnew == NULL) {
-		fclose(fp);
-		return(NULL);
-	}
-	switch (dinfo.dtype) {
+	switch (dnew->dtype) {
 	case DTascii:
+		SET_FILE_TEXT(fp);
 		if (!rmx_load_ascii(dnew, fp))
 			goto loaderr;
+		dnew->dtype = DTascii;		/* should leave double? */
 		break;
 	case DTfloat:
 		if (!rmx_load_float(dnew, fp))
 			goto loaderr;
+		dnew->dtype = DTfloat;
 		break;
 	case DTdouble:
 		if (!rmx_load_double(dnew, fp))
 			goto loaderr;
+		dnew->dtype = DTdouble;
 		break;
 	case DTrgbe:
 	case DTxyze:
 		if (!rmx_load_rgbe(dnew, fp))
 			goto loaderr;
+						/* undo exposure? */
+		if ((dnew->cexp[0] != 1.f) | (dnew->cexp[1] != 1.f) |
+				(dnew->cexp[2] != 1.f)) {
+			double	cmlt[3];
+			cmlt[0] = 1./dnew->cexp[0];
+			cmlt[1] = 1./dnew->cexp[1];
+			cmlt[2] = 1./dnew->cexp[2];
+			rmx_scale(dnew, cmlt);
+		}
+		dnew->swapin = 0;
 		break;
 	default:
 		goto loaderr;
 	}
-	if (fp != stdin)
-		fclose(fp);
+	if (fp != stdin) {
+		if (inspec[0] == '!')
+			pclose(fp);
+		else
+			fclose(fp);
+	}
+#ifdef getc_unlocked
+	else
+		funlockfile(fp);
+#endif
 	return(dnew);
 loaderr:					/* should report error? */
-	fclose(fp);
+	if (inspec[0] == '!')
+		pclose(fp);
+	else
+		fclose(fp);
 	rmx_free(dnew);
 	return(NULL);
 }
@@ -228,14 +375,16 @@ loaderr:					/* should report error? */
 static int
 rmx_write_ascii(const RMATRIX *rm, FILE *fp)
 {
+	const char	*fmt = (rm->dtype == DTfloat) ? " %.7e" :
+			(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" :
+				" %.15e" ;
 	int	i, j, k;
-#ifdef _WIN32
-	_setmode(fileno(fp), _O_TEXT);
-#endif
+
 	for (i = 0; i < rm->nrows; i++) {
 	    for (j = 0; j < rm->ncols; j++) {
+		const double	*dp = rmx_lval(rm,i,j);
 	        for (k = 0; k < rm->ncomp; k++)
-		    fprintf(fp, " %.15e", rmx_lval(rm,i,j,k));
+		    fprintf(fp, fmt, dp[k]);
 		fputc('\t', fp);
 	    }
 	    fputc('\n', fp);
@@ -255,9 +404,10 @@ rmx_write_float(const RMATRIX *rm, FILE *fp)
 	}
 	for (i = 0; i < rm->nrows; i++)
 	    for (j = 0; j < rm->ncols; j++) {
+	    	const double	*dp = rmx_lval(rm,i,j);
 	        for (k = rm->ncomp; k--; )
-		    val[k] = (float)rmx_lval(rm,i,j,k);
-		if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+		    val[k] = (float)dp[k];
+		if (putbinary(val, sizeof(float), rm->ncomp, fp) != rm->ncomp)
 			return(0);
 	    }
 	return(1);
@@ -266,37 +416,32 @@ rmx_write_float(const RMATRIX *rm, FILE *fp)
 static int
 rmx_write_double(const RMATRIX *rm, FILE *fp)
 {
-	int	i, j, k;
-	double	val[100];
+	int	i;
 
-	if (rm->ncomp > 100) {
-		fputs("Unsupported # components in rmx_write_double()\n", stderr);
-		exit(1);
-	}
 	for (i = 0; i < rm->nrows; i++)
-	    for (j = 0; j < rm->ncols; j++) {
-	        for (k = rm->ncomp; k--; )
-		    val[k] = rmx_lval(rm,i,j,k);
-		if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+		if (putbinary(rmx_lval(rm,i,0), sizeof(double)*rm->ncomp,
+					rm->ncols, fp) != rm->ncols)
 			return(0);
-	    }
 	return(1);
 }
 
 static int
 rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
 {
-	COLOR	*scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols);
+	COLR	*scan = (COLR *)malloc(sizeof(COLR)*rm->ncols);
 	int	i, j;
 
-	if (scan == NULL)
+	if (!scan)
 		return(0);
 	for (i = 0; i < rm->nrows; i++) {
-	    for (j = rm->ncols; j--; )
-	        setcolor(scan[j],	rmx_lval(rm,i,j,0),
-					rmx_lval(rm,i,j,1),
-					rmx_lval(rm,i,j,2)	);
-	    if (fwritescan(scan, rm->ncols, fp) < 0) {
+	    for (j = rm->ncols; j--; ) {
+	    	const double	*dp = rmx_lval(rm,i,j);
+	    	if (rm->ncomp == 1)
+	    		setcolr(scan[j], dp[0], dp[0], dp[0]);
+	    	else
+	        	setcolr(scan[j], dp[0], dp[1], dp[2]);
+	    }
+	    if (fwritecolrs(scan, rm->ncols, fp) < 0) {
 		free(scan);
 		return(0);
 	    }
@@ -305,31 +450,53 @@ rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
 	return(1);
 }
 
-/* Write matrix to file type indicated by dt */
-long
+/* 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)
 {
-	RMATRIX	*mydm = NULL;
 	int	ok = 1;
 
-	if ((rm == NULL) | (fp == NULL))
+	if (!rm | !fp || !rm->mtx)
 		return(0);
+#ifdef getc_unlocked
+	flockfile(fp);
+#endif
 						/* complete header */
+	if (rm->info)
+		fputs(rm->info, fp);
+	if (dtype == DTfromHeader)
+		dtype = rm->dtype;
+	else if (dtype == DTrgbe && (rm->dtype == DTxyze ||
+					findCIEprims(rm->info)))
+		dtype = DTxyze;
+	else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
+		dtype = DTrgbe;
 	if ((dtype != DTrgbe) & (dtype != DTxyze)) {
 		fprintf(fp, "NROWS=%d\n", rm->nrows);
 		fprintf(fp, "NCOLS=%d\n", rm->ncols);
 		fprintf(fp, "NCOMP=%d\n", rm->ncomp);
-	} else if (rm->ncomp != 3) {		/* wrong # components? */
-		double	cmtx[3];
-		if (rm->ncomp != 1)		/* only convert grayscale */
-			return(0);
-		cmtx[0] = cmtx[1] = cmtx[2] = 1;
-		mydm = rmx_transform(rm, 3, cmtx);
-		if (mydm == NULL)
-			return(0);
-		rm = mydm;
-	}
-	fputformat((char *)cm_fmt_id[dtype], fp);
+	} else if ((rm->ncomp != 3) & (rm->ncomp != 1))
+		return(0);			/* wrong # components */
+	if ((dtype == DTfloat) | (dtype == DTdouble))
+		fputendian(fp);			/* important to record */
+	fputformat(cm_fmt_id[dtype], fp);
 	fputc('\n', fp);
 	switch (dtype) {			/* write data */
 	case DTascii:
@@ -350,8 +517,10 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 		return(0);
 	}
 	ok &= (fflush(fp) == 0);
-	rmx_free(mydm);
-	return(ftell(fp) * ok);		/* return # bytes written */
+#ifdef getc_unlocked
+	funlockfile(fp);
+#endif
+	return(ok);
 }
 
 /* Allocate and assign square identity matrix with n components */
@@ -359,16 +528,16 @@ RMATRIX *
 rmx_identity(const int dim, const int n)
 {
 	RMATRIX	*rid = rmx_alloc(dim, dim, n);
-	int	i;
+	int	i, k;
 
-	if (rid == NULL)
+	if (!rid)
 		return(NULL);
-	memset(rid->mtx, 0, sizeof(rid->mtx[0])*dim*dim);
-	for (i = dim; i--; )
-		rmx_lval(rid,i,i,0) = 1;
-	for (i = n; --i; )
-		memcpy(rid->mtx+i*(dim*dim), rid->mtx,
-				sizeof(rid->mtx[0])*dim*dim);
+	memset(rid->mtx, 0, array_size(rid));
+	for (i = dim; i--; ) {
+	    double	*dp = rmx_lval(rid,i,i);
+	    for (k = n; k--; )
+		dp[k] = 1.;
+	}
 	return(rid);
 }
 
@@ -378,13 +547,14 @@ rmx_copy(const RMATRIX *rm)
 {
 	RMATRIX	*dnew;
 
-	if (rm == NULL)
+	if (!rm)
 		return(NULL);
 	dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp);
-	if (dnew == NULL)
+	if (!dnew)
 		return(NULL);
-	memcpy(dnew->mtx, rm->mtx,
-		sizeof(rm->mtx[0])*rm->ncomp*rm->nrows*rm->ncols);
+	rmx_addinfo(dnew, rm->info);
+	dnew->dtype = rm->dtype;
+	memcpy(dnew->mtx, rm->mtx, array_size(dnew));
 	return(dnew);
 }
 
@@ -393,17 +563,30 @@ RMATRIX *
 rmx_transpose(const RMATRIX *rm)
 {
 	RMATRIX	*dnew;
-	int	i, j, k;
+	int	i, j;
 
-	if (rm == NULL)
+	if (!rm)
 		return(0);
+	if ((rm->nrows == 1) | (rm->ncols == 1)) {
+		dnew = rmx_copy(rm);
+		if (!dnew)
+			return(NULL);
+		dnew->nrows = rm->ncols;
+		dnew->ncols = rm->nrows;
+		return(dnew);
+	}
 	dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp);
-	if (dnew == NULL)
+	if (!dnew)
 		return(NULL);
-	for (i = dnew->nrows; i--; )
-	    for (j = dnew->ncols; j--; )
-		for (k = dnew->ncomp; k--; )
-			rmx_lval(dnew,i,j,k) = rmx_lval(rm,j,i,k);
+	if (rm->info) {
+		rmx_addinfo(dnew, rm->info);
+		rmx_addinfo(dnew, "Transposed rows and columns\n");
+	}
+	dnew->dtype = rm->dtype;
+	for (j = dnew->ncols; j--; )
+	    for (i = dnew->nrows; i--; )
+	    	memcpy(rmx_lval(dnew,i,j), rmx_lval(rm,j,i),
+	    			sizeof(double)*dnew->ncomp);
 	return(dnew);
 }
 
@@ -414,24 +597,83 @@ rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
 	RMATRIX	*mres;
 	int	i, j, k, h;
 
-	if ((m1 == NULL) | (m2 == NULL) ||
-			(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows))
+	if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows))
 		return(NULL);
 	mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp);
-	if (mres == NULL)
+	if (!mres)
 		return(NULL);
+	i = rmx_newtype(m1->dtype, m2->dtype);
+	if (i)
+		mres->dtype = i;
+	else
+		rmx_addinfo(mres, rmx_mismatch_warn);
 	for (i = mres->nrows; i--; )
 	    for (j = mres->ncols; j--; )
-	        for (h = m1->ncols; h--; ) {
-		    long double	d = 0;
-		    for (k = mres->ncomp; k--; )
-			d += (long double)rmx_lval(m1,i,h,k) *
-				(long double)rmx_lval(m2,h,j,k);
-		    rmx_lval(mres,i,j,k) = (double)d;
+	        for (k = mres->ncomp; k--; ) {
+		    double	d = 0;
+		    for (h = m1->ncols; h--; )
+			d += rmx_lval(m1,i,h)[k] * rmx_lval(m2,h,j)[k];
+		    rmx_lval(mres,i,j)[k] = d;
 		}
 	return(mres);
 }
 
+/* Element-wise multiplication (or division) of m2 into m1 */
+int
+rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide)
+{
+	int	zeroDivides = 0;
+	int	i, j, k;
+
+	if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows))
+		return(0);
+	if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp))
+		return(0);
+	i = rmx_newtype(m1->dtype, m2->dtype);
+	if (i)
+		m1->dtype = i;
+	else
+		rmx_addinfo(m1, rmx_mismatch_warn);
+	for (i = m1->nrows; i--; )
+	    for (j = m1->ncols; j--; )
+		if (divide) {
+		    double	d;
+		    if (m2->ncomp == 1) {
+			d = rmx_lval(m2,i,j)[0];
+			if (d == 0) {
+			    ++zeroDivides;
+			    for (k = m1->ncomp; k--; )
+				rmx_lval(m1,i,j)[k] = 0;
+			} else {
+			    d = 1./d;
+			    for (k = m1->ncomp; k--; )
+				rmx_lval(m1,i,j)[k] *= d;
+			}
+		    } else
+		        for (k = m1->ncomp; k--; ) {
+			    d = rmx_lval(m2,i,j)[k];
+			    if (d == 0) {
+			        ++zeroDivides;
+				rmx_lval(m1,i,j)[k] = 0;
+			    } else
+				rmx_lval(m1,i,j)[k] /= d;
+			}
+		} else {
+		    if (m2->ncomp == 1) {
+			const double	d = rmx_lval(m2,i,j)[0];
+		        for (k = m1->ncomp; k--; )
+			    rmx_lval(m1,i,j)[k] *= d;
+		    } else
+		        for (k = m1->ncomp; k--; )
+			    rmx_lval(m1,i,j)[k] *= rmx_lval(m2,i,j)[k];
+		}
+	if (zeroDivides) {
+		rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n");
+		errno = ERANGE;
+	}
+	return(1);
+}
+
 /* Sum second matrix into first, applying scale factor beforehand */
 int
 rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[])
@@ -439,25 +681,33 @@ rmx_sum(RMATRIX *msum, const RMATRIX *madd, const doub
 	double	*mysf = NULL;
 	int	i, j, k;
 
-	if ((msum == NULL) | (madd == NULL) ||
+	if (!msum | !madd ||
 			(msum->nrows != madd->nrows) |
 			(msum->ncols != madd->ncols) |
 			(msum->ncomp != madd->ncomp))
 		return(0);
-	if (sf == NULL) {
+	if (!sf) {
 		mysf = (double *)malloc(sizeof(double)*msum->ncomp);
-		if (mysf == NULL)
+		if (!mysf)
 			return(0);
 		for (k = msum->ncomp; k--; )
 			mysf[k] = 1;
 		sf = mysf;
 	}
+	i = rmx_newtype(msum->dtype, madd->dtype);
+	if (i)
+		msum->dtype = i;
+	else
+		rmx_addinfo(msum, rmx_mismatch_warn);
 	for (i = msum->nrows; i--; )
-	    for (j = msum->ncols; j--; )
+	    for (j = msum->ncols; j--; ) {
+	    	const double	*da = rmx_lval(madd,i,j);
+	    	double		*ds = rmx_lval(msum,i,j);
 		for (k = msum->ncomp; k--; )
-		     rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k);
-
-	free(mysf);
+		     ds[k] += sf[k] * da[k];
+	    }
+	if (mysf)
+		free(mysf);
 	return(1);
 }
 
@@ -467,13 +717,16 @@ rmx_scale(RMATRIX *rm, const double sf[])
 {
 	int	i, j, k;
 
-	if ((rm == NULL) | (sf == NULL))
+	if (!rm | !sf)
 		return(0);
 	for (i = rm->nrows; i--; )
-	    for (j = rm->ncols; j--; )
+	    for (j = rm->ncols; j--; ) {
+	    	double	*dp = rmx_lval(rm,i,j);
 		for (k = rm->ncomp; k--; )
-		    rmx_lval(rm,i,j,k) *= sf[k];
-
+		    dp[k] *= sf[k];
+	    }
+	if (rm->info)
+		rmx_addinfo(rm, "Applied scalar\n");
 	return(1);
 }
 
@@ -484,19 +737,29 @@ rmx_transform(const RMATRIX *msrc, int n, const double
 	int	i, j, ks, kd;
 	RMATRIX	*dnew;
 
-	if ((msrc == NULL) | (n <= 0) | (cmat == NULL))
+	if (!msrc | (n <= 0) | !cmat)
 		return(NULL);
 	dnew = rmx_alloc(msrc->nrows, msrc->ncols, n);
-	if (dnew == NULL)
+	if (!dnew)
 		return(NULL);
+	if (msrc->info) {
+		char	buf[128];
+		sprintf(buf, "Applied %dx%d component transform\n",
+				dnew->ncomp, msrc->ncomp);
+		rmx_addinfo(dnew, msrc->info);
+		rmx_addinfo(dnew, buf);
+	}
+	dnew->dtype = msrc->dtype;
 	for (i = dnew->nrows; i--; )
-	    for (j = dnew->ncols; j--; )
+	    for (j = dnew->ncols; j--; ) {
+		const double	*ds = rmx_lval(msrc,i,j);
 	        for (kd = dnew->ncomp; kd--; ) {
 		    double	d = 0;
 		    for (ks = msrc->ncomp; ks--; )
-		        d += cmat[kd*msrc->ncomp + ks] * rmx_lval(msrc,i,j,ks);
-		    rmx_lval(dnew,i,j,kd) = d;
+		        d += cmat[kd*msrc->ncomp + ks] * ds[ks];
+		    rmx_lval(dnew,i,j)[kd] = d;
 		}
+	    }
 	return(dnew);
 }
 
@@ -507,17 +770,19 @@ rmx_from_cmatrix(const CMATRIX *cm)
 	int	i, j;
 	RMATRIX	*dnew;
 
-	if (cm == NULL)
+	if (!cm)
 		return(NULL);
 	dnew = rmx_alloc(cm->nrows, cm->ncols, 3);
-	if (dnew == NULL)
+	if (!dnew)
 		return(NULL);
+	dnew->dtype = DTfloat;
 	for (i = dnew->nrows; i--; )
 	    for (j = dnew->ncols; j--; ) {
 		const COLORV	*cv = cm_lval(cm,i,j);
-		rmx_lval(dnew,i,j,0) = cv[0];
-		rmx_lval(dnew,i,j,1) = cv[1];
-		rmx_lval(dnew,i,j,2) = cv[2];
+		double		*dp = rmx_lval(dnew,i,j);
+		dp[0] = cv[0];
+		dp[1] = cv[1];
+		dp[2] = cv[2];
 	    }
 	return(dnew);
 }
@@ -529,17 +794,19 @@ cm_from_rmatrix(const RMATRIX *rm)
 	int	i, j;
 	CMATRIX	*cnew;
 
-	if (rm == NULL || rm->ncomp != 3)
+	if (!rm || !rm->mtx | ((rm->ncomp != 3) & (rm->ncomp != 1)))
 		return(NULL);
 	cnew = cm_alloc(rm->nrows, rm->ncols);
-	if (cnew == NULL)
+	if (!cnew)
 		return(NULL);
 	for (i = cnew->nrows; i--; )
 	    for (j = cnew->ncols; j--; ) {
-		COLORV	*cv = cm_lval(cnew,i,j);
-		cv[0] = (COLORV)rmx_lval(rm,i,j,0);
-		cv[1] = (COLORV)rmx_lval(rm,i,j,1);
-		cv[2] = (COLORV)rmx_lval(rm,i,j,2);
+		const double	*dp = rmx_lval(rm,i,j);
+		COLORV		*cv = cm_lval(cnew,i,j);
+		if (rm->ncomp == 1)
+		    setcolor(cv, dp[0], dp[0], dp[0]);
+		else
+	    	    setcolor(cv, dp[0], dp[1], dp[2]);
 	    }
 	return(cnew);
 }