ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/Development/ray/src/util/rmatrix.h

Comparing ray/src/util/rmatrix.h (file contents):
Revision 2.5 by greg, Wed Aug 27 13:33:47 2014 UTC vs.
Revision 2.7 by greg, Mon May 4 20:53:21 2015 UTC

#	Line 31 | Line 31 | extern void    rmx_free(RMATRIX *rm);
31		/* Resolve data type based on two input types (returns 0 for mismatch) */
32		extern int      rmx_newtype(int dtyp1, int dtyp2);
33
34	<	/* Load matrix from supported file type */
35	<	extern RMATRIX  *rmx_load(const char *fname);
34	>	/* Load matrix from supported file type (NULL for stdin, '!' with command) */
35	>	extern RMATRIX  *rmx_load(const char *inspec);
36
37		/* Append header information associated with matrix data */
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 (old)
>	Changed lines (new)