ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/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.8 by greg, Wed Oct 31 22:19:57 2018 UTC

# Line 8 | Line 8
8   #ifndef _RAD_CMATRIX_H_
9   #define _RAD_CMATRIX_H_
10  
11 + #include  <sys/types.h>
12   #include "color.h"
13  
14   #ifdef __cplusplus
# Line 15 | Line 16 | extern "C" {
16   #endif
17  
18   /* Data types for file loading */
19 < enum {DTfromHeader=0, DTascii, DTfloat, DTdouble, DTrgbe, DTxyze, DTend};
19 > enum {DTfromHeader=0, DTascii, DTrgbe, DTxyze, DTfloat, DTdouble, DTend};
20  
21   extern const char       *cm_fmt_id[];
22   extern const int        cm_elem_size[];
# Line 28 | Line 29 | typedef struct {
29  
30   #define COLSPEC (sizeof(COLORV)==sizeof(float) ? "%f %f %f" : "%lf %lf %lf")
31  
32 < #define cm_lval(cm,r,c) ((cm)->cmem + 3*((r)*(cm)->ncols + (c)))
32 > #define cm_lval(cm,r,c) ((cm)->cmem + 3*((size_t)(r)*(cm)->ncols + (c)))
33  
34   #define cv_lval(cm,i)   ((cm)->cmem + 3*(i))
35  
# Line 43 | Line 44 | extern CMATRIX *cm_resize(CMATRIX *cm, int nrows);
44   /* Load header to obtain/check data type and matrix dimensions */
45   extern char     *cm_getheader(int *dt, int *nr, int *nc, FILE *fp);
46  
47 < /* Allocate and load a matrix from the given file (or stdin if NULL) */
48 < extern CMATRIX  *cm_load(const char *fname, int nrows, int ncols, int dtype);
47 > /* Allocate and load a matrix from the given input (or stdin if NULL) */
48 > extern CMATRIX  *cm_load(const char *inspec, int nrows, int ncols, int dtype);
49  
50   /* Extract a column vector from a matrix */
51   extern CMATRIX  *cm_column(const CMATRIX *cm, int c);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines