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.7 by greg, Mon May 4 20:53:21 2015 UTC vs.
Revision 2.11 by greg, Thu Nov 7 23:10:18 2019 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, 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 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 41 | 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, FILE *fp);
45 > extern char     *cm_getheader(int *dt, int *nr, int *nc, int *swp, FILE *fp);
46  
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);
51
52 /* Scale a matrix by a single value */
53 extern CMATRIX  *cm_scale(const CMATRIX *cm1, const COLOR sca);
52  
53   /* Multiply two matrices (or a matrix and a vector) and allocate the result */
54   extern CMATRIX  *cm_multiply(const CMATRIX *cm1, const CMATRIX *cm2);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines