--- ray/src/util/rmatrix.c	2022/03/11 01:11:13	2.56
+++ ray/src/util/rmatrix.c	2025/04/16 22:56:12	2.94
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.56 2022/03/11 01:11:13 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.94 2025/04/16 22:56:12 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -16,23 +16,28 @@ static const char RCSid[] = "$Id: rmatrix.c,v 2.56 202
 #include <sys/mman.h>
 #endif
 
-static char	rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
+static const char	rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
 
-#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));
+	RMATRIX	*dnew;
 
-	if (dnew) {
-		dnew->dtype = DTdouble;
-		dnew->nrows = nr;
-		dnew->ncols = nc;
-		dnew->ncomp = n;
-	}
+	if (n <= 0)
+		return(NULL);
+
+	dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX));
+	if (!dnew)
+		return(NULL);
+
+	dnew->dtype = DTrmx_native;
+	dnew->nrows = nr;
+	dnew->ncols = nc;
+	dnew->ncomp = n;
+	setcolor(dnew->cexp, 1.f, 1.f, 1.f);
+	memcpy(dnew->wlpart, WLPART, sizeof(dnew->wlpart));
+
 	return(dnew);
 }
 
@@ -41,9 +46,12 @@ int
 rmx_prepare(RMATRIX *rm)
 {
 	if (!rm) return(0);
-	if (rm->mtx)
+	if (rm->mtx)			/* assume it's right size */
 		return(1);
-	rm->mtx = (double *)malloc(array_size(rm));
+	if ((rm->nrows <= 0) | (rm->ncols <= 0) | (rm->ncomp <= 0))
+		return(0);
+	rm->mtx = (rmx_dtype *)malloc(rmx_array_size(rm));
+	rm->pflags |= RMF_FREEMEM;
 	return(rm->mtx != NULL);
 }
 
@@ -53,26 +61,41 @@ rmx_alloc(int nr, int nc, int n)
 {
 	RMATRIX	*dnew = rmx_new(nr, nc, n);
 
-	if (dnew && !rmx_prepare(dnew)) {
+	if (!rmx_prepare(dnew)) {
 		rmx_free(dnew);
-		dnew = NULL;
+		return(NULL);
 	}
 	return(dnew);
 }
 
-/* Free a RMATRIX array */
+/* Clear state by freeing info and matrix data */
 void
-rmx_free(RMATRIX *rm)
+rmx_reset(RMATRIX *rm)
 {
 	if (!rm) return;
-	if (rm->info)
+	if (rm->info) {
 		free(rm->info);
+		rm->info = NULL;
+	}
 #ifdef MAP_FILE
-	if (rm->mapped)
-		munmap(rm->mapped, mapped_size(rm));
-	else
+	if (rm->mapped) {
+		munmap(rm->mapped, rmx_mapped_size(rm));
+		rm->mapped = NULL;
+	} else
 #endif
+	if (rm->pflags & RMF_FREEMEM) {
 		free(rm->mtx);
+		rm->pflags &= ~RMF_FREEMEM;
+	}
+	rm->mtx = NULL;
+}
+
+/* Free an RMATRIX struct and data */
+void
+rmx_free(RMATRIX *rm)
+{
+	if (!rm) return;
+	rmx_reset(rm);
 	free(rm);
 }
 
@@ -80,8 +103,8 @@ rmx_free(RMATRIX *rm)
 int
 rmx_newtype(int dtyp1, int dtyp2)
 {
-	if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) |
-			(dtyp2==DTxyze) | (dtyp2==DTrgbe)
+	if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) | (dtyp1==DTspec) |
+			(dtyp2==DTxyze) | (dtyp2==DTrgbe) | (dtyp2==DTspec)
 			&& dtyp1 != dtyp2)
 		return(0);
 	if (dtyp1 < dtyp2)
@@ -93,13 +116,12 @@ rmx_newtype(int dtyp1, int dtyp2)
 int
 rmx_addinfo(RMATRIX *rm, const char *info)
 {
-	int	oldlen = 0;
+	size_t	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,
@@ -118,35 +140,41 @@ get_dminfo(char *s, void *p)
 	char	fmt[MAXFMTLEN];
 	int	i;
 
-	if (headidval(fmt, s))
+	if (isheadid(s))
 		return(0);
-	if (!strncmp(s, "NCOMP=", 6)) {
-		ip->ncomp = atoi(s+6);
-		return(0);
+	if (isncomp(s)) {
+		ip->ncomp = ncompval(s);
+		return(ip->ncomp - 1);
 	}
 	if (!strncmp(s, "NROWS=", 6)) {
 		ip->nrows = atoi(s+6);
-		return(0);
+		return(ip->nrows - 1);
 	}
 	if (!strncmp(s, "NCOLS=", 6)) {
 		ip->ncols = atoi(s+6);
-		return(0);
+		return(ip->ncols - 1);
 	}
 	if ((i = isbigendian(s)) >= 0) {
-		ip->swapin = (nativebigendian() != i);
+		if (nativebigendian() != i)
+			ip->pflags |= RMF_SWAPIN;
+		else
+			ip->pflags &= ~RMF_SWAPIN;
 		return(0);
 	}
 	if (isexpos(s)) {
 		float	f = exposval(s);
 		scalecolor(ip->cexp, f);
-		return(0);
+		return(f > .0 ? 0 : -1);
 	}
 	if (iscolcor(s)) {
 		COLOR	ctmp;
-		colcorval(ctmp, s);
+		if (!colcorval(ctmp, s)) return(-1);
 		multcolor(ip->cexp, ctmp);
 		return(0);
 	}
+	if (iswlsplit(s))
+		return(wlsplitval(ip->wlpart, s) - 1);
+
 	if (!formatval(fmt, s)) {
 		rmx_addinfo(ip, s);
 		return(0);
@@ -156,203 +184,258 @@ get_dminfo(char *s, void *p)
 			ip->dtype = i;
 			return(0);
 		}
-	return(-1);
+	return(-1);		/* bad format */
 }
 
 static int
-rmx_load_ascii(RMATRIX *rm, FILE *fp)
+rmx_load_ascii(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
-	int	i, j, k;
+	int	j, k;
 
-	if (!rmx_prepare(rm))
-		return(0);
-	for (i = 0; i < rm->nrows; i++)
-	    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", &dp[k]) != 1)
-			return(0);
-	    }
+	for (j = 0; j < rm->ncols; j++)
+	        for (k = rm->ncomp; k-- > 0; )
+			if (fscanf(fp, rmx_scanfmt, drp++) != 1)
+				return(0);
 	return(1);
 }
 
 static int
