ViewVC Help

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

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

Comparing ray/src/util/dctimestep.c (file contents):
Revision 2.5 by greg, Sat Jun 20 04:27:18 2009 UTC vs.
Revision 2.6 by greg, Sat Jun 20 04:37:43 2009 UTC

#	Line 160 | Line 160 | cm_load(const char *fname, int nrows, int ncols, int d
160		int     maxrow = (nrows > 0 ? nrows : 32000);
161		int     r, c;
162		for (r = 0; r < maxrow; r++) {
163	<	if (r >= cm->nrows)         /* need more space? */
163	>	if (r >= cm->nrows)                 /* need more space? */
164		cm = cm_resize(cm, 2*cm->nrows);
165		for (c = 0; c < ncols; c++) {
166		COLORV  *cv = cm_lval(cm,r,c);
167		if (fscanf(fp, COLSPEC, cv, cv+1, cv+2) != 3)
168	<	if ((nrows <= 0) & (r > 0) & (c == 0)) {
168	>	if ((nrows <= 0) & (r > 0) & !c) {
169		cm = cm_resize(cm, maxrow=r);
170		break;
171		} else
#	Line 193 | Line 193 | cm_load(const char *fname, int nrows, int ncols, int d
193		if (nread == cm->nrows*cm->ncols)
194		/* need more space? */
195		cm = cm_resize(cm, 2*cm->nrows);
196	<	else if (nread % cm->ncols == 0)
196	>	else if (nread && !(nread % cm->ncols))
197		/* seem to be  done */
198		cm = cm_resize(cm, nread/cm->ncols);
199		else            /* ended mid-row */

Diff Legend

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