--- ray/src/util/rmatrix.c	2020/03/26 18:01:26	2.41
+++ ray/src/util/rmatrix.c	2021/01/15 02:46:28	2.45
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.41 2020/03/26 18:01:26 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.45 2021/01/15 02:46:28 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -24,7 +24,7 @@ rmx_alloc(int nr, int nc, int n)
 	if ((nr <= 0) | (nc <= 0) | (n <= 0))
 		return(NULL);
 	dnew = (RMATRIX *)malloc(sizeof(RMATRIX)-sizeof(dnew->mtx) +
-					sizeof(dnew->mtx[0])*(n*nr*nc));
+					sizeof(dnew->mtx[0])*n*nr*nc);
 	if (!dnew)
 		return(NULL);
 	dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n;
@@ -163,8 +163,8 @@ rmx_load_double(RMATRIX *rm, FILE *fp)
 {
 	int	i;
 
-	if (&rmx_lval(rm,0,0,0) - &rmx_lval(rm,1,0,0) !=
-				sizeof(double)*rm->ncols*rm->ncomp) {
+	if ((char *)&rmx_lval(rm,1,0,0) - (char *)&rmx_lval(rm,0,0,0) !=
+					sizeof(double)*rm->ncols*rm->ncomp) {
 		fputs("Code error in rmx_load_double()\n", stderr);
 		exit(1);
 	}