--- ray/src/util/rmatrix.h	2014/08/01 23:37:24	2.3
+++ ray/src/util/rmatrix.h	2014/09/18 23:20:12	2.6
@@ -1,4 +1,4 @@
-/* RCSid $Id: rmatrix.h,v 2.3 2014/08/01 23:37:24 greg Exp $ */
+/* RCSid $Id: rmatrix.h,v 2.6 2014/09/18 23:20:12 greg Exp $ */
 /*
  * Header file for general matrix routines.
  */
@@ -15,25 +15,30 @@ extern "C" {
 /* General plane-ordered component matrix */
 typedef struct {
 	int	nrows, ncols, ncomp;
+	int	dtype;
 	char	*info;
 	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))]
 
-#define rmx_free(rm)		free(rm)
-
 /* Allocate a nr x nc matrix with n components */
 extern RMATRIX	*rmx_alloc(int nr, int nc, int n);
 
+/* Free a RMATRIX array */
+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);
 
 /* Append header information associated with matrix data */
 extern int	rmx_addinfo(RMATRIX *rm, const char *info);
 
-/* Write matrix to file type indicated by dt */
-extern long	rmx_write(const RMATRIX *rm, int dtype, FILE *fp);
+/* Write matrix to file type indicated by dtype */
+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);