--- ray/src/util/rmatrix.c	2022/03/14 23:28:14	2.57
+++ ray/src/util/rmatrix.c	2023/12/02 16:28:35	2.68
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.57 2022/03/14 23:28:14 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.68 2023/12/02 16:28:35 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -16,7 +16,7 @@ static const char RCSid[] = "$Id: rmatrix.c,v 2.57 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)
@@ -25,13 +25,19 @@ static char	rmx_mismatch_warn[] = "WARNING: data type 
 RMATRIX *
 rmx_new(int nr, int nc, int n)
 {
-	RMATRIX	*dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX));
+	RMATRIX	*dnew;
 
+	if (n <= 0)
+		return(NULL);
+
+	dnew = (RMATRIX *)calloc(1, sizeof(RMATRIX));
 	if (dnew) {
 		dnew->dtype = DTdouble;
 		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);
 }
@@ -43,6 +49,8 @@ rmx_prepare(RMATRIX *rm)
 	if (!rm) return(0);
 	if (rm->mtx)
 		return(1);
+	if ((rm->nrows <= 0) | (rm->ncols <= 0) | (rm->ncomp <= 0))
+		return(0);
 	rm->mtx = (double *)malloc(array_size(rm));
 	return(rm->mtx != NULL);
 }
@@ -60,19 +68,33 @@ rmx_alloc(int nr, int nc, int n)
 	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;
+	}
+	if (rm->mtx) {
 #ifdef MAP_FILE
-	if (rm->mapped)
-		munmap(rm->mapped, mapped_size(rm));
-	else
+		if (rm->mapped) {
+			munmap(rm->mapped, mapped_size(rm));
+			rm->mapped = NULL;
+		} else
 #endif
-		free(rm->mtx);
+			free(rm->mtx);
+		rm->mtx = NULL;
+	}
+}
+
+/* Free an RMATRIX struct and data */
+void
+rmx_free(RMATRIX *rm)
+{
+	if (!rm) return;
+	rmx_reset(rm);
 	free(rm);
 }
 
@@ -80,8 +102,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)
@@ -118,10 +140,10 @@ get_dminfo(char *s, void *p)
 	char	fmt[MAXFMTLEN];
 	int	i;
 
-	if (headidval(fmt, s))
+	if (headidval(NULL, s))
 		return(0);
-	if (!strncmp(s, "NCOMP=", 6)) {
-		ip->ncomp = atoi(s+6);
+	if (isncomp(s)) {
+		ip->ncomp = ncompval(s);
 		return(0);
 	}
 	if (!strncmp(s, "NROWS=", 6)) {
@@ -147,6 +169,10 @@ get_dminfo(char *s, void *p)
 		multcolor(ip->cexp, ctmp);
 		return(0);
 	}
+	if (iswlsplit(s)) {
+		wlsplitval(ip->wlpart, s);
+		return(0);
+	}
 	if (!formatval(fmt, s)) {
 		rmx_addinfo(ip, s);
 		return(0);
@@ -160,54 +186,155 @@ get_dminfo(char *s, void *p)
 }
 
 static int
-rmx_load_ascii(RMATRIX *rm, FILE *fp)
+rmx_load_ascii(double *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, "%lf", drp++) != 1)
+				return(0);
 	return(1);
 }
 
 static int
-rmx_load_float(RMATRIX *rm, FILE *fp)
+rmx_load_float(double *drp, const RMATRIX *rm, FILE *fp)
 {
-	int	i, j, k;
+	int	j, k;
 	float	val[100];
 
 	if (rm->ncomp > 100) {
 		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);
+			return(0);
 		if (rm->swapin)
-		    swap32((char *)val, rm->ncomp);
-	        for (k = rm->ncomp; k--; )
-		     dp[k] = val[k];
-	    }
+			swap32((char *)val, rm->ncomp);
+	        for (k = 0; k < rm->ncomp; k++)
+			*drp++ = val[k];
+	}
 	return(1);
 }
 
 static int
