--- ray/src/util/rmatrix.c	2023/11/28 00:46:23	2.63
+++ ray/src/util/rmatrix.c	2023/12/05 21:45:39	2.72
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.63 2023/11/28 00:46:23 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.72 2023/12/05 21:45:39 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -31,14 +31,16 @@ rmx_new(int nr, int nc, int n)
 		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));
-	}
+	if (!dnew)
+		return(NULL);
+
+	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);
 }
 
@@ -68,19 +70,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);
 }
 
@@ -172,133 +188,90 @@ 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)
 {
-	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;
-	}
-#endif
-	if (!rmx_prepare(rm))
+	if (getbinary(drp, sizeof(*drp)*rm->ncomp, rm->ncols, fp) != rm->ncols)
 		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);
-	}
+	if (rm->swapin)
+		swap64((char *)drp, rm->ncols*rm->ncomp);
 	return(1);
 }
 
 static int
-rmx_load_rgbe(RMATRIX *rm, FILE *fp)
+rmx_load_rgbe(double *drp, const RMATRIX *rm, FILE *fp)
 {
-	COLOR	*scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols);
-	int	i, j;
+	COLR	*scan;
+	COLOR	col;
+	int	j;
 
+	if (rm->ncomp != 3)
+		return(0);
+	scan = (COLR *)tempbuffer(sizeof(COLR)*rm->ncols);
 	if (!scan)
 		return(0);
-	if (!rmx_prepare(rm)) {
-		free(scan);
+	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);
 	}
-	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);
 }
 
 static int
-rmx_load_spec(RMATRIX *rm, FILE *fp)
+rmx_load_spec(double *drp, const RMATRIX *rm, FILE *fp)
 {
 	uby8	*scan;
 	SCOLOR	scol;
-	int	i, j, k;
+	int	j, k;
 
-	if (rm->ncomp < 3)
+	if ((rm->ncomp < 3) | (rm->ncomp > MAXCSAMP))
 		return(0);
-	scan = (uby8 *)malloc((rm->ncomp+1)*rm->ncols);
+	scan = (uby8 *)tempbuffer((rm->ncomp+1)*rm->ncols);
 	if (!scan)
 		return(0);
-	if (!rmx_prepare(rm)) {
-		free(scan);
+	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];
 	}
-	for (i = 0; i < rm->nrows; i++) {
-	    double	*dp = rmx_lval(rm,i,0);
-	    if (freadscolrs(scan, rm->ncomp, rm->ncols, fp) < 0) {
-		free(scan);
-		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++)
-	    		*dp++ = scol[k];
-	    }
-	}
-	free(scan);
 	return(1);
 }
 
@@ -308,20 +281,7 @@ rmx_load_header(RMATRIX *rm, FILE *fp)
 {
 	if (!rm | !fp)
 		return(0);
-	if (rm->info) {				/* clear state */
-		free(rm->info);
-		rm->info = NULL;
-	}
-	if (rm->mtx) {				/* ...and data */
-#ifdef MAP_FILE
-		if (rm->mapped) {
-			munmap(rm->mapped, mapped_size(rm));
-			rm->mapped = NULL;
-		} else
-#endif
-			free(rm->mtx);
-		rm->mtx = NULL;
-	}
+	rmx_reset(rm);				/* clear state */
 	if (rm->nrows | rm->ncols | !rm->dtype) {
 		rm->nrows = rm->ncols = 0;
 		rm->ncomp = 3;
@@ -329,46 +289,75 @@ rmx_load_header(RMATRIX *rm, FILE *fp)
 		memcpy(rm->wlpart, WLPART, sizeof(rm->wlpart));
 		rm->swapin = 0;
 	}
-	SET_FILE_BINARY(fp);
 	rm->dtype = DTascii;			/* assumed w/o FORMAT */
 	if (getheader(fp, get_dminfo, rm) < 0) {
 		fputs("Unrecognized matrix format\n", stderr);
 		return(0);
 	}
-						/* resolution string? */
-	if ((rm->nrows <= 0) | (rm->ncols <= 0)) {
-		if (!fscnresolu(&rm->ncols, &rm->nrows, fp))
-			return(0);
-		if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) &&
-				rm->ncomp != 3)
-			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);
 }
 
-/* Allocate & load post-header data from stream given type set in rm->dtype */
+/* Load next row as double (cannot be XML) */
 int
