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

Comparing src/util/rmatrix.h (file contents):
Revision 2.4 by greg, Sat Aug 2 17:10:43 2014 UTC vs.
Revision 2.6 by greg, Thu Sep 18 23:20:12 2014 UTC

# Line 20 | Line 20 | typedef struct {
20          double  mtx[1];                 /* extends struct */
21   } RMATRIX;
22  
23 < #define rmx_lval(rm,r,c,i)      (rm)->mtx[((i)*(rm)->nrows+(r))*(rm)->ncols+(c)]
23 > #define rmx_lval(rm,r,c,i)      (rm)->mtx[(i)+(rm)->ncomp*((c)+(rm)->ncols*(r))]
24  
25   /* Allocate a nr x nc matrix with n components */
26   extern RMATRIX  *rmx_alloc(int nr, int nc, int n);
# Line 38 | Line 38 | extern RMATRIX *rmx_load(const char *fname);
38   extern int      rmx_addinfo(RMATRIX *rm, const char *info);
39  
40   /* Write matrix to file type indicated by dtype */
41 < extern long     rmx_write(const RMATRIX *rm, int dtype, FILE *fp);
41 > extern int      rmx_write(const RMATRIX *rm, int dtype, FILE *fp);
42  
43   /* Allocate and assign square identity matrix with n components */
44   extern RMATRIX  *rmx_identity(int dim, int n);

Diff Legend

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