ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/cmatrix.c

Comparing ray/src/util/cmatrix.c (file contents):
Revision 2.10 by greg, Fri May 8 18:25:03 2015 UTC vs.
Revision 2.13 by greg, Sat Aug 1 23:27:04 2015 UTC

#	Line 221 | Line 221 | cm_load(const char *inspec, int nrows, int ncols, int
221		cm = cm_resize(cm, 2*cm->nrows);
222		for (c = 0; c < ncols; c++) {
223		COLORV  *cv = cm_lval(cm,r,c);
224	<	if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3)
224	>	if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3) {
225		if ((nrows <= 0) & (r > 0) & !c) {
226		cm = cm_resize(cm, maxrow=r);
227		break;
228		} else
229		goto EOFerror;
230	+	}
231		}
232		}
233		while ((c = getc(fp)) != EOF)

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)