--- ray/src/util/rmatrix.c	2024/02/29 03:11:13	2.78
+++ ray/src/util/rmatrix.c	2024/10/08 00:43:57	2.83
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.78 2024/02/29 03:11:13 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.83 2024/10/08 00:43:57 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -18,9 +18,6 @@ static const char RCSid[] = "$Id: rmatrix.c,v 2.78 202
 
 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)
@@ -34,7 +31,7 @@ rmx_new(int nr, int nc, int n)
 	if (!dnew)
 		return(NULL);
 
-	dnew->dtype = DTdouble;
+	dnew->dtype = DTrmx_native;
 	dnew->nrows = nr;
 	dnew->ncols = nc;
 	dnew->ncomp = n;
@@ -49,11 +46,12 @@ int
 rmx_prepare(RMATRIX *rm)
 {
 	if (!rm) return(0);
-	if (rm->mtx)
+	if (rm->mtx)			/* assume it's right size */
 		return(1);
 	if ((rm->nrows <= 0) | (rm->ncols <= 0) | (rm->ncomp <= 0))
 		return(0);
-	rm->mtx = (double *)malloc(array_size(rm));
+	rm->mtx = (rmx_dtype *)malloc(rmx_array_size(rm));
+	rm->pflags |= RMF_FREEMEM;
 	return(rm->mtx != NULL);
 }
 
@@ -63,9 +61,9 @@ 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);
 }
@@ -79,16 +77,17 @@ rmx_reset(RMATRIX *rm)
 		free(rm->info);
 		rm->info = NULL;
 	}
-	if (rm->mtx) {
 #ifdef MAP_FILE
-		if (rm->mapped) {
-			munmap(rm->mapped, mapped_size(rm));
-			rm->mapped = NULL;
-		} else
+	if (rm->mapped) {
+		munmap(rm->mapped, rmx_mapped_size(rm));
+		rm->mapped = NULL;
+	} else
 #endif
-			free(rm->mtx);
-		rm->mtx = NULL;
+	if (rm->pflags & RMF_FREEMEM) {
+		free(rm->mtx);
+		rm->pflags &= ~RMF_FREEMEM;
 	}
+	rm->mtx = NULL;
 }
 
 /* Free an RMATRIX struct and data */
@@ -117,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,
@@ -142,39 +140,41 @@ get_dminfo(char *s, void *p)
 	char	fmt[MAXFMTLEN];
 	int	i;
 
-	if (headidval(NULL, s))
+	if (isheadid(s))
 		return(0);
 	if (isncomp(s)) {
 		ip->ncomp = ncompval(s);
-		return(0);
+		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)) {
-		wlsplitval(ip->wlpart, s);
-		return(0);
-	}
+	if (iswlsplit(s))
+		return(wlsplitval(ip->wlpart, s) - 1);
+
 	if (!formatval(fmt, s)) {
 		rmx_addinfo(ip, s);
 		return(0);
@@ -184,11 +184,11 @@ get_dminfo(char *s, void *p)
 			ip->dtype = i;
 			return(0);
 		}
-	return(-1);
+	return(-1);		/* bad format */
 }
 
 static int