-rmx_load_float(RMATRIX *rm, FILE *fp)
+rmx_load_float(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
-	int	i, j, k;
-	float	val[100];
+#if DTrmx_native==DTfloat
+	if (getbinary(drp, sizeof(*drp)*rm->ncomp, rm->ncols, fp) != rm->ncols)
+		return(0);
+	if (rm->pflags & RMF_SWAPIN)
+		swap32((char *)drp, rm->ncols*rm->ncomp);
+#else
+	int	j, k;
+	float	val[MAXCOMP];
 
-	if (rm->ncomp > 100) {
+	if (rm->ncomp > MAXCOMP) {
 		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++) {
-	    	double	*dp = rmx_lval(rm,i,j);
+	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--; )
-		     dp[k] = val[k];
-	    }
+			return(0);
+		if (rm->pflags & RMF_SWAPIN)
+			swap32((char *)val, rm->ncomp);
+	        for (k = 0; k < rm->ncomp; k++)
+			*drp++ = val[k];
+	}
+#endif
 	return(1);
 }
 
 static int
-rmx_load_double(RMATRIX *rm, FILE *fp)
+rmx_load_double(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
-	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;
+#if DTrmx_native==DTdouble
+	if (getbinary(drp, sizeof(*drp)*rm->ncomp, rm->ncols, fp) != rm->ncols)
+		return(0);
+	if (rm->pflags & RMF_SWAPIN)
+		swap64((char *)drp, rm->ncols*rm->ncomp);
+#else
+	int	j, k;
+	double	val[MAXCOMP];
+
+	if (rm->ncomp > MAXCOMP) {
+		fputs("Unsupported # components in rmx_load_double()\n", stderr);
+		exit(1);
 	}
+	for (j = 0; j < rm->ncols; j++) {
+		if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+			return(0);
+		if (rm->pflags & RMF_SWAPIN)
+			swap64((char *)val, rm->ncomp);
+	        for (k = 0; k < rm->ncomp; k++)
+			*drp++ = (float)val[k];
+	}
 #endif
-	if (!rmx_prepare(rm))
+	return(1);
+}
+
+static int
+rmx_load_rgbe(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
+{
+	COLR	*scan;
+	COLOR	col;
+	int	j;
+
+	if (rm->ncomp != 3)
 		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);
+	scan = (COLR *)tempbuffer(sizeof(COLR)*rm->ncols);
+	if (!scan)
+		return(0);
+	if (freadcolrs(scan, rm->ncols, fp) < 0)
+		return(0);
+	for (j = 0; j < rm->ncols; j++) {
+		colr_color(col, scan[j]);
+		*drp++ = colval(col,RED);
+		*drp++ = colval(col,GRN);
+		*drp++ = colval(col,BLU);
 	}
 	return(1);
 }
 
 static int
-rmx_load_rgbe(RMATRIX *rm, FILE *fp)
+rmx_load_spec(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
-	COLOR	*scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols);
-	int	i, j;
+	COLRV	*scan;
+	COLORV	scol[MAXCOMP];
+	int	j, k;
 
+	if ((rm->ncomp < 3) | (rm->ncomp > MAXCOMP))
+		return(0);
+	scan = (COLRV *)tempbuffer((rm->ncomp+1)*rm->ncols);
 	if (!scan)
 		return(0);
-	if (!rmx_prepare(rm))
+	if (freadscolrs(scan, rm->ncomp, rm->ncols, fp) < 0)
 		return(0);
