--- ray/src/util/rmatrix.c	2023/12/04 22:02:40	2.69
+++ ray/src/util/rmatrix.c	2024/02/29 03:11:13	2.78
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.69 2023/12/04 22:02:40 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.78 2024/02/29 03:11:13 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -374,14 +374,15 @@ rmx_load(const char *inspec, RMPref rmp)
 		fp = stdin;
 	else if (inspec[0] == '!')
 		fp = popen(inspec+1, "r");
-	else if (rmp != RMPnone) {
+	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) :
+			CMATRIX	*cm = rmp==RMPnone ? (CMATRIX *)NULL :
+					rmp==RMPtrans ? cm_loadBTDF(inspec) :
 					cm_loadBRDF(inspec, rmp==RMPreflB) ;
 			if (!cm)
 				return(NULL);
@@ -392,8 +393,10 @@ rmx_load(const char *inspec, RMPref rmp)
 		}				/* else open it ourselves */
 		fp = fopen(inspec, "r");
 	}
-	if (!fp)
+	if (!fp) {
+		fprintf(stderr, "Cannot open for reading: %s\n", inspec);
 		return(NULL);
+	}
 #ifdef getc_unlocked
 	flockfile(fp);
 #endif
@@ -449,7 +452,7 @@ rmx_write_ascii(const double *dp, int nc, int len, FIL
 {
 	while (len-- > 0) {
 		int	k = nc;
-		while (nc-- > 0)
+		while (k-- > 0)
 			fprintf(fp, " %.7e", *dp++);
 		fputc('\t', fp);
 	}
@@ -498,7 +501,7 @@ rmx_write_spec(const double *dp, int nc, int len, FILE
 	if (nc < 3) return(0);
 	scan = (uby8 *)tempbuffer((nc+1)*len);
 	if (!scan) return(0);
-	for (j = len; j--; dp += nc) {
+	for (j = 0; j < len; j++, dp += nc) {
 	    	for (k = nc; k--; )
 	    		scol[k] = dp[k];
 		scolor2scolr(scan+j*(nc+1), scol, nc);
@@ -527,7 +530,7 @@ findCIEprims(const char *info)
 int
 rmx_write_header(const RMATRIX *rm, int dtype, FILE *fp)
 {
-	if (!rm | !fp || !rm->mtx | (rm->ncols <= 0))
+	if (!rm | !fp || rm->ncols <= 0)
 		return(0);
 	if (rm->info)
 		fputs(rm->info, fp);
@@ -538,7 +541,9 @@ rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
 		dtype = DTxyze;
 	else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
 		dtype = DTrgbe;
-	if ((dtype == DTspec) & (rm->ncomp < 3))
+	if ((dtype < DTspec) & (rm->ncomp > 3))
+		dtype = DTspec;
+	else if ((dtype == DTspec) & (rm->ncomp <= 3))
 		return(0);
 
 	if (dtype == DTascii)			/* set file type (WINDOWS) */
@@ -559,8 +564,8 @@ rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
 	}
 	if (dtype >= DTspec) {			/* # components & split? */
 		fputncomp(rm->ncomp, fp);
-		if (dtype == DTspec || (rm->ncomp > 3 &&
-				memcmp(rm->wlpart, WLPART, sizeof(WLPART))))
+		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 */
@@ -665,6 +670,34 @@ rmx_copy(const RMATRIX *rm)
 	copycolor(dnew->cexp, rm->cexp);
 	memcpy(dnew->wlpart, rm->wlpart, sizeof(dnew->wlpart));
 	return(dnew);
+}
+
+/* Replace data in first matrix with data from second */
+int
+rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int dometa)
+{
+	if (!rdst | !rsrc || (rdst->nrows != rsrc->nrows) |
+			(rdst->ncols != rsrc->ncols) |
+			(rdst->ncomp != rsrc->ncomp))
+		return(0);
+
+	if (dometa) {		/* transfer everything? */
+		rmx_reset(rdst);
+		*rdst = *rsrc;
+		rsrc->info = NULL; rsrc->mapped = NULL; rsrc->mtx = NULL;
+		return(1);
+	}
+#ifdef MAP_FILE			/* just matrix data -- leave metadata */
+	if (rdst->mapped)
+		munmap(rdst->mapped, mapped_size(rdst));
+	else
+#endif
+	if (rdst->mtx)
+		free(rdst->mtx);
+	rdst->mapped = rsrc->mapped;
+	rdst->mtx = rsrc->mtx;
+	rsrc->mapped = NULL; rsrc->mtx = NULL;
+	return(1);
 }
 
 /* Allocate and assign transposed matrix */