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.10 by greg, Wed Aug 14 18:20:02 2019 UTC vs.
Revision 2.12 by greg, Wed Mar 25 01:51:09 2020 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines