--- ray/src/util/cmatrix.c	2014/06/17 18:03:48	2.6
+++ ray/src/util/cmatrix.c	2014/08/02 17:10:43	2.8
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: cmatrix.c,v 2.6 2014/06/17 18:03:48 greg Exp $";
+static const char RCSid[] = "$Id: cmatrix.c,v 2.8 2014/08/02 17:10:43 greg Exp $";
 #endif
 /*
  * Color matrix routines.
@@ -14,8 +14,8 @@ static const char RCSid[] = "$Id: cmatrix.c,v 2.6 2014
 #include "resolu.h"
 
 const char	*cm_fmt_id[] = {
-			"unknown", "ascii", "float", "double",
-			COLRFMT, CIEFMT
+			"unknown", "ascii", COLRFMT, CIEFMT,
+			"float", "double"
 		};
 
 const int	cm_elem_size[] = {
@@ -117,7 +117,7 @@ cm_getheader(int *dt, int *nr, int *nc, FILE *fp)
 	cmi.dtype = DTfromHeader;
 	cmi.nrows = cmi.ncols = 0;
 	cmi.err = "unexpected EOF in header";
-	if (getheader(fp, &get_cminfo, &cmi) < 0)
+	if (getheader(fp, get_cminfo, &cmi) < 0)
 		return(cmi.err);
 	if (dt != NULL) {			/* get/check data type? */
 		if (cmi.dtype == DTfromHeader) {