--- ray/src/util/rmatrix.c	2019/08/12 04:46:34	2.32
+++ ray/src/util/rmatrix.c	2019/08/12 18:15:44	2.33
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.32 2019/08/12 04:46:34 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.33 2019/08/12 18:15:44 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -28,7 +28,7 @@ rmx_alloc(int nr, int nc, int n)
 		return(NULL);
 	dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) +
 					sizeof(dnew->mtx[0])*(n*nr*nc));
-	if (dnew == NULL)
+	if (!dnew)
 		return(NULL);
 	dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n;
 	dnew->dtype = DTdouble;
@@ -63,7 +63,7 @@ rmx_newtype(int dtyp1, int dtyp2)
 int
 rmx_addinfo(RMATRIX *rm, const char *info)
 {
-	if (!info || !*info)
+	if (!rm || !info || !*info)
 		return(0);
 	if (!rm->info) {
 		rm->info = (char *)malloc(strlen(info)+1);
@@ -161,7 +161,7 @@ rmx_load_rgbe(RMATRIX *rm, FILE *fp)
 	COLOR	*scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols);
 	int	i, j;
 
-	if (scan == NULL)
+	if (!scan)
 		return(0);
 	for (i = 0; i < rm->nrows; i++) {
 	    if (freadscan(scan, rm->ncols, fp) < 0) {
@@ -186,11 +186,11 @@ rmx_load(const char *inspec)
 	RMATRIX		dinfo;
 	RMATRIX		*dnew;
 
-	if (inspec == NULL) {			/* reading from stdin? */
+	if (!inspec) {				/* reading from stdin? */
 		inspec = "<stdin>";
 		SET_FILE_BINARY(stdin);
 	} else if (inspec[0] == '!') {
-		if ((fp = popen(inspec+1, "r")) == NULL)
+		if (!(fp = popen(inspec+1, "r")))
 			return(NULL);
 		SET_FILE_BINARY(stdin);
 	} else {
@@ -201,7 +201,7 @@ rmx_load(const char *inspec)
 			--sp;
 		if (!strcasecmp(sp, "XML")) {	/* assume it's a BSDF */
 			CMATRIX	*cm = cm_loadBTDF((char *)inspec);
-			if (cm == NULL)
+			if (!cm)
 				return(NULL);
 			dnew = rmx_from_cmatrix(cm);
 			cm_free(cm);
@@ -209,7 +209,7 @@ rmx_load(const char *inspec)
 			return(dnew);
 		}
 						/* else open it ourselves */
-		if ((fp = fopen(inspec, "rb")) == NULL)
+		if (!(fp = fopen(inspec, "rb")))
 			return(NULL);
 	}
 #ifdef getc_unlocked
@@ -236,7 +236,7 @@ rmx_load(const char *inspec)
 		}
 	}
 	dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp);
-	if (dnew == NULL) {
+	if (!dnew) {
 		fclose(fp);
 		return(NULL);
 	}
@@ -344,7 +344,7 @@ rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
 	COLR	*scan = (COLR *)malloc(sizeof(COLR)*rm->ncols);
 	int	i, j;
 
-	if (scan == NULL)
+	if (!scan)
 		return(0);
 	for (i = 0; i < rm->nrows; i++) {
 	    for (j = rm->ncols; j--; )
@@ -367,7 +367,7 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 	RMATRIX	*mydm = NULL;
 	int	ok = 1;
 
-	if ((rm == NULL) | (fp == NULL))
+	if (!rm | !fp)
 		return(0);
 #ifdef getc_unlocked
 	flockfile(fp);
@@ -391,7 +391,7 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 			return(0);
 		cmtx[0] = cmtx[1] = cmtx[2] = 1;
 		mydm = rmx_transform(rm, 3, cmtx);
-		if (mydm == NULL)
+		if (!mydm)
 			return(0);
 		rm = mydm;
 	}
@@ -419,7 +419,8 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 #ifdef getc_unlocked
 	funlockfile(fp);
 #endif
-	rmx_free(mydm);
+	if (mydm)
+		rmx_free(mydm);
 	return(ok);
 }
 
@@ -430,7 +431,7 @@ rmx_identity(const int dim, const int n)
 	RMATRIX	*rid = rmx_alloc(dim, dim, n);
 	int	i, k;
 
-	if (rid == NULL)
+	if (!rid)
 		return(NULL);
 	memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim);
 	for (i = dim; i--; )
@@ -445,10 +446,10 @@ rmx_copy(const RMATRIX *rm)
 {
 	RMATRIX	*dnew;
 
-	if (rm == NULL)
+	if (!rm)
 		return(NULL);
 	dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp);
-	if (dnew == NULL)
+	if (!dnew)
 		return(NULL);
 	rmx_addinfo(dnew, rm->info);
 	dnew->dtype = rm->dtype;