-	for (i = 0; i < rm->nrows; i++) {
-	    double	*dp = rmx_lval(rm,i,j);
-	    if (freadscan(scan, rm->ncols, fp) < 0) {
-		free(scan);
+	for (j = 0; j < rm->ncols; j++) {
+		scolr2scolor(scol, scan+j*(rm->ncomp+1), rm->ncomp);
+		for (k = 0; k < rm->ncomp; k++)
+			*drp++ = scol[k];
+	}
+	return(1);
+}
+
+/* Read matrix header from input stream (cannot be XML) */
+int
+rmx_load_header(RMATRIX *rm, FILE *fp)
+{
+	if (!rm | !fp)
 		return(0);
-	    }
-	    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);
-	    }
+	rmx_reset(rm);				/* clear state */
+	if (rm->nrows | rm->ncols | !rm->dtype) {
+		rm->nrows = rm->ncols = 0;
+		rm->ncomp = 3;
+		setcolor(rm->cexp, 1.f, 1.f, 1.f);
+		memcpy(rm->wlpart, WLPART, sizeof(rm->wlpart));
+		rm->pflags = 0;
 	}
-	free(scan);
+	rm->dtype = DTascii;			/* assumed w/o FORMAT */
+	if (getheader(fp, get_dminfo, rm) < 0) {
+		fputs("Bad matrix header\n", stderr);
+		return(0);
+	}
+	if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) &&
+			rm->ncomp != 3)
+		return(0);
+	if (rm->ncols <= 0 &&			/* resolution string? */
+			!fscnresolu(&rm->ncols, &rm->nrows, fp))
+		return(0);
+	if (rm->dtype == DTascii)		/* set file type (WINDOWS) */
+		SET_FILE_TEXT(fp);
+	else
+		SET_FILE_BINARY(fp);
 	return(1);
 }
 
+/* Load next row as rmx_dtype (cannot be XML) */
+int
+rmx_load_row(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
+{
+	switch (rm->dtype) {
+	case DTascii:
+		return(rmx_load_ascii(drp, rm, fp));
+	case DTfloat:
+		return(rmx_load_float(drp, rm, fp));
+	case DTdouble:
+		return(rmx_load_double(drp, rm, fp));
+	case DTrgbe:
+	case DTxyze:
+		return(rmx_load_rgbe(drp, rm, fp));
+	case DTspec:
+		return(rmx_load_spec(drp, rm, fp));
+	default:
+		fputs("Unsupported data type in rmx_load_row()\n", stderr);
+	}
+	return(0);
+}
+
+/* Allocate & load post-header data from stream given type set in rm->dtype */
+int
+rmx_load_data(RMATRIX *rm, FILE *fp)
+{
+	int	i;
+#ifdef MAP_FILE
+	long	pos;		/* map memory for file > 1MB if possible */
+	if ((rm->dtype == DTrmx_native) & !(rm->pflags & RMF_SWAPIN) &
+			(rmx_array_size(rm) >= 1L<<20) &&
+			(pos = ftell(fp)) >= 0 && !(pos % sizeof(rmx_dtype))) {
+		rm->mapped = mmap(NULL, rmx_array_size(rm)+pos, PROT_READ|PROT_WRITE,
+					MAP_PRIVATE, fileno(fp), 0);
+		if (rm->mapped != MAP_FAILED) {
+			if (rm->pflags & RMF_FREEMEM)
+				free(rm->mtx);
+			rm->mtx = (rmx_dtype *)rm->mapped + pos/sizeof(rmx_dtype);
+			rm->pflags &= ~RMF_FREEMEM;
+			return(1);
+		}		/* else fall back on reading into memory */
+		rm->mapped = NULL;
+	}
+#endif
+	if (!rmx_prepare(rm)) {	/* need in-core matrix array */
+		fprintf(stderr, "Cannot allocate %g MByte matrix array\n",
+				(1./(1L<<20))*(double)rmx_array_size(rm));
+		return(0);
+	}
+	for (i = 0; i < rm->nrows; i++)
+		if (!rmx_load_row(rmx_lval(rm,i,0), rm, fp))
+			return(0);
+	return(1);
+}
+
 /* Load matrix from supported file type */
 RMATRIX *
 rmx_load(const char *inspec, RMPref rmp)
 {
 	FILE		*fp;
 	RMATRIX		*dnew;
+	int		ok;
 
 	if (!inspec)
 		inspec = stdin_name;
 	else if (!*inspec)
 		return(NULL);
-	if (inspec == stdin_name) {		/* reading from stdin? */
+	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 = inspec;	/* check suffix */
-		while (*sp)
-			++sp;
-		while (sp > inspec && sp[-1] != '.')
-			--sp;
-		if (!strcasecmp(sp, "XML")) {	/* assume it's a BSDF */
-			CMATRIX	*cm = rmp==RMPtrans ? cm_loadBTDF(inspec) :
+	else if (inspec[0] == '!')
+		fp = popen(inspec+1, "r");
+	else {					/* check suffix */
+		const char	*sp = strrchr(inspec, '.');
+		if (sp > inspec && !strcasecmp(sp+1, "XML")) {	/* BSDF? */
+			CMATRIX	*cm = rmp==RMPnone ? (CMATRIX *)NULL :
+					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(inspec, "r")))
-			return(NULL);
+			return(dnew);		/* return here */
+		}				/* else open it ourselves */
+		fp = fopen(inspec, "r");
 	}
-	SET_FILE_BINARY(fp);
+	if (!fp) {
+		fprintf(stderr, "Cannot open for reading: %s\n", inspec);
+		return(NULL);
+	}
 #ifdef getc_unlocked
 	flockfile(fp);
 #endif
-	if (!(dnew = rmx_new(0,0,3))) {
-		fclose(fp);
+	SET_FILE_BINARY(fp);			/* load header info */
+	if (!rmx_load_header(dnew = rmx_new(0,0,3), fp)) {
+		fprintf(stderr, "Bad header in: %s\n", inspec);
+		if (inspec[0] == '!') pclose(fp);
+		else fclose(fp);
+		rmx_free(dnew);
 		return(NULL);
 	}
-	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 ((dnew->dtype == DTrgbe) | (dnew->dtype == DTxyze) &&
-				dnew->ncomp != 3) {
-			fclose(fp);
-			return(NULL);
-		}
-	}
-	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) {
+	ok = rmx_load_data(dnew, fp);		/* allocate & load data */
+
+	if (fp != stdin) {			/* close input stream */
 		if (inspec[0] == '!')
 			pclose(fp);
 		else
@@ -362,92 +445,108 @@ rmx_load(const char *inspec, RMPref rmp)
 	else
 		funlockfile(fp);
 #endif
+	if (!ok) {				/* load failure? */
+		fprintf(stderr, "Error loading data from: %s\n", inspec);
+		rmx_free(dnew);
+		return(NULL);
+	}
+						/* undo exposure? */
+	if ((dnew->cexp[0] != 1.f) |
+			(dnew->cexp[1] != 1.f) | (dnew->cexp[2] != 1.f)) {
+		double	cmlt[MAXCOMP];
+		int	i;
+		if (dnew->ncomp > MAXCOMP) {
+			fprintf(stderr, "Excess spectral components in: %s\n",
+					inspec);
+			rmx_free(dnew);
+			return(NULL);
+		}
+		cmlt[0] = 1./dnew->cexp[0];
+		cmlt[1] = 1./dnew->cexp[1];
+		cmlt[2] = 1./dnew->cexp[2];
+		for (i = dnew->ncomp; i-- > 3; )
+			cmlt[i] = cmlt[1];	/* XXX hack! */
+		rmx_scale(dnew, cmlt);
+		setcolor(dnew->cexp, 1.f, 1.f, 1.f);
+	}
 	return(dnew);
-loaderr:					/* should report error? */
-	if (inspec[0] == '!')
-		pclose(fp);
-	else
-		fclose(fp);
-	rmx_free(dnew);
-	return(NULL);
 }
 
+#if DTrmx_native==DTdouble
 static int
-rmx_write_ascii(const RMATRIX *rm, FILE *fp)
+rmx_write_float(const rmx_dtype *dp, int len, FILE *fp)
 {
-	const char	*fmt = (rm->dtype == DTfloat) ? " %.7e" :
-			(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" :
-				" %.15e" ;
-	int	i, j, k;
+	float	val;
 
-	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, fmt, dp[k]);
-		fputc('\t', fp);
-	    }
-	    fputc('\n', fp);
+	while (len--) {
+		val = (float)*dp++;
+		if (putbinary(&val, sizeof(val), 1, fp) != 1)
+			return(0);
 	}
 	return(1);
 }
-
+#else
 static int
-rmx_write_float(const RMATRIX *rm, FILE *fp)
+rmx_write_double(const rmx_dtype *dp, int len, FILE *fp)
 {
-	int	i, j, k;
-	float	val[100];
+	double	val;
 
-	if (rm->ncomp > 100) {
-		fputs("Unsupported # components in rmx_write_float()\n", stderr);
-		exit(1);
-	}
-	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)dp[k];
-		if (putbinary(val, sizeof(float), rm->ncomp, fp) != rm->ncomp)
+	while (len--) {
+		val = *dp++;
+		if (putbinary(&val, sizeof(val), 1, fp) != 1)
 			return(0);
-	    }
+	}
 	return(1);
 }
+#endif
 
 static int
-rmx_write_double(const RMATRIX *rm, FILE *fp)
+rmx_write_ascii(const rmx_dtype *dp, int nc, int len, FILE *fp)
 {
-	int	i;
-
-	for (i = 0; i < rm->nrows; i++)
-		if (putbinary(rmx_lval(rm,i,0), sizeof(double)*rm->ncomp,
-					rm->ncols, fp) != rm->ncols)
-			return(0);
-	return(1);
+	while (len-- > 0) {
+		int	k = nc;
+		while (k-- > 0)
+			fprintf(fp, " %.7e", *dp++);
+		fputc('\t', fp);
+	}
+	return(fputc('\n', fp) != EOF);
 }
 
 static int
-rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
+rmx_write_rgbe(const rmx_dtype *dp, int nc, int len, FILE *fp)
 {
-	COLR	*scan = (COLR *)malloc(sizeof(COLR)*rm->ncols);
-	int	i, j;
+	COLR	*scan;
+	int	j;
 
-	if (!scan)
-		return(0);
-	for (i = 0; i < rm->nrows; i++) {
-	    for (j = rm->ncols; j--; ) {
-	    	const double	*dp = rmx_lval(rm,i,j);
-	    	if (rm->ncomp == 1)
+	if ((nc != 1) & (nc != 3)) return(0);
+	scan = (COLR *)tempbuffer(sizeof(COLR)*len);
+	if (!scan) return(0);
+
+	for (j = 0; j < len; j++, dp += nc)
+	    	if (nc == 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);
-	    }
+
+	return(fwritecolrs(scan, len, fp) >= 0);
+}
+
+static int
+rmx_write_spec(const rmx_dtype *dp, int nc, int len, FILE *fp)
+{
+	COLRV	*scan;
+	COLORV	scol[MAXCOMP];
+	int	j, k;
+
+	if ((nc < 3) | (nc > MAXCOMP)) return(0);
+	scan = (COLRV *)tempbuffer((nc+1)*len);
+	if (!scan) return(0);
+	for (j = 0; j < len; j++, dp += nc) {
+	    	for (k = nc; k--; )
+	    		scol[k] = dp[k];
+		scolor2scolr(scan+j*(nc+1), scol, nc);
 	}
-	free(scan);
-	return(1);
+	return(fwritescolrs(scan, nc, len, fp) >= 0);
 }
 
 /* Check if CIE XYZ primaries were specified */
@@ -467,59 +566,115 @@ findCIEprims(const char *info)
 			(prims[BLU][CIEX] < .01) & (prims[BLU][CIEY] < .01));
 }
 
