--- ray/src/util/cmatrix.c	2015/07/22 04:23:27	2.11
+++ ray/src/util/cmatrix.c	2019/08/12 18:28:37	2.21
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: cmatrix.c,v 2.11 2015/07/22 04:23:27 greg Exp $";
+static const char RCSid[] = "$Id: cmatrix.c,v 2.21 2019/08/12 18:28:37 greg Exp $";
 #endif
 /*
  * Color matrix routines.
@@ -8,10 +8,11 @@ static const char RCSid[] = "$Id: cmatrix.c,v 2.11 201
  */
 
 #include <ctype.h>
+#include "platform.h"
 #include "standard.h"
 #include "cmatrix.h"
 #include "platform.h"
-#include "rtprocess.h"
+#include "paths.h"
 #include "resolu.h"
 
 const char	*cm_fmt_id[] = {
@@ -20,7 +21,7 @@ const char	*cm_fmt_id[] = {
 		};
 
 const int	cm_elem_size[] = {
-			0, 0, 3*sizeof(float), 3*sizeof(double), 4, 4
+			0, 0, 4, 4, 3*sizeof(float), 3*sizeof(double)
 		};
 
 /* Allocate a color coefficient matrix */
@@ -33,7 +34,7 @@ cm_alloc(int nrows, int ncols)
 		error(USER, "attempt to create empty matrix");
 	cm = (CMATRIX *)malloc(sizeof(CMATRIX) +
 				sizeof(COLOR)*(nrows*ncols - 1));
-	if (cm == NULL)
+	if (!cm)
 		error(SYSTEM, "out of memory in cm_alloc()");
 	cm->nrows = nrows;
 	cm->ncols = ncols;
@@ -56,6 +57,8 @@ cm_resize(CMATRIX *cm, int nrows)
 {
 	size_t	old_size, new_size, ra_bounds[2];
 
+	if (!cm)
+		return(NULL);
 	if (nrows == cm->nrows)
 		return(cm);
 	if (nrows <= 0) {
@@ -69,7 +72,7 @@ cm_resize(CMATRIX *cm, int nrows)
 				new_size > ra_bounds[1]) {
 		adjacent_ra_sizes(ra_bounds, new_size);
 		cm = (CMATRIX *)realloc(cm, ra_bounds[1]);
-		if (cm == NULL)
+		if (!cm)
 			error(SYSTEM, "out of memory in cm_resize()");
 	}
 	cm->nrows = nrows;
@@ -86,7 +89,7 @@ static int
 get_cminfo(char *s, void *p)
 {
 	CMINFO	*ip = (CMINFO *)p;
-	char	fmt[32];
+	char	fmt[MAXFMTLEN];
 	int	i;
 
 	if (!strncmp(s, "NCOMP=", 6) && atoi(s+6) != 3) {
@@ -120,7 +123,7 @@ cm_getheader(int *dt, int *nr, int *nc, FILE *fp)
 	cmi.err = "unexpected EOF in header";
 	if (getheader(fp, get_cminfo, &cmi) < 0)
 		return(cmi.err);
-	if (dt != NULL) {			/* get/check data type? */
+	if (dt) {				/* get/check data type? */
 		if (cmi.dtype == DTfromHeader) {
 			if (*dt == DTfromHeader)
 				return("missing/unknown data format in header");
@@ -129,13 +132,13 @@ cm_getheader(int *dt, int *nr, int *nc, FILE *fp)
 		else if (*dt != cmi.dtype)
 			return("unexpected data format in header");
 	}
-	if (nr != NULL) {			/* get/check #rows? */
+	if (nr) {				/* get/check #rows? */
 		if (*nr <= 0)
 			*nr = cmi.nrows;
 		else if ((cmi.nrows > 0) & (*nr != cmi.nrows))
 			return("unexpected row count in header");
 	}
-	if (nc != NULL) {			/* get/check #columns? */
+	if (nc) {				/* get/check #columns? */
 		if (*nc <= 0)
 			*nc = cmi.ncols;
 		else if ((cmi.ncols > 0) & (*nc != cmi.ncols))
@@ -148,18 +151,19 @@ cm_getheader(int *dt, int *nr, int *nc, FILE *fp)
 CMATRIX *
 cm_load(const char *inspec, int nrows, int ncols, int dtype)
 {
-	FILE	*fp = stdin;
-	CMATRIX	*cm;
+	const int	ROWINC = 2048;
+	FILE		*fp = stdin;
+	CMATRIX		*cm;
 
-	if (inspec == NULL)
+	if (!inspec)
 		inspec = "<stdin>";
 	else if (inspec[0] == '!') {
 		fp = popen(inspec+1, "r");
-		if (fp == NULL) {
+		if (!fp) {
 			sprintf(errmsg, "cannot start command '%s'", inspec);
 			error(SYSTEM, errmsg);
 		}
-	} else if ((fp = fopen(inspec, "r")) == NULL) {
+	} else if (!(fp = fopen(inspec, "r"))) {
 		sprintf(errmsg, "cannot open file '%s'", inspec);
 		error(SYSTEM, errmsg);
 	}
@@ -170,7 +174,7 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 		SET_FILE_BINARY(fp);		/* doesn't really work */
 	if (!dtype | !ncols) {			/* expecting header? */
 		char	*err = cm_getheader(&dtype, &nrows, &ncols, fp);
-		if (err != NULL)
+		if (err)
 			error(USER, err);
 		if (ncols <= 0)
 			error(USER, "unspecified number of columns");
@@ -211,22 +215,23 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 		cm = cm_alloc(guessrows, ncols);
 	} else
 		cm = cm_alloc(nrows, ncols);
-	if (cm == NULL)					/* XXX never happens */
+	if (!cm)					/* XXX never happens */
 		return(NULL);
 	if (dtype == DTascii) {				/* read text file */
 		int	maxrow = (nrows > 0 ? nrows : 32000);
 		int	r, c;
 		for (r = 0; r < maxrow; r++) {
 		    if (r >= cm->nrows)			/* need more space? */
-			cm = cm_resize(cm, 2*cm->nrows);
+			cm = cm_resize(cm, cm->nrows+ROWINC);
 		    for (c = 0; c < ncols; c++) {
 		        COLORV	*cv = cm_lval(cm,r,c);
-			if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3)
+			if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3) {
 				if ((nrows <= 0) & (r > 0) & !c) {
 					cm = cm_resize(cm, maxrow=r);
 					break;
 				} else
 					goto EOFerror;
+			}
 		    }
 		}
 		while ((c = getc(fp)) != EOF)
@@ -241,14 +246,14 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 		if (sizeof(COLOR) == cm_elem_size[dtype]) {
 			int	nread = 0;
 			do {				/* read all we can */
-				nread += fread(cm->cmem + 3*nread,
+				nread += getbinary(cm->cmem + 3*nread,
 						sizeof(COLOR),
 						cm->nrows*cm->ncols - nread,
 						fp);
 				if (nrows <= 0) {	/* unknown length */
 					if (nread == cm->nrows*cm->ncols)
 							/* need more space? */
-						cm = cm_resize(cm, 2*cm->nrows);
+						cm = cm_resize(cm, cm->nrows+ROWINC);
 					else if (nread && !(nread % cm->ncols))
 							/* seem to be  done */
 						cm = cm_resize(cm, nread/cm->ncols);
@@ -266,7 +271,7 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 			if (n <= 0)
 				goto not_handled;
 			while (n--) {
-				if (fread(dc, sizeof(double), 3, fp) != 3)
+				if (getbinary(dc, sizeof(double), 3, fp) != 3)
 					goto EOFerror;
 				copycolor(cvp, dc);
 				cvp += 3;
@@ -279,7 +284,7 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 			if (n <= 0)
 				goto not_handled;
 			while (n--) {
-				if (fread(fc, sizeof(float), 3, fp) != 3)
+				if (getbinary(fc, sizeof(float), 3, fp) != 3)
 					goto EOFerror;
 				copycolor(cvp, fc);
 				cvp += 3;
@@ -320,10 +325,12 @@ cm_column(const CMATRIX *cm, int c)
 	CMATRIX	*cvr;
 	int	dr;
 
+	if (!cm)
+		return(NULL);
 	if ((c < 0) | (c >= cm->ncols))
 		error(INTERNAL, "column requested outside matrix");
 	cvr = cm_alloc(cm->nrows, 1);
-	if (cvr == NULL)
+	if (!cvr)
 		return(NULL);
 	for (dr = 0; dr < cm->nrows; dr++) {
 		const COLORV	*sp = cm_lval(cm,dr,c);
@@ -335,27 +342,6 @@ cm_column(const CMATRIX *cm, int c)
 	return(cvr);
 }
 
-/* Scale a matrix by a single value */
-CMATRIX *
-cm_scale(const CMATRIX *cm1, const COLOR sca)
-{
-	CMATRIX	*cmr;
-	int	dr, dc;
-
-	cmr = cm_alloc(cm1->nrows, cm1->ncols);
-	if (cmr == NULL)
-		return(NULL);
-	for (dr = 0; dr < cmr->nrows; dr++)
-	    for (dc = 0; dc < cmr->ncols; dc++) {
-	        const COLORV	*sp = cm_lval(cm1,dr,dc);
-		COLORV		*dp = cm_lval(cmr,dr,dc);
-		dp[0] = sp[0] * sca[0];
-		dp[1] = sp[1] * sca[1];
-		dp[2] = sp[2] * sca[2];
-	    }
-	return(cmr);
-}
-
 /* Multiply two matrices (or a matrix and a vector) and allocate the result */
 CMATRIX *
 cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2)
@@ -364,10 +350,12 @@ cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2)
 	CMATRIX	*cmr;
 	int	dr, dc, i;
 
+	if (!cm1 | !cm2)
+		return(NULL);
 	if ((cm1->ncols <= 0) | (cm1->ncols != cm2->nrows))
 		error(INTERNAL, "matrix dimension mismatch in cm_multiply()");
 	cmr = cm_alloc(cm1->nrows, cm2->ncols);
-	if (cmr == NULL)
+	if (!cmr)
 		return(NULL);
 				/* optimization: check for zero rows & cols */
 	if (((cm1->nrows > 5) | (cm2->ncols > 5)) & (cm1->ncols > 5)) {
@@ -392,22 +380,22 @@ cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2)
 		COLORV	*dp = cm_lval(cmr,dr,dc);
 		double	res[3];
 		dp[0] = dp[1] = dp[2] = 0;
-		if (rowcheck != NULL && !rowcheck[dr])
+		if (rowcheck && !rowcheck[dr])
 			continue;
-		if (colcheck != NULL && !colcheck[dc])
+		if (colcheck && !colcheck[dc])
 			continue;
 		res[0] = res[1] = res[2] = 0;
 		for (i = 0; i < cm1->ncols; i++) {
 		    const COLORV	*cp1 = cm_lval(cm1,dr,i);
 		    const COLORV	*cp2 = cm_lval(cm2,i,dc);
-		    res[0] += (double)cp1[0] * (double)cp2[0];
-		    res[1] += (double)cp1[1] * (double)cp2[1];
-		    res[2] += (double)cp1[2] * (double)cp2[2];
+		    res[0] += (double)cp1[0] * cp2[0];
+		    res[1] += (double)cp1[1] * cp2[1];
+		    res[2] += (double)cp1[2] * cp2[2];
 		}
 		copycolor(dp, res);
 	    }
-	if (rowcheck != NULL) free(rowcheck);
-	if (colcheck != NULL) free(colcheck);
+	if (rowcheck) free(rowcheck);
+	if (colcheck) free(colcheck);
 	return(cmr);
 }
 
@@ -416,9 +404,12 @@ int
 cm_write(const CMATRIX *cm, int dtype, FILE *fp)
 {
 	static const char	tabEOL[2] = {'\t','\n'};
-	const COLORV		*mp = cm->cmem;
+	const COLORV		*mp;
 	int			r, c;
 
+	if (!cm)
+		return(0);
+	mp = cm->cmem;
 	switch (dtype) {
 	case DTascii:
 		for (r = 0; r < cm->nrows; r++)
@@ -432,7 +423,7 @@ cm_write(const CMATRIX *cm, int dtype, FILE *fp)
 		if (sizeof(COLOR) == cm_elem_size[dtype]) {
 			r = cm->ncols*cm->nrows;
 			while (r > 0) {
-				c = fwrite(mp, sizeof(COLOR), r, fp);
+				c = putbinary(mp, sizeof(COLOR), r, fp);
 				if (c <= 0)
 					return(0);
 				mp += 3*c;
@@ -443,7 +434,7 @@ cm_write(const CMATRIX *cm, int dtype, FILE *fp)
 			r = cm->ncols*cm->nrows;
 			while (r--) {
 				copycolor(dc, mp);
-				if (fwrite(dc, sizeof(double), 3, fp) != 3)
+				if (putbinary(dc, sizeof(double), 3, fp) != 3)
 					return(0);
 				mp += 3;
 			}
@@ -452,7 +443,7 @@ cm_write(const CMATRIX *cm, int dtype, FILE *fp)
 			r = cm->ncols*cm->nrows;
 			while (r--) {
 				copycolor(fc, mp);
-				if (fwrite(fc, sizeof(float), 3, fp) != 3)
+				if (putbinary(fc, sizeof(float), 3, fp) != 3)
 					return(0);
 				mp += 3;
 			}