@@ -464,18 +465,18 @@ rmx_transpose(const RMATRIX *rm)
 	RMATRIX	*dnew;
 	int	i, j, k;
 
-	if (rm == NULL)
+	if (!rm)
 		return(0);
 	if ((rm->nrows == 1) | (rm->ncols == 1)) {
 		dnew = rmx_copy(rm);
-		if (dnew == NULL)
+		if (!dnew)
 			return(NULL);
 		dnew->nrows = rm->ncols;
 		dnew->ncols = rm->nrows;
 		return(dnew);
 	}
 	dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp);
-	if (dnew == NULL)
+	if (!dnew)
 		return(NULL);
 	if (rm->info) {
 		rmx_addinfo(dnew, rm->info);
@@ -496,11 +497,10 @@ rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
 	RMATRIX	*mres;
 	int	i, j, k, h;
 
-	if ((m1 == NULL) | (m2 == NULL) ||
-			(m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows))
+	if (!m1 | !m2 || (m1->ncomp != m2->ncomp) | (m1->ncols != m2->nrows))
 		return(NULL);
 	mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp);
-	if (mres == NULL)
+	if (!mres)
 		return(NULL);
 	i = rmx_newtype(m1->dtype, m2->dtype);
 	if (i)
@@ -525,8 +525,7 @@ rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide
 	int	zeroDivides = 0;
 	int	i, j, k;
 
-	if ((m1 == NULL) | (m2 == NULL) ||
-			(m1->ncols != m2->ncols) | (m1->nrows != m2->nrows))
+	if (!m1 | !m2 || (m1->ncols != m2->ncols) | (m1->nrows != m2->nrows))
 		return(0);
 	if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp))
 		return(0);
@@ -582,14 +581,14 @@ rmx_sum(RMATRIX *msum, const RMATRIX *madd, const doub
 	double	*mysf = NULL;
 	int	i, j, k;
 
-	if ((msum == NULL) | (madd == NULL) ||
+	if (!msum | !madd ||
 			(msum->nrows != madd->nrows) |
 			(msum->ncols != madd->ncols) |
 			(msum->ncomp != madd->ncomp))
 		return(0);
-	if (sf == NULL) {
+	if (!sf) {
 		mysf = (double *)malloc(sizeof(double)*msum->ncomp);
-		if (mysf == NULL)
+		if (!mysf)
 			return(0);
 		for (k = msum->ncomp; k--; )
 			mysf[k] = 1;
@@ -604,8 +603,8 @@ rmx_sum(RMATRIX *msum, const RMATRIX *madd, const doub
 	    for (j = msum->ncols; j--; )
 		for (k = msum->ncomp; k--; )
 		     rmx_lval(msum,i,j,k) += sf[k] * rmx_lval(madd,i,j,k);
-
-	free(mysf);
+	if (mysf)
+		free(mysf);
 	return(1);
 }
 
@@ -615,7 +614,7 @@ rmx_scale(RMATRIX *rm, const double sf[])
 {
 	int	i, j, k;
 
-	if ((rm == NULL) | (sf == NULL))
+	if (!rm | !sf)
 		return(0);
 	for (i = rm->nrows; i--; )
 	    for (j = rm->ncols; j--; )
@@ -634,10 +633,10 @@ rmx_transform(const RMATRIX *msrc, int n, const double
 	int	i, j, ks, kd;
 	RMATRIX	*dnew;
 
-	if ((msrc == NULL) | (n <= 0) | (cmat == NULL))
+	if (!msrc | (n <= 0) | !cmat)
 		return(NULL);
 	dnew = rmx_alloc(msrc->nrows, msrc->ncols, n);
-	if (dnew == NULL)
+	if (!dnew)
 		return(NULL);
 	if (msrc->info) {
 		char	buf[128];
@@ -665,10 +664,10 @@ rmx_from_cmatrix(const CMATRIX *cm)
 	int	i, j;
 	RMATRIX	*dnew;
 
-	if (cm == NULL)
+	if (!cm)
 		return(NULL);
 	dnew = rmx_alloc(cm->nrows, cm->ncols, 3);
-	if (dnew == NULL)
+	if (!dnew)
 		return(NULL);
 	dnew->dtype = DTfloat;
 	for (i = dnew->nrows; i--; )
@@ -688,10 +687,10 @@ cm_from_rmatrix(const RMATRIX *rm)
 	int	i, j;
 	CMATRIX	*cnew;
 
-	if (rm == NULL || rm->ncomp != 3)
+	if (!rm || rm->ncomp != 3)
 		return(NULL);
 	cnew = cm_alloc(rm->nrows, rm->ncols);
-	if (cnew == NULL)
+	if (!cnew)
 		return(NULL);
 	for (i = cnew->nrows; i--; )
 	    for (j = cnew->ncols; j--; ) {