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

Comparing ray/src/util/cmatrix.h (file contents):
Revision 2.5 by greg, Fri May 30 00:00:54 2014 UTC vs.
Revision 2.7 by greg, Mon May 4 20:53:21 2015 UTC

# Line 15 | Line 15 | extern "C" {
15   #endif
16  
17   /* Data types for file loading */
18 < enum {DTfromHeader=0, DTascii, DTfloat, DTdouble, DTrgbe, DTxyze, DTend};
18 > enum {DTfromHeader=0, DTascii, DTrgbe, DTxyze, DTfloat, DTdouble, DTend};
19  
20   extern const char       *cm_fmt_id[];
21   extern const int        cm_elem_size[];
# Line 43 | Line 43 | extern CMATRIX *cm_resize(CMATRIX *cm, int nrows);
43   /* Load header to obtain/check data type and matrix dimensions */
44   extern char     *cm_getheader(int *dt, int *nr, int *nc, FILE *fp);
45  
46 < /* Allocate and load a matrix from the given file (or stdin if NULL) */
47 < extern CMATRIX  *cm_load(const char *fname, int nrows, int ncols, int dtype);
46 > /* Allocate and load a matrix from the given input (or stdin if NULL) */
47 > extern CMATRIX  *cm_load(const char *inspec, int nrows, int ncols, int dtype);
48  
49   /* Extract a column vector from a matrix */
50   extern CMATRIX  *cm_column(const CMATRIX *cm, int c);

Diff Legend

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