--- ray/src/util/rmatrix.h	2014/08/02 17:10:43	2.4
+++ ray/src/util/rmatrix.h	2015/05/04 20:53:21	2.7
@@ -1,4 +1,4 @@
-/* RCSid $Id: rmatrix.h,v 2.4 2014/08/02 17:10:43 greg Exp $ */
+/* RCSid $Id: rmatrix.h,v 2.7 2015/05/04 20:53:21 greg Exp $ */
 /*
  * Header file for general matrix routines.
  */
@@ -20,7 +20,7 @@ typedef struct {
 	double	mtx[1];			/* extends struct */
 } RMATRIX;
 
-#define rmx_lval(rm,r,c,i)	(rm)->mtx[((i)*(rm)->nrows+(r))*(rm)->ncols+(c)]
+#define rmx_lval(rm,r,c,i)	(rm)->mtx[(i)+(rm)->ncomp*((c)+(rm)->ncols*(r))]
 
 /* Allocate a nr x nc matrix with n components */
 extern RMATRIX	*rmx_alloc(int nr, int nc, int n);
@@ -31,14 +31,14 @@ extern void	rmx_free(RMATRIX *rm);
 /* Resolve data type based on two input types (returns 0 for mismatch) */
 extern int	rmx_newtype(int dtyp1, int dtyp2);
 
-/* Load matrix from supported file type */
-extern RMATRIX	*rmx_load(const char *fname);
+/* Load matrix from supported file type (NULL for stdin, '!' with command) */
+extern RMATRIX	*rmx_load(const char *inspec);
 
 /* Append header information associated with matrix data */
 extern int	rmx_addinfo(RMATRIX *rm, const char *info);
 
 /* Write matrix to file type indicated by dtype */
-extern long	rmx_write(const RMATRIX *rm, int dtype, FILE *fp);
+extern int	rmx_write(const RMATRIX *rm, int dtype, FILE *fp);
 
 /* Allocate and assign square identity matrix with n components */
 extern RMATRIX	*rmx_identity(int dim, int n);