-/* Write matrix to file type indicated by dtype */
+/* Finish writing header data with resolution and format, returning type used */
 int
-rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
+rmx_write_header(const RMATRIX *rm, int dtype, FILE *fp)
 {
-	int	ok = 1;
-
-	if (!rm | !fp || !rm->mtx)
+	if (!rm | !fp || rm->ncols <= 0)
 		return(0);
-#ifdef getc_unlocked
-	flockfile(fp);
-#endif
-						/* complete header */
 	if (rm->info)
 		fputs(rm->info, fp);
-	if (dtype == DTfromHeader)
+	if (dtype == DTfromHeader) {
 		dtype = rm->dtype;
-	else if (dtype == DTrgbe && (rm->dtype == DTxyze ||
+#if DTrmx_native==DTfloat
+		if (dtype == DTdouble)		/* but stored as float? */
+			dtype = DTfloat;
+#endif
+	} 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);
+	if ((dtype < DTspec) & (rm->ncomp > 3))
+		dtype = DTspec;
+	else if ((dtype == DTspec) & (rm->ncomp <= 3))
+		return(0);
+
+	if (dtype == DTascii)			/* set file type (WINDOWS) */
+		SET_FILE_TEXT(fp);
+	else
+		SET_FILE_BINARY(fp);
+						/* write exposure? */
+	if (rm->ncomp == 3 && (rm->cexp[RED] != rm->cexp[GRN]) |
+			(rm->cexp[GRN] != rm->cexp[BLU]))
+		fputcolcor(rm->cexp, fp);
+	else if (rm->cexp[GRN] != 1.f)
+		fputexpos(rm->cexp[GRN], fp);
+						/* matrix size? */
+	if ((dtype > DTspec) | (rm->nrows <= 0)) {
+		if (rm->nrows > 0)
+			fprintf(fp, "NROWS=%d\n", rm->nrows);
 		fprintf(fp, "NCOLS=%d\n", rm->ncols);
-		fprintf(fp, "NCOMP=%d\n", rm->ncomp);
+	}
+	if (dtype >= DTspec) {			/* # components & split? */
+		fputncomp(rm->ncomp, fp);
+		if (rm->ncomp > 3 &&
+				memcmp(rm->wlpart, WLPART, sizeof(WLPART)))
+			fputwlsplit(rm->wlpart, 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:
-		ok = rmx_write_ascii(rm, fp);
-		break;
+	fputc('\n', fp);			/* end of header */
+	if ((dtype <= DTspec) & (rm->nrows > 0))
+		fprtresolu(rm->ncols, rm->nrows, fp);
+	return(dtype);
+}
+
+/* Write out matrix data (usually by row) */
+int
+rmx_write_data(const rmx_dtype *dp, int nc, int len, int dtype, FILE *fp)
+{
+	switch (dtype) {
+#if DTrmx_native==DTdouble
 	case DTfloat:
-		ok = rmx_write_float(rm, fp);
-		break;
+		return(rmx_write_float(dp, nc*len, fp));
+#else
 	case DTdouble:
-		ok = rmx_write_double(rm, fp);
-		break;
+		return(rmx_write_double(dp, nc*len, fp));
+#endif
+	case DTrmx_native:
+		return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len);
+	case DTascii:
+		return(rmx_write_ascii(dp, nc, len, fp));
 	case DTrgbe:
 	case DTxyze:
-		fprtresolu(rm->ncols, rm->nrows, fp);
-		ok = rmx_write_rgbe(rm, fp);
-		break;
-	default:
-		return(0);
+		return(rmx_write_rgbe(dp, nc, len, fp));
+	case DTspec:
+		return(rmx_write_spec(dp, nc, len, fp));
 	}
-	ok &= (fflush(fp) == 0);
+	return(0);
+}
+
+/* Write matrix using file format indicated by dtype */
+int
+rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
+{
+	int	ok = 0;
+	int	i;
+						/* complete header */
+	dtype = rmx_write_header(rm, dtype, fp);
+	if (dtype <= 0)
+		return(0);
 #ifdef getc_unlocked
+	flockfile(fp);
+#endif
+	if (dtype == DTrmx_native)		/* write all at once? */
+		ok = rmx_write_data(rm->mtx, rm->ncomp,
+				rm->nrows*rm->ncols, dtype, fp);
+	else					/* else row by row */
+		for (i = 0; i < rm->nrows; i++) {
+			ok = rmx_write_data(rmx_val(rm,i,0), rm->ncomp,
+					rm->ncols, dtype, fp);
+			if (!ok) break;
+		}
+
+	if (ok) ok = (fflush(fp) == 0);
+#ifdef getc_unlocked
 	funlockfile(fp);
 #endif
+	if (!ok) fputs("Error writing matrix\n", stderr);
 	return(ok);
 }
 
@@ -532,16 +687,16 @@ rmx_identity(const int dim, const int n)
 
 	if (!rid)
 		return(NULL);
-	memset(rid->mtx, 0, array_size(rid));
+	memset(rid->mtx, 0, rmx_array_size(rid));
 	for (i = dim; i--; ) {
-	    double	*dp = rmx_lval(rid,i,i);
+	    rmx_dtype	*dp = rmx_lval(rid,i,i);
 	    for (k = n; k--; )
 		dp[k] = 1.;
 	}
 	return(rid);
 }
 
-/* Duplicate the given matrix */
+/* Duplicate the given matrix (may be unallocated) */
 RMATRIX *
 rmx_copy(const RMATRIX *rm)
 {
@@ -549,45 +704,131 @@ rmx_copy(const RMATRIX *rm)
 
 	if (!rm)
 		return(NULL);
-	dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp);
+	dnew = rmx_new(rm->nrows, rm->ncols, rm->ncomp);
 	if (!dnew)
 		return(NULL);
+	if (rm->mtx) {
+		if (!rmx_prepare(dnew)) {
+			rmx_free(dnew);
+			return(NULL);
+		}
+		memcpy(dnew->mtx, rm->mtx, rmx_array_size(dnew));
+	}
 	rmx_addinfo(dnew, rm->info);
 	dnew->dtype = rm->dtype;
-	memcpy(dnew->mtx, rm->mtx, array_size(dnew));
+	copycolor(dnew->cexp, rm->cexp);
+	memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart));
 	return(dnew);
 }
 
