ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/util/cmatrix.c
(Generate patch)

Comparing ray/src/util/cmatrix.c (file contents):
Revision 2.6 by greg, Tue Jun 17 18:03:48 2014 UTC vs.
Revision 2.8 by greg, Sat Aug 2 17:10:43 2014 UTC

# Line 14 | Line 14 | static const char RCSid[] = "$Id$";
14   #include "resolu.h"
15  
16   const char      *cm_fmt_id[] = {
17 <                        "unknown", "ascii", "float", "double",
18 <                        COLRFMT, CIEFMT
17 >                        "unknown", "ascii", COLRFMT, CIEFMT,
18 >                        "float", "double"
19                  };
20  
21   const int       cm_elem_size[] = {
# Line 117 | Line 117 | cm_getheader(int *dt, int *nr, int *nc, FILE *fp)
117          cmi.dtype = DTfromHeader;
118          cmi.nrows = cmi.ncols = 0;
119          cmi.err = "unexpected EOF in header";
120 <        if (getheader(fp, &get_cminfo, &cmi) < 0)
120 >        if (getheader(fp, get_cminfo, &cmi) < 0)
121                  return(cmi.err);
122          if (dt != NULL) {                       /* get/check data type? */
123                  if (cmi.dtype == DTfromHeader) {

Diff Legend

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