-rmx_load_data(RMATRIX *rm, FILE *fp)
+rmx_load_row(double *drp, const RMATRIX *rm, FILE *fp)
 {
 	switch (rm->dtype) {
 	case DTascii:
-		SET_FILE_TEXT(fp);
-		return(rmx_load_ascii(rm, fp));
+		return(rmx_load_ascii(drp, rm, fp));
 	case DTfloat:
-		return(rmx_load_float(rm, fp));
+		return(rmx_load_float(drp, rm, fp));
 	case DTdouble:
-		return(rmx_load_double(rm, fp));
+		return(rmx_load_double(drp, rm, fp));
 	case DTrgbe:
 	case DTxyze:
-		return(rmx_load_rgbe(rm, fp));
+		return(rmx_load_rgbe(drp, rm, fp));
 	case DTspec:
-		return(rmx_load_spec(rm, fp));
+		return(rmx_load_spec(drp, rm, fp));
 	default:
-		fputs("Unsupported data type in rmx_loaddata()\n", stderr);
+		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 == 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);
+		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;
+	}
+#endif
+	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 (!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)
@@ -392,7 +381,8 @@ rmx_load(const char *inspec, RMPref rmp)
 		while (sp > inspec && sp[-1] != '.')
 			--sp;
 		if (!strcasecmp(sp, "XML")) {	/* assume it's a BSDF */
-			CMATRIX	*cm = rmp==RMPtrans ? cm_loadBTDF(inspec) :
+			CMATRIX	*cm = rmp==RMPnone ? (CMATRIX *)NULL :
+					rmp==RMPtrans ? cm_loadBTDF(inspec) :
 					cm_loadBRDF(inspec, rmp==RMPreflB) ;
 			if (!cm)
 				return(NULL);
@@ -408,7 +398,7 @@ rmx_load(const char *inspec, RMPref rmp)
 #ifdef getc_unlocked
 	flockfile(fp);
 #endif
-						/* load header info */
+	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);
@@ -456,107 +446,65 @@ rmx_load(const char *inspec, RMPref rmp)
 }
 
 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) |
-			(rm->dtype == DTspec) ? " %.3e" : " %.15e" ;
-	int	i, j, k;
-
-	for (i = 0; i < rm->nrows; i++) {
-	    for (j = 0; j < rm->ncols; j++) {
-		const double	*dp = rmx_val(rm,i,j);
-	        for (k = 0; k < rm->ncomp; k++)
-		    fprintf(fp, fmt, dp[k]);
+	while (len-- > 0) {
+		int	k = nc;
+		while (k-- > 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_val(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_val(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);
 
-static int
-rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
-{
-	COLR	*scan = (COLR *)malloc(sizeof(COLR)*rm->ncols);
-	int	i, j;
-
-	if (!scan)
-		return(0);
-	for (i = 0; i < rm->nrows; i++) {
-	    for (j = rm->ncols; j--; ) {
-	    	const double	*dp = rmx_val(rm,i,j);
-	    	if (rm->ncomp == 1)
+	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);
-	    }
-	}
-	free(scan);
-	return(1);
+
+	return(fwritecolrs(scan, len, fp) >= 0);
 }
 
 static int
-rmx_write_spec(const RMATRIX *rm, FILE *fp)
+rmx_write_spec(const double *dp, int nc, int len, FILE *fp)
 {
-	uby8	*scan = (uby8 *)malloc((rm->ncomp+1)*rm->ncols);
-	int	ok = 1;
+	uby8	*scan;
 	SCOLOR	scol;
-	int	i, j, k;
+	int	j, k;
 
-	if (!scan)
-		return(0);
-	for (i = 0; i < rm->nrows; i++) {
-	    for (j = rm->ncols; j--; ) {
-	    	const double	*dp = rmx_val(rm,i,j);
-	    	for (k = rm->ncomp; k--; )
+	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*(rm->ncomp+1), scol, rm->ncomp);
-	    }
-	    if (fwritescolrs(scan, rm->ncomp, rm->ncols, fp) < 0) {
-		ok = 0;
-		break;
-	    }
+		scolor2scolr(scan+j*(nc+1), scol, nc);
 	}
-	free(scan);
-	return(ok);
+	return(fwritescolrs(scan, nc, len, fp) >= 0);
 }
 
 /* Check if CIE XYZ primaries were specified */
@@ -576,18 +524,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->ncols <= 0)
 		return(0);
-#ifdef getc_unlocked
-	flockfile(fp);
-#endif
-						/* complete header */
 	if (rm->info)
 		fputs(rm->info, fp);
 	if (dtype == DTfromHeader)
@@ -597,52 +539,86 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 		dtype = DTxyze;
 	else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
 		dtype = DTrgbe;
+	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);
-	if ((dtype != DTrgbe) & (dtype != DTxyze)) {
-		if (dtype == DTspec) {
-			if (rm->ncomp < 3)
-				return(0);	/* bad # components */
-			fputwlsplit(rm->wlpart, fp);
-		} else {
+						/* 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, "NCOLS=%d\n", rm->ncols);
+	}
+	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;
+		return(rmx_write_rgbe(dp, nc, len, fp));
 	case DTspec:
-		fprtresolu(rm->ncols, rm->nrows, fp);
-		ok = rmx_write_spec(rm, fp);
-		break;
-	default:
-		return(0);
+		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);
@@ -667,7 +643,7 @@ rmx_identity(const int dim, const int n)
 	return(rid);
 }
 
-/* Duplicate the given matrix */
+/* Duplicate the given matrix (may be unallocated) */
 RMATRIX *
 rmx_copy(const RMATRIX *rm)
 {
@@ -675,14 +651,20 @@ 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, array_size(dnew));
+	}
 	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);
 }
 
@@ -693,7 +675,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);
@@ -727,7 +709,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)
@@ -755,7 +738,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);
@@ -811,7 +795,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))
@@ -847,7 +831,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--; ) {
@@ -868,7 +852,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)