-rmx_load_double(RMATRIX *rm, FILE *fp)
+rmx_load_double(double *drp, const RMATRIX *rm, FILE *fp)
 {
+	if (getbinary(drp, sizeof(*drp)*rm->ncomp, rm->ncols, fp) != rm->ncols)
+		return(0);
+	if (rm->swapin)
+		swap64((char *)drp, rm->ncols*rm->ncomp);
+	return(1);
+}
+
+static int
+rmx_load_rgbe(double *drp, const RMATRIX *rm, FILE *fp)
+{
+	COLR	*scan;
+	COLOR	col;
+	int	j;
+
+	if (rm->ncomp != 3)
+		return(0);
+	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_spec(double *drp, const RMATRIX *rm, FILE *fp)
+{
+	uby8	*scan;
+	SCOLOR	scol;
+	int	j, k;
+
+	if ((rm->ncomp < 3) | (rm->ncomp > MAXCSAMP))
+		return(0);
+	scan = (uby8 *)tempbuffer((rm->ncomp+1)*rm->ncols);
+	if (!scan)
+		return(0);
+	if (freadscolrs(scan, rm->ncomp, rm->ncols, fp) < 0)
+		return(0);
+	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);
+	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->swapin = 0;
+	}
+	rm->dtype = DTascii;			/* assumed w/o FORMAT */
+	if (getheader(fp, get_dminfo, rm) < 0) {
+		fputs("Unrecognized matrix format\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 double (cannot be XML) */
+int
+rmx_load_row(double *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->swapin && array_size(rm) >= 1L<<20 &&
+	if ((rm->dtype == DTdouble) & !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);
@@ -218,61 +345,34 @@ rmx_load_double(RMATRIX *rm, FILE *fp)
 		rm->mapped = NULL;
 	}
 #endif
-	if (!rmx_prepare(rm))
+	if (!rmx_prepare(rm)) {	/* need in-core matrix array */
+		fprintf(stderr, "Cannot allocate %g MByte matrix array\n",
+				(1./(1L<<20))*(double)array_size(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);
 	}
+	for (i = 0; i < rm->nrows; i++)
+		if (!rmx_load_row(rmx_lval(rm,i,0), rm, fp))
+			return(0);
 	return(1);
 }
 
-static int
-rmx_load_rgbe(RMATRIX *rm, FILE *fp)
-{
-	COLOR	*scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols);
-	int	i, j;
-
-	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 = 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);
-	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 {
+	else if (inspec[0] == '!')
+		fp = popen(inspec+1, "r");
+	else if (rmp != RMPnone) {
 		const char	*sp = inspec;	/* check suffix */
 		while (*sp)
 			++sp;
@@ -286,73 +386,26 @@ rmx_load(const char *inspec, RMPref rmp)
 			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)
+		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 +415,93 @@ 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[MAXCSAMP];
+		int	i;
+		cmlt[0] = 1./dnew->cexp[0];
+		cmlt[1] = 1./dnew->cexp[1];
+		cmlt[2] = 1./dnew->cexp[2];
+		if (dnew->ncomp > MAXCSAMP) {
+			fprintf(stderr, "Excess spectral components in: %s\n",
+					inspec);
+			rmx_free(dnew);
+			return(NULL);
+		}
+		for (i = dnew->ncomp; i-- > 3; )
+			cmlt[i] = cmlt[1];
+		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);
 }
 
 static int
-rmx_write_ascii(const RMATRIX *rm, FILE *fp)
+rmx_write_ascii(const double *dp, int nc, int len, FILE *fp)
 {
-	const char	*fmt = (rm->dtype == DTfloat) ? " %.7e" :
-			(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" :
-				" %.15e" ;
-	int	i, j, k;
-
-	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]);
+	while (len-- > 0) {
+		int	k = nc;
+		while (nc-- > 0)
+			fprintf(fp, " %.7e", *dp++);
 		fputc('\t', fp);
-	    }
-	    fputc('\n', fp);
 	}
-	return(1);
+	return(fputc('\n', fp) != EOF);
 }
 
 static int
-rmx_write_float(const RMATRIX *rm, FILE *fp)
+rmx_write_float(const double *dp, int len, FILE *fp)
 {
-	int	i, j, k;
-	float	val[100];
+	float	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(float), 1, fp) != 1)
 			return(0);
-	    }
+	}
 	return(1);
 }
 
 static int
-rmx_write_double(const RMATRIX *rm, FILE *fp)
+rmx_write_rgbe(const double *dp, int nc, int len, FILE *fp)
 {
-	int	i;
+	COLR	*scan;
+	int	j;
 
-	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);
+	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]);
+
+	return(fwritecolrs(scan, len, fp) >= 0);
 }
 
 static int
-rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
+rmx_write_spec(const double *dp, int nc, int len, FILE *fp)
 {
-	COLR	*scan = (COLR *)malloc(sizeof(COLR)*rm->ncols);
-	int	i, j;
+	uby8	*scan;
+	SCOLOR	scol;
+	int	j, k;
 
-	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)
-	    		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);
-	    }
+	if (nc < 3) return(0);
+	scan = (uby8 *)tempbuffer((nc+1)*len);
+	if (!scan) return(0);
+	for (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,18 +521,12 @@ 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->mtx | (rm->ncols <= 0))
 		return(0);