-rmx_load_ascii(double *drp, const RMATRIX *rm, FILE *fp)
+rmx_load_ascii(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
 	int	j, k;
 
@@ -200,7 +200,7 @@ rmx_load_ascii(double *drp, const RMATRIX *rm, FILE *f
 }
 
 static int
-rmx_load_float(double *drp, const RMATRIX *rm, FILE *fp)
+rmx_load_float(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
 	int	j, k;
 	float	val[100];
@@ -212,7 +212,7 @@ rmx_load_float(double *drp, const RMATRIX *rm, FILE *f
 	for (j = 0; j < rm->ncols; j++) {
 		if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
 			return(0);
-		if (rm->swapin)
+		if (rm->pflags & RMF_SWAPIN)
 			swap32((char *)val, rm->ncomp);
 	        for (k = 0; k < rm->ncomp; k++)
 			*drp++ = val[k];
@@ -221,17 +221,17 @@ rmx_load_float(double *drp, const RMATRIX *rm, FILE *f
 }
 
 static int
-rmx_load_double(double *drp, const RMATRIX *rm, FILE *fp)
+rmx_load_double(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
 	if (getbinary(drp, sizeof(*drp)*rm->ncomp, rm->ncols, fp) != rm->ncols)
 		return(0);
-	if (rm->swapin)
+	if (rm->pflags & RMF_SWAPIN)
 		swap64((char *)drp, rm->ncols*rm->ncomp);
 	return(1);
 }
 
 static int
-rmx_load_rgbe(double *drp, const RMATRIX *rm, FILE *fp)
+rmx_load_rgbe(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
 	COLR	*scan;
 	COLOR	col;
@@ -254,7 +254,7 @@ rmx_load_rgbe(double *drp, const RMATRIX *rm, FILE *fp
 }
 
 static int
-rmx_load_spec(double *drp, const RMATRIX *rm, FILE *fp)
+rmx_load_spec(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
 	uby8	*scan;
 	SCOLOR	scol;
@@ -287,11 +287,11 @@ rmx_load_header(RMATRIX *rm, FILE *fp)
 		rm->ncomp = 3;
 		setcolor(rm->cexp, 1.f, 1.f, 1.f);
 		memcpy(rm->wlpart, WLPART, sizeof(rm->wlpart));
-		rm->swapin = 0;
+		rm->pflags = 0;
 	}
 	rm->dtype = DTascii;			/* assumed w/o FORMAT */
 	if (getheader(fp, get_dminfo, rm) < 0) {
-		fputs("Unrecognized matrix format\n", stderr);
+		fputs("Bad matrix header\n", stderr);
 		return(0);
 	}
 	if ((rm->dtype == DTrgbe) | (rm->dtype == DTxyze) &&
@@ -307,9 +307,9 @@ rmx_load_header(RMATRIX *rm, FILE *fp)
 	return(1);
 }
 
-/* Load next row as double (cannot be XML) */
+/* Load next row as rmx_dtype (cannot be XML) */
 int
-rmx_load_row(double *drp, const RMATRIX *rm, FILE *fp)
+rmx_load_row(rmx_dtype *drp, const RMATRIX *rm, FILE *fp)
 {
 	switch (rm->dtype) {
 	case DTascii:
@@ -336,12 +336,16 @@ 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,
+	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) {
-			rm->mtx = (double *)rm->mapped + pos/sizeof(double);
+			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;
@@ -349,7 +353,7 @@ rmx_load_data(RMATRIX *rm, FILE *fp)
 #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));
+				(1./(1L<<20))*(double)rmx_array_size(rm));
 		return(0);
 	}
 	for (i = 0; i < rm->nrows; i++)
@@ -430,17 +434,17 @@ rmx_load(const char *inspec, RMPref rmp)
 			(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);
 		}
+		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];
+			cmlt[i] = cmlt[1];	/* XXX hack! */
 		rmx_scale(dnew, cmlt);
 		setcolor(dnew->cexp, 1.f, 1.f, 1.f);
 	}
@@ -448,7 +452,7 @@ rmx_load(const char *inspec, RMPref rmp)
 }
 
 static int
-rmx_write_ascii(const double *dp, int nc, int len, FILE *fp)
+rmx_write_ascii(const rmx_dtype *dp, int nc, int len, FILE *fp)
 {
 	while (len-- > 0) {
 		int	k = nc;
@@ -460,7 +464,7 @@ rmx_write_ascii(const double *dp, int nc, int len, FIL
 }
 
 static int
-rmx_write_float(const double *dp, int len, FILE *fp)
+rmx_write_float(const rmx_dtype *dp, int len, FILE *fp)
 {
 	float	val;
 
@@ -473,7 +477,7 @@ rmx_write_float(const double *dp, int len, FILE *fp)
 }
 
 static int
-rmx_write_rgbe(const double *dp, int nc, int len, FILE *fp)
+rmx_write_rgbe(const rmx_dtype *dp, int nc, int len, FILE *fp)
 {
 	COLR	*scan;
 	int	j;
@@ -492,7 +496,7 @@ rmx_write_rgbe(const double *dp, int nc, int len, FILE
 }
 
 static int
-rmx_write_spec(const double *dp, int nc, int len, FILE *fp)
+rmx_write_spec(const rmx_dtype *dp, int nc, int len, FILE *fp)
 {
 	uby8	*scan;
 	SCOLOR	scol;
@@ -580,14 +584,14 @@ rmx_write_header(const RMATRIX *rm, int dtype, FILE *f
 
 /* Write out matrix data (usually by row) */
 int
-rmx_write_data(const double *dp, int nc, int len, int dtype, FILE *fp)
+rmx_write_data(const rmx_dtype *dp, int nc, int len, int dtype, FILE *fp)
 {
 	switch (dtype) {
 	case DTascii:
 		return(rmx_write_ascii(dp, nc, len, fp));
 	case DTfloat:
 		return(rmx_write_float(dp, nc*len, fp));
-	case DTdouble:
+	case DTrmx_native:
 		return(putbinary(dp, sizeof(*dp)*nc, len, fp) == len);
 	case DTrgbe:
 	case DTxyze:
@@ -611,7 +615,7 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 #ifdef getc_unlocked
 	flockfile(fp);
 #endif
-	if (dtype == DTdouble)			/* write all at once? */
+	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 */
@@ -638,9 +642,9 @@ 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.;
 	}
@@ -663,7 +667,7 @@ rmx_copy(const RMATRIX *rm)
 			rmx_free(dnew);
 			return(NULL);
 		}
-		memcpy(dnew->mtx, rm->mtx, array_size(dnew));
+		memcpy(dnew->mtx, rm->mtx, rmx_array_size(dnew));
 	}
 	rmx_addinfo(dnew, rm->info);
 	dnew->dtype = rm->dtype;
@@ -689,13 +693,16 @@ rmx_transfer_data(RMATRIX *rdst, RMATRIX *rsrc, int do
 	}
 #ifdef MAP_FILE			/* just matrix data -- leave metadata */
 	if (rdst->mapped)
-		munmap(rdst->mapped, mapped_size(rdst));
+		munmap(rdst->mapped, rmx_mapped_size(rdst));
 	else
 #endif
-	if (rdst->mtx)
+	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);
 }
@@ -730,7 +737,7 @@ rmx_transpose(const RMATRIX *rm)
 	for (j = dnew->ncols; j--; )
 	    for (i = dnew->nrows; i--; )
 	    	memcpy(rmx_lval(dnew,i,j), rmx_val(rm,j,i),
-	    			sizeof(double)*dnew->ncomp);
+	    			sizeof(rmx_dtype)*dnew->ncomp);
 	return(dnew);
 }
 
@@ -755,7 +762,7 @@ rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
 	for (i = mres->nrows; i--; )
 	    for (j = mres->ncols; j--; )
 	        for (k = mres->ncomp; k--; ) {
-		    double	d = 0;
+		    rmx_dtype	d = 0;
 		    for (h = m1->ncols; h--; )
 			d += rmx_val(m1,i,h)[k] * rmx_val(m2,h,j)[k];
 		    rmx_lval(mres,i,j)[k] = d;
@@ -783,7 +790,7 @@ 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_val(m2,i,j)[0];
 			if (d == 0) {
@@ -806,7 +813,7 @@ rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide
 			}
 		} else {
 		    if (m2->ncomp == 1) {
-			const double	d = rmx_val(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
@@ -847,8 +854,8 @@ 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_val(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];
 	    }
@@ -867,7 +874,7 @@ rmx_scale(RMATRIX *rm, const double sf[])
 		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];
 	    }
@@ -899,9 +906,9 @@ 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_val(msrc,i,j);
+		const rmx_dtype	*ds = rmx_val(msrc,i,j);
 	        for (kd = dnew->ncomp; kd--; ) {
-		    double	d = 0;
+		    rmx_dtype	d = 0;
 		    for (ks = msrc->ncomp; ks--; )
 		        d += cmat[kd*msrc->ncomp + ks] * ds[ks];
 		    rmx_lval(dnew,i,j)[kd] = d;
@@ -926,7 +933,7 @@ rmx_from_cmatrix(const CMATRIX *cm)
 	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);
+		rmx_dtype	*dp = rmx_lval(dnew,i,j);
 		dp[0] = cv[0];
 		dp[1] = cv[1];
 		dp[2] = cv[2];
@@ -948,7 +955,7 @@ cm_from_rmatrix(const RMATRIX *rm)
 		return(NULL);
 	for (i = cnew->nrows; i--; )
 	    for (j = cnew->ncols; j--; ) {
-		const double	*dp = rmx_val(rm,i,j);
+		const rmx_dtype	*dp = rmx_val(rm,i,j);
 		COLORV		*cv = cm_lval(cnew,i,j);
 		switch (rm->ncomp) {
 		case 3: