Index: /trunk/archive/pslib/include/psMatrix.h
===================================================================
--- /trunk/archive/pslib/include/psMatrix.h	(revision 339)
+++ /trunk/archive/pslib/include/psMatrix.h	(revision 340)
@@ -7,10 +7,4 @@
  */
 
-/** A matrix */
-typedef struct {
-    int xSize, ySize;			//!< Dimensions in x and y
-    float *restrict *restrict value;	//!< Values in matrix
-} psMatrix;
-
 /** Functions **************************************************************/
 /** \addtogroup MathGroup Math Utilities
@@ -18,23 +12,11 @@
  */
 
-/** Constructor */
-psMatrix *
-psMatrixAlloc(int Xdimen,		//!< x dimension of new matrix
-	      int Ydimen		//!< y dimension of new matrix
-    );
-
-/** Destructor */
-void
-psMatrixFree(psMatrix *restrict myMatrix	//!< Matrix to destroy
-    );
-
-/***********************************************************************************************************/
 
 /* Linear Algebra */
 
 /** Invert matrix.  Not using restrict, to allow inversion to be done in-place */
-psMatrix *
-psMatrixInvert(psMatrix *out,		//!< Matrix to return, or NULL
-	       const psMatrix *myMatrix, //!< Matrix to be inverted
+psImage *
+psMatrixInvert(psImage *out,		//!< Matrix to return, or NULL
+	       const psImage *myMatrix, //!< Matrix to be inverted
 	       float *restrict determinant //!< Determinant to return, or NULL
     );
@@ -42,18 +24,18 @@
 /** Matrix determinant */
 float
-psMatrixDeterminant(const psMatrix *restrict myMatrix //!< Matrix to get determinant for
+psMatrixDeterminant(const psImage *restrict myMatrix //!< Matrix to get determinant for
 		    );
 
 /** Matrix operation: addition, subtraction, multiplication */
-psMatrix *
-psMatrixOp(psMatrix *out,		//!< Matrix to return, or NULL
-	   const psMatrix *matrix1,	//!< Matrix 1
-	   const psMatrix *matrix2	//!< Matrix 2
+psImage *
+psMatrixOp(psImage *out,		//!< Matrix to return, or NULL
+	   const psImage *matrix1,	//!< Matrix 1
+	   const psImage *matrix2	//!< Matrix 2
     );
 
 /** Transpose Matrix */
-psMatrix *
-psMatrixTranspose(psMatrix *out,	//!< Matrix to return, or NULL
-		  const psMatrix *myMatrix //!< Matrix to transpose
+psImage *
+psMatrixTranspose(psImage *out,		//!< Matrix to return, or NULL
+		  const psImage *myMatrix //!< Matrix to transpose
 		  );
 
@@ -65,23 +47,11 @@
 psVector *
 psMatrixToVector(psVector *out,		//!< Vector to return, or NULL
-		 psMatrix *myMatrix	//!< Matrix to convert
+		 psImage *myMatrix	//!< Matrix to convert
     );
 
 /** Convert vector to matrix. */
-psMatrix *
-psVectorToMatrix(psMatrix *out,		//!< Matrix to return, or NULL
+psImage *
+psVectorToMatrix(psImage *out,		//!< Matrix to return, or NULL
 		 psVector *myVector	//!< Vector to convert
-    );
-
-/** Convert matrix to image */
-psImage *
-psMatrixToImage(psImage *out,		//!< Image to return, or NULL
-		psMatrix *myMatrix	//!< Matrix to convert
-    );
-
-/* Convert image to matrix */
-psMatrix *
-psImageToMatrix(psMatrix *out,		//!< Matrix to return, or NULL
-		psImage *myImage	//!< Image to convert
     );