-#ifdef getc_unlocked
-	flockfile(fp);
-#endif
-						/* complete header */
 	if (rm->info)
 		fputs(rm->info, fp);
 	if (dtype == DTfromHeader)
@@ -488,38 +536,89 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 		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))
+		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 (dtype == DTspec || (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 */
+	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 double *dp, int nc, int len, int dtype, FILE *fp)
+{
+	switch (dtype) {
 	case DTascii:
-		ok = rmx_write_ascii(rm, fp);
-		break;
+		return(rmx_write_ascii(dp, nc, len, fp));
 	case DTfloat:
-		ok = rmx_write_float(rm, fp);
-		break;
+		return(rmx_write_float(dp, nc*len, fp));
 	case DTdouble:
-		ok = rmx_write_double(rm, fp);
-		break;
+		return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len);
 	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 == DTdouble)			/* 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);
 }
 
@@ -547,13 +646,15 @@ rmx_copy(const RMATRIX *rm)
 {
 	RMATRIX	*dnew;
 
-	if (!rm)
+	if (!rm || !rm->mtx)
 		return(NULL);
 	dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp);
 	if (!dnew)
 		return(NULL);
 	rmx_addinfo(dnew, rm->info);
 	dnew->dtype = rm->dtype;
+	copycolor(dnew->cexp, rm->cexp);
+	memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart));
 	memcpy(dnew->mtx, rm->mtx, array_size(dnew));
 	return(dnew);
 }
@@ -565,7 +666,7 @@ rmx_transpose(const RMATRIX *rm)
 	RMATRIX	*dnew;
 	int	i, j;
 
-	if (!rm)
+	if (!rm || !rm->mtx)
 		return(0);
 	if ((rm->nrows == 1) | (rm->ncols == 1)) {
 		dnew = rmx_copy(rm);
@@ -583,9 +684,11 @@ rmx_transpose(const RMATRIX *rm)
 		rmx_addinfo(dnew, "Transposed rows and columns\n");
 	}
 	dnew->dtype = rm->dtype;
+	copycolor(dnew->cexp, rm->cexp);
+	memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart));
 	for (j = dnew->ncols; j--; )
 	    for (i = dnew->nrows; i--; )
-	    	memcpy(rmx_lval(dnew,i,j), rmx_lval(rm,j,i),
+	    	memcpy(rmx_lval(dnew,i,j), rmx_val(rm,j,i),
 	    			sizeof(double)*dnew->ncomp);
 	return(dnew);
 }
@@ -597,7 +700,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,7 +716,7 @@ 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];
+			d += rmx_val(m1,i,h)[k] * rmx_val(m2,h,j)[k];
 		    rmx_lval(mres,i,j)[k] = d;
 		}
 	return(mres);
@@ -625,7 +729,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);
@@ -639,7 +744,7 @@ rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide
 		if (divide) {
 		    double	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 +756,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 +765,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 double	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 +786,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,7 +806,7 @@ 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);
+	    	const double	*da = rmx_val(madd,i,j);
 	    	double		*ds = rmx_lval(msum,i,j);
 		for (k = msum->ncomp; k--; )
 		     ds[k] += sf[k] * da[k];
@@ -717,7 +822,7 @@ 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--; ) {
@@ -727,6 +832,7 @@ rmx_scale(RMATRIX *rm, const double sf[])
 	    }
 	if (rm->info)
 		rmx_addinfo(rm, "Applied scalar\n");
+	/* XXX: should record as exposure for COLR and SCOLR types? */
 	return(1);
 }
 
@@ -737,7 +843,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,7 +858,7 @@ 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 double	*ds = rmx_val(msrc,i,j);
 	        for (kd = dnew->ncomp; kd--; ) {
 		    double	d = 0;
 		    for (ks = msrc->ncomp; ks--; )
@@ -794,19 +900,30 @@ 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))
 		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);
+		const double	*dp = rmx_val(rm,i,j);
 		COLORV		*cv = cm_lval(cnew,i,j);
-		if (rm->ncomp == 1)
-		    setcolor(cv, dp[0], dp[0], dp[0]);
-		else
+		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: {
+			SCOLOR	scol;
+			int	k;
+			for (k = rm->ncomp; k--; )
+				scol[k] = dp[k];
+			scolor2color(cv, scol, rm->ncomp, rm->wlpart);
+		    } break;
+		}
 	    }
 	return(cnew);
 }