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.33 by greg, Fri Jan 22 16:19:15 2021 UTC vs.
Revision 2.35 by greg, Wed Apr 27 01:31:56 2022 UTC

#	Line 214 | Line 214 | CMATRIX *
214		cm_load(const char *inspec, int nrows, int ncols, int dtype)
215		{
216		const int       ROWINC = 2048;
217	+	int             rowsOK = (dtype == DTascii) | (nrows > 0);
218		int             swap = 0;
219		FILE            *fp;
220		COLOR           scale;
#	Line 240 | Line 241 | cm_load(const char *inspec, int nrows, int ncols, int
241		#endif
242		if (dtype != DTascii)
243		SET_FILE_BINARY(fp);            /* doesn't really work */
244	<	if (!dtype | !ncols) {                  /* expecting header? */
244	>	if (!dtype | !rowsOK | !ncols) {        /* expecting header? */
245		char    *err = cm_getheader(&dtype, &nrows, &ncols, &swap, scale, fp);
246		if (err)
247		error(USER, err);
248	+	rowsOK = (nrows > 0);
249		}
250	<	if (ncols <= 0 && !fscnresolu(&ncols, &nrows, fp))
251	<	error(USER, "unspecified number of columns");
250	>	if (!rowsOK | !ncols && !fscnresolu(&ncols, &nrows, fp))
251	>	error(USER, "unspecified matrix size");
252		switch (dtype) {
253		case DTascii:
254		case DTfloat:

Diff Legend

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