Index: trunk/archive/pslib/include/psMatrix.h
===================================================================
--- trunk/archive/pslib/include/psMatrix.h	(revision 257)
+++ trunk/archive/pslib/include/psMatrix.h	(revision 333)
@@ -45,11 +45,10 @@
 		    );
 
-/** Matrix operations */
+/** Matrix operation: addition, subtraction, multiplication */
 psMatrix *
 psMatrixOp(psMatrix *out,		//!< Matrix to return, or NULL
 	   const psMatrix *matrix1,	//!< Matrix 1
-	   const char *op,		//!< Operation to perform
 	   const psMatrix *matrix2	//!< Matrix 2
-	   );
+    );
 
 /** Transpose Matrix */
@@ -59,7 +58,30 @@
 		  );
 
+/***********************************************************************************************************/
+
+/* Conversions */
+
 /** Convert matrix to vector.  Intended for a 1-d matrix. */
 psVector *
-psMatrixToVector(psMatrix *myMatrix	//!< Matrix to convert
+psMatrixToVector(psVector *out,		//!< Vector to return, or NULL
+		 psMatrix *myMatrix	//!< Matrix to convert
+    );
+
+/** Convert vector to matrix. */
+psMatrix *
+psVectorToMatrix(psMatrix *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
     );