-/* Allocate and assign transposed matrix */
-RMATRIX *
-rmx_transpose(const RMATRIX *rm)
+/* Replace data in first matrix with data from second */
+int
+rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int dometa)
 {
-	RMATRIX	*dnew;
-	int	i, j;
+	if (!rdst | !rsrc)
+		return(0);
+	if (dometa) {		/* transfer everything? */
+		rmx_reset(rdst);
+		*rdst = *rsrc;
+		rsrc->info = NULL; rsrc->mapped = NULL; rsrc->mtx = NULL;
+		return(1);
+	}
+				/* just matrix data -- leave metadata */
+	if ((rdst->nrows != rsrc->nrows) |
+			(rdst->ncols != rsrc->ncols) |
+			(rdst->ncomp != rsrc->ncomp))
+		return(0);
+#ifdef MAP_FILE
+	if (rdst->mapped)
+		munmap(rdst->mapped, rmx_mapped_size(rdst));
+	else
+#endif
+	if (rdst->pflags & RMF_FREEMEM) {
+		free(rdst->mtx);
+		rdst->pflags &= ~RMF_FREEMEM;
+	}
+	rdst->mapped = rsrc->mapped;
+	rdst->mtx = rsrc->mtx;
+	rdst->pflags |= rsrc->pflags & RMF_FREEMEM;
+	rsrc->mapped = NULL; rsrc->mtx = NULL;
+	return(1);
+}
 
-	if (!rm)
+/* Transpose the given matrix */
+int
+rmx_transpose(RMATRIX *rm)
+{
+	uby8		*bmap;
+	rmx_dtype	val[MAXCOMP];
+	RMATRIX		dold;
+	int		i, j;
+
+	if (!rm || !rm->mtx | (rm->ncomp > MAXCOMP))
 		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);
+	if (rm->info)
+		rmx_addinfo(rm, "Transposed rows and columns\n");
+	if ((rm->nrows == 1) | (rm->ncols == 1)) { /* vector? */
+		j = rm->ncols;
+		rm->ncols = rm->nrows;
+		rm->nrows = j;
+		return(1);
 	}
