--- ray/src/util/cmatrix.c	2015/05/08 18:25:03	2.10
+++ ray/src/util/cmatrix.c	2016/03/06 01:13:18	2.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: cmatrix.c,v 2.10 2015/05/08 18:25:03 greg Exp $";
+static const char RCSid[] = "$Id: cmatrix.c,v 2.16 2016/03/06 01:13:18 schorsch Exp $";
 #endif
 /*
  * Color matrix routines.
@@ -8,10 +8,11 @@ static const char RCSid[] = "$Id: cmatrix.c,v 2.10 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[] = {
@@ -148,8 +149,9 @@ 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)
 		inspec = "<stdin>";
@@ -218,15 +220,16 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 		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)
@@ -248,7 +251,7 @@ cm_load(const char *inspec, int nrows, int ncols, int 
 				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);