--- ray/src/util/cmatrix.c	2016/08/30 14:52:46	2.18
+++ ray/src/util/cmatrix.c	2018/08/02 18:33:49	2.20
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: cmatrix.c,v 2.18 2016/08/30 14:52:46 greg Exp $";
+static const char RCSid[] = "$Id: cmatrix.c,v 2.20 2018/08/02 18:33:49 greg Exp $";
 #endif
 /*
  * Color matrix routines.
@@ -21,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 */
@@ -87,7 +87,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) {