-	dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp);
-	if (!dnew)
-		return(NULL);
-	if (rm->info) {
-		rmx_addinfo(dnew, rm->info);
-		rmx_addinfo(dnew, "Transposed rows and columns\n");
+	if (rm->nrows == rm->ncols) {	/* square matrix case */
+	     for (i = rm->nrows; i--; )
+	     	for (j = rm->ncols; j--; ) {
+		    if (i == j) continue;
+		    memcpy(val, rmx_val(rm,i,j),
+				sizeof(rmx_dtype)*rm->ncomp);
+		    memcpy(rmx_lval(rm,i,j), rmx_val(rm,j,i),
+				sizeof(rmx_dtype)*rm->ncomp);
+		    memcpy(rmx_val(rm,j,i), val,
+				sizeof(rmx_dtype)*rm->ncomp);
+		}
+		return(1);
 	}
-	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);
+#define	bmbyte(r,c)	bmap[((r)*rm->ncols+(c))>>3]
+#define	bmbit(r,c)	(1 << ((r)*rm->ncols+(c) & 7))
+#define	bmop(r,c, op)	(bmbyte(r,c) op bmbit(r,c))
+#define	bmtest(r,c)	bmop(r,c,&)
+#define	bmset(r,c)	bmop(r,c,|=)
+#define bmtestandset(r,c)	(!bmtest(r,c) && bmset(r,c))
+					/* create completion bitmap */
+	bmap = (uby8 *)calloc(((size_t)rm->nrows*rm->ncols+7)>>3, 1);
+	if (!bmap)
+		return(0);
+	dold = *rm;
+	rm->ncols = dold.nrows; rm->nrows = dold.ncols;
+	for (i = rm->nrows; i--; )
+	    for (j = rm->ncols; j--; ) {
+	    	int	i0, j0;
+	    	int	i1 = i;
+	    	size_t	j1 = j;
+		if (!bmtestandset(i,j)) continue;
+		memcpy(val, rmx_val(rm,i,j),
+			sizeof(rmx_dtype)*rm->ncomp);
+		for ( ; ; ) {		/* value transpose loop */
+		    const rmx_dtype	*ds;
+		    i0 = i1; j0 = (int)j1;
+		    ds = rmx_val(&dold, j0, i0);
+		    j1 = (ds - dold.mtx)/dold.ncomp;
+		    i1 = j1 / rm->ncols;
+		    j1 -= (size_t)i1*rm->ncols;
+		    if (!bmtestandset(i1,j1)) break;
+		    memcpy(rmx_lval(rm,i0,j0), ds,
+				sizeof(rmx_dtype)*rm->ncomp);
+		}
+					/* close the loop */
+		memcpy(rmx_lval(rm,i0,j0), val,
+			sizeof(rmx_dtype)*rm->ncomp);
+	    }
+	free(bmap);			/* all done! */
+	return(1);
+#undef	bmbyte
+#undef	bmbit
+#undef	bmop
+#undef	bmtest
+#undef	bmset
+#undef	bmtestandset
 }
 
 /* Multiply (concatenate) two matrices and allocate the result */
@@ -597,7 +838,8 @@ rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
 	RMATRIX	*mres;
 	int	i, j, k, h;
 
-	if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows))
+	if (!m1 | !m2 || !m1->mtx | !m2->mtx |
+			(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows))
 		return(NULL);
 	mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp);
 	if (!mres)
@@ -612,8 +854,9 @@ rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
 	        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;
+			d += (double)rmx_val(m1,i,h)[k] *
+					rmx_val(m2,h,j)[k];
+		    rmx_lval(mres,i,j)[k] = (rmx_dtype)d;
 		}
 	return(mres);
 }
@@ -625,7 +868,8 @@ 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))
+	if (!m1 | !m2 || !m1->mtx | !m2->mtx |
+			 (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows))
 		return(0);
 	if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp))
 		return(0);
