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.25 by greg, Fri Jan 11 17:21:39 2013 UTC vs.
Revision 2.26 by greg, Fri Jan 11 17:54:17 2013 UTC

#	Line 122 | Line 122 | cm_load(const char *fname, int nrows, int ncols, int d
122		flockfile(fp);
123		#endif
124		if (dtype != DTascii)
125	<	SET_FILE_BINARY(fp);
125	>	SET_FILE_BINARY(fp);            /* doesn't really work */
126		if (dtype == DTfromHeader)
127		dtype = getDTfromHeader(fp);
128		switch (dtype) {
#	Line 266 | Line 266 | cm_column(const CMATRIX *cm, int c)
266		int     dr;
267
268		if ((c < 0) | (c >= cm->ncols))
269	<	return(NULL);
269	>	error(INTERNAL, "column requested outside matrix");
270		cvr = cm_alloc(cm->nrows, 1);
271		if (cvr == NULL)
272		return(NULL);

Diff Legend

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