@@ -637,9 +881,9 @@ rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide
 	for (i = m1->nrows; i--; )
 	    for (j = m1->ncols; j--; )
 		if (divide) {
-		    double	d;
+		    rmx_dtype	d;
 		    if (m2->ncomp == 1) {
-			d = rmx_lval(m2,i,j)[0];
+			d = rmx_val(m2,i,j)[0];
 			if (d == 0) {
 			    ++zeroDivides;
 			    for (k = m1->ncomp; k--; )
@@ -651,7 +895,7 @@ rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide
 			}
 		    } else
 		        for (k = m1->ncomp; k--; ) {
-			    d = rmx_lval(m2,i,j)[k];
+			    d = rmx_val(m2,i,j)[k];
 			    if (d == 0) {
 			        ++zeroDivides;
 				rmx_lval(m1,i,j)[k] = 0;
@@ -660,12 +904,12 @@ rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide
 			}
 		} else {
 		    if (m2->ncomp == 1) {
-			const double	d = rmx_lval(m2,i,j)[0];
+			const rmx_dtype	d = rmx_val(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];
+			    rmx_lval(m1,i,j)[k] *= rmx_val(m2,i,j)[k];
 		}
 	if (zeroDivides) {
 		rmx_addinfo(m1, "WARNING: zero divide(s) corrupted results\n");
@@ -681,7 +925,7 @@ rmx_sum(RMATRIX *msum, const RMATRIX *madd, const doub
 	double	*mysf = NULL;
 	int	i, j, k;
 
-	if (!msum | !madd ||
+	if (!msum | !madd || !msum->mtx | !madd->mtx |
 			(msum->nrows != madd->nrows) |
 			(msum->ncols != madd->ncols) |
 			(msum->ncomp != madd->ncomp))
@@ -701,10 +945,10 @@ rmx_sum(RMATRIX *msum, const RMATRIX *madd, const doub
 		rmx_addinfo(msum, rmx_mismatch_warn);
 	for (i = msum->nrows; i--; )
 	    for (j = msum->ncols; j--; ) {
-	    	const double	*da = rmx_lval(madd,i,j);
-	    	double		*ds = rmx_lval(msum,i,j);
+	    	const rmx_dtype	*da = rmx_val(madd,i,j);
+	    	rmx_dtype	*ds = rmx_lval(msum,i,j);
 		for (k = msum->ncomp; k--; )
-		     ds[k] += sf[k] * da[k];
+		     ds[k] += (rmx_dtype)sf[k] * da[k];
 	    }
 	if (mysf)
 		free(mysf);
@@ -717,16 +961,17 @@ rmx_scale(RMATRIX *rm, const double sf[])
 {
 	int	i, j, k;
 
-	if (!rm | !sf)
+	if (!rm | !sf || !rm->mtx)
 		return(0);
 	for (i = rm->nrows; i--; )
 	    for (j = rm->ncols; j--; ) {
-	    	double	*dp = rmx_lval(rm,i,j);
+	    	rmx_dtype	*dp = rmx_lval(rm,i,j);
 		for (k = rm->ncomp; k--; )
-		    dp[k] *= sf[k];
+		    dp[k] *= (rmx_dtype)sf[k];
 	    }
 	if (rm->info)
 		rmx_addinfo(rm, "Applied scalar\n");
+	/* XXX: should record as exposure for COLR and SCOLR types? */
 	return(1);
 }
 
@@ -737,7 +982,7 @@ rmx_transform(const RMATRIX *msrc, int n, const double
 	int	i, j, ks, kd;
 	RMATRIX	*dnew;
 
-	if (!msrc | (n <= 0) | !cmat)
+	if (!msrc | (n <= 0) | !cmat || !msrc->mtx)
 		return(NULL);
 	dnew = rmx_alloc(msrc->nrows, msrc->ncols, n);
 	if (!dnew)
@@ -752,12 +997,12 @@ rmx_transform(const RMATRIX *msrc, int n, const double
 	dnew->dtype = msrc->dtype;
 	for (i = dnew->nrows; i--; )
 	    for (j = dnew->ncols; j--; ) {
-		const double	*ds = rmx_lval(msrc,i,j);
+		const rmx_dtype	*ds = rmx_val(msrc,i,j);
 	        for (kd = dnew->ncomp; kd--; ) {
 		    double	d = 0;
 		    for (ks = msrc->ncomp; ks--; )
 		        d += cmat[kd*msrc->ncomp + ks] * ds[ks];
-		    rmx_lval(dnew,i,j)[kd] = d;
+		    rmx_lval(dnew,i,j)[kd] = (rmx_dtype)d;
 		}
 	    }
 	return(dnew);
@@ -767,7 +1012,6 @@ rmx_transform(const RMATRIX *msrc, int n, const double
 RMATRIX *
 rmx_from_cmatrix(const CMATRIX *cm)
 {
-	int	i, j;
 	RMATRIX	*dnew;
 
 	if (!cm)
@@ -775,15 +1019,23 @@ rmx_from_cmatrix(const CMATRIX *cm)
 	dnew = rmx_alloc(cm->nrows, cm->ncols, 3);
 	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);
-		double		*dp = rmx_lval(dnew,i,j);
-		dp[0] = cv[0];
-		dp[1] = cv[1];
-		dp[2] = cv[2];
-	    }
+
+	dnew->dtype = sizeof(COLORV)==sizeof(float) ?
+			DTfloat : DTdouble;
+
+	if (sizeof(COLORV) == sizeof(rmx_dtype)) {
+		memcpy(dnew->mtx, cm->cmem, rmx_array_size(dnew));
+	} else {
+		int	i, j;
+		for (i = dnew->nrows; i--; )
+		    for (j = dnew->ncols; j--; ) {
+			const COLORV	*cv = cm_lval(cm,i,j);
+			rmx_dtype	*dp = rmx_lval(dnew,i,j);
+			dp[0] = cv[0];
+			dp[1] = cv[1];
+			dp[2] = cv[2];
+		    }
+	}
 	return(dnew);
 }
 
@@ -791,22 +1043,41 @@ rmx_from_cmatrix(const CMATRIX *cm)
 CMATRIX *
 cm_from_rmatrix(const RMATRIX *rm)
 {
-	int	i, j;
 	CMATRIX	*cnew;
 
-	if (!rm || !rm->mtx | ((rm->ncomp != 3) & (rm->ncomp != 1)))
+	if (!rm || !rm->mtx | (rm->ncomp == 2) | (rm->ncomp > MAXCOMP))
 		return(NULL);
 	cnew = cm_alloc(rm->nrows, rm->ncols);
 	if (!cnew)
 		return(NULL);
-	for (i = cnew->nrows; i--; )
-	    for (j = cnew->ncols; j--; ) {
-		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]);
-	    }
+	if ((sizeof(COLORV) == sizeof(rmx_dtype)) & (rm->ncomp == 3)) {
+		memcpy(cnew->cmem, rm->mtx, rmx_array_size(rm));
+	} else {
+		int	i, j;
+		for (i = cnew->nrows; i--; )
+		    for (j = cnew->ncols; j--; ) {
+			const rmx_dtype	*dp = rmx_val(rm,i,j);
+			COLORV		*cv = cm_lval(cnew,i,j);
+			switch (rm->ncomp) {
+			case 3:
+			    setcolor(cv, dp[0], dp[1], dp[2]);
+			    break;
+			case 1:
+			    setcolor(cv, dp[0], dp[0], dp[0]);
+			    break;
+			default:
+			    if (sizeof(COLORV) == sizeof(rmx_dtype)) {
+				scolor2color(cv, (const COLORV *)dp,
+						rm->ncomp, rm->wlpart);
+			    } else {
+				COLORV	scol[MAXCOMP];
+				int	k = rm->ncomp;
+				while (k--) scol[k] = dp[k];
+				scolor2color(cv, scol, rm->ncomp, rm->wlpart);
+			    }
+			    break;
+			}
+		    }
+	}
 	return(cnew);
 }