Index: /trunk/psLib/src/db/psDB.c
===================================================================
--- /trunk/psLib/src/db/psDB.c	(revision 4588)
+++ /trunk/psLib/src/db/psDB.c	(revision 4589)
@@ -12,6 +12,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-15 02:33:52 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -49,8 +49,11 @@
 // SQL generation functions
 static char    *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *where);
-static char    *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit);
+static char    *psDBGenerateSelectRowSQL(const char *tableName, const char *col,
+        const psMetadata *where, psU64 limit);
 static char    *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row);
-static char    *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values);
-static char    *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where, unsigned long long limit);
+static char    *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where,
+        const psMetadata *values);
+static char    *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where,
+        unsigned long long limit);
 static char    *psDBGenerateWhereSQL(const psMetadata *where);
 static char    *psDBGenerateSetSQL(const psMetadata *set
@@ -89,5 +92,8 @@
 /*****************************************************************************/
 
-psDB *psDBInit(const char *host, const char *user, const char *passwd, const char *dbname)
+psDB *psDBInit(const char *host,
+               const char *user,
+               const char *passwd,
+               const char *dbname)
 {
     MYSQL           *mysql;
@@ -139,5 +145,6 @@
 }
 
-bool psDBCreate(psDB *dbh, const char *dbname)
+bool psDBCreate(psDB *dbh,
+                const char *dbname)
 {
     char            *query = NULL;
@@ -157,5 +164,6 @@
 }
 
-bool psDBChange(psDB *dbh, const char *dbname)
+bool psDBChange(psDB *dbh,
+                const char *dbname)
 {
     // Verify database object is valid
@@ -177,5 +185,6 @@
 }
 
-bool psDBDrop(psDB *dbh, const char *dbname)
+bool psDBDrop(psDB *dbh,
+              const char *dbname)
 {
     char            *query = NULL;
@@ -195,5 +204,7 @@
 }
 
-bool psDBCreateTable(psDB *dbh, const char *tableName, const psMetadata *md)
+bool psDBCreateTable(psDB *dbh,
+                     const char *tableName,
+                     const psMetadata *md)
 {
     char            *query;
@@ -225,5 +236,6 @@
 }
 
-bool psDBDropTable(psDB *dbh, const char *tableName)
+bool psDBDropTable(psDB *dbh,
+                   const char *tableName)
 {
     char            *query = NULL;
@@ -244,5 +256,8 @@
 }
 
-psArray *psDBSelectColumn(psDB *dbh, const char *tableName, const char *col, unsigned long long limit)
+psArray *psDBSelectColumn(psDB *dbh,
+                          const char *tableName,
+                          const char *col,
+                          unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -339,5 +354,9 @@
 }
 
-psVector *psDBSelectColumnNum(psDB *dbh, const char *tableName, const char *col, psElemType type, unsigned long long limit)
+psVector *psDBSelectColumnNum(psDB *dbh,
+                              const char *tableName,
+                              const char *col,
+                              psElemType type,
+                              unsigned long long limit)
 {
     psArray         *stringColumn;      // source psArray
@@ -403,5 +422,8 @@
 }
 
-psArray *psDBSelectRows(psDB *dbh, const char *tableName, const psMetadata *where, unsigned long long limit)
+psArray *psDBSelectRows(psDB *dbh,
+                        const char *tableName,
+                        const psMetadata *where,
+                        unsigned long long limit)
 {
     MYSQL_RES       *result;            // complete db result set
@@ -507,5 +529,7 @@
 }
 
-bool psDBInsertOneRow(psDB *dbh, const char *tableName, const psMetadata *row)
+bool psDBInsertOneRow(psDB *dbh,
+                      const char *tableName,
+                      const psMetadata *row)
 {
     psArray         *rowSet;           // psArray of row to insert
@@ -534,5 +558,7 @@
 }
 
-bool psDBInsertRows(psDB *dbh, const char *tableName, const psArray *rowSet)
+bool psDBInsertRows(psDB *dbh,
+                    const char *tableName,
+                    const psArray *rowSet)
 {
     psMetadata      *row;               // row of data
@@ -635,10 +661,12 @@
 }
 
-psArray *psDBDumpRows(psDB *dbh, const char *tableName)
+psArray *psDBDumpRows(psDB *dbh,
+                      const char *tableName)
 {
     return psDBSelectRows(dbh, tableName, NULL, 0);
 }
 
-psMetadata *psDBDumpCols(psDB *dbh, const char *tableName)
+psMetadata *psDBDumpCols(psDB *dbh,
+                         const char *tableName)
 {
     MYSQL_RES       *result;
@@ -698,5 +726,8 @@
 }
 
-psS64 psDBUpdateRows(psDB *dbh, const char *tableName, const psMetadata *where, const psMetadata *values)
+long psDBUpdateRows(psDB *dbh,
+                    const char *tableName,
+                    const psMetadata *where,
+                    const psMetadata *values)
 {
     char            *query;
@@ -779,5 +810,8 @@
 }
 
-psS64 psDBDeleteRows(psDB *dbh, const char *tableName, const psMetadata *where, unsigned long long limit)
+long psDBDeleteRows(psDB *dbh,
+                    const char *tableName,
+                    const psMetadata *where,
+                    unsigned long long limit)
 {
     char            *query;
@@ -818,5 +852,6 @@
 /*****************************************************************************/
 
-bool p_psDBRunQuery(psDB *dbh, const char *format)
+bool p_psDBRunQuery(psDB *dbh,
+                    const char *format)
 {
     // Verify database object is not NULL
@@ -835,5 +870,7 @@
 }
 
-static inline bool psDBPackRow(MYSQL_BIND *bind, const psMetadata *values, psU32 paramCount)
+static inline bool psDBPackRow(MYSQL_BIND *bind,
+                               const psMetadata *values,
+                               psU32 paramCount)
 {
     psListIterator  *cursor;            // row iterator
@@ -928,5 +965,6 @@
 /*****************************************************************************/
 
-static char *psDBGenerateCreateTableSQL(const char *tableName, const psMetadata *table)
+static char *psDBGenerateCreateTableSQL(const char *tableName,
+                                        const psMetadata *table)
 {
     char            *query = NULL;      // complete query
@@ -1004,5 +1042,8 @@
 }
 
-static char *psDBGenerateSelectRowSQL(const char *tableName, const char *col, const psMetadata *where, psU64 limit)
+static char *psDBGenerateSelectRowSQL(const char *tableName,
+                                      const char *col,
+                                      const psMetadata *where,
+                                      psU64 limit)
 {
     char            *query = NULL;
@@ -1041,5 +1082,6 @@
 }
 
-static char *psDBGenerateInsertRowSQL(const char *tableName, const psMetadata *row)
+static char *psDBGenerateInsertRowSQL(const char *tableName,
+                                      const psMetadata *row)
 {
     char            *query = NULL;
@@ -1097,5 +1139,7 @@
 }
 
-static char *psDBGenerateUpdateRowSQL(const char *tableName, const psMetadata *where, const psMetadata *values)
+static char *psDBGenerateUpdateRowSQL(const char *tableName,
+                                      const psMetadata *where,
+                                      const psMetadata *values)
 {
     char            *query = NULL;
@@ -1131,5 +1175,7 @@
 }
 
-static char *psDBGenerateDeleteRowSQL(const char *tableName, const psMetadata *where, unsigned long long limit)
+static char *psDBGenerateDeleteRowSQL(const char *tableName,
+                                      const psMetadata *where,
+                                      unsigned long long limit)
 {
     char            *query = NULL;
@@ -1261,5 +1307,6 @@
 /*****************************************************************************/
 
-static psElemType psDBMySQLToPType(enum enum_field_types type, unsigned int flags)
+static psElemType psDBMySQLToPType(enum enum_field_types type,
+                                   unsigned int flags)
 {
     psHash          *mysqlToSQLTable;   // type lookup table
@@ -1550,5 +1597,6 @@
 }
 
-static psPtr psDBMySQLTypeAlloc(enum enum_field_types type, bool isUnsigned)
+static psPtr psDBMySQLTypeAlloc(enum enum_field_types type,
+                                bool isUnsigned)
 {
     mysqlType       *mType;
@@ -1561,5 +1609,7 @@
 }
 
-static void psDBAddToLookupTable(psHash *lookupTable, psU32 type, const char *string)
+static void psDBAddToLookupTable(psHash *lookupTable,
+                                 psU32 type,
+                                 const char *string)
 {
     char            *key;
@@ -1575,5 +1625,7 @@
 }
 
-static void psDBAddVoidToLookupTable(psHash *lookupTable, psU32 type, psPtr value)
+static void psDBAddVoidToLookupTable(psHash *lookupTable,
+                                     psU32 type,
+                                     psPtr value)
 {
     char            *key;
@@ -1650,5 +1702,6 @@
 #define PS_IS_NAN(type, data, nan) *(type *)data == nan
 
-static bool psDBIsPTypeNaN(psElemType pType, psPtr data)
+static bool psDBIsPTypeNaN(psElemType pType,
+                           psPtr data)
 {
     bool    isNaN;
Index: /trunk/psLib/src/db/psDB.h
===================================================================
--- /trunk/psLib/src/db/psDB.h	(revision 4588)
+++ /trunk/psLib/src/db/psDB.h	(revision 4589)
@@ -10,6 +10,6 @@
  *  @author Joshua Hoblitt
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:00 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2005 Joshua Hoblitt, University of Hawaii
@@ -40,5 +40,5 @@
 /** Opens a new database connection
  *
- *  @return A new psDB object if the database connection is successful or NULL on
+ *  @return psDB*:      A new psDB object if the database connection is successful or NULL on
  *  failure.
  */
@@ -50,6 +50,5 @@
 );
 
-/** Closes a database connection
- */
+/** Closes a database connection  */
 void psDBCleanup(
     psDB *dbh                          ///< Database handle
@@ -58,5 +57,5 @@
 /** Creates a new database namespace
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBCreate(
@@ -67,5 +66,5 @@
 /** Changes the current database namespace
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBChange(
@@ -76,5 +75,5 @@
 /** Drops a database namespace
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBDrop(
@@ -89,5 +88,5 @@
  * dialect is provided.  Caveat emptor.
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool p_psDBRunQuery(
@@ -114,5 +113,5 @@
  * Key" or "Key".  Comments are otherwise ignored.
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBCreateTable(
@@ -124,5 +123,5 @@
 /** Deletes a database table
  *
- * @return true on success
+ * @return bool:    true on success
 */
 bool psDBDropTable(
@@ -137,5 +136,5 @@
  * entire range is returned.
  *
- * @return A psArray of strings or NULL on failure
+ * @return psArray*:    A psArray of strings or NULL on failure
  */
 psArray *psDBSelectColumn(
@@ -152,5 +151,5 @@
  * entire range is returned.  The data in the column is cast to to "pType".
  *
- * @return A psVector or NULL on failure
+ * @return psVector*:   A psVector or NULL on failure
  */
 psVector *psDBSelectColumnNum(
@@ -174,5 +173,5 @@
  * string, e.g. "", to match NULL field values.
  *
- * @return A psArray of psMetadata or NULL on failure
+ * @return psArray*:    A psArray of psMetadata or NULL on failure
  */
 psArray *psDBSelectRows(
@@ -192,5 +191,5 @@
  * specified in "row" that do not exist in "tableName", the insert will fail.
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBInsertOneRow(
@@ -207,5 +206,5 @@
  * those used in psDBInsertOneRow().
  *
- * @return true on success
+ * @return bool:    true on success
  */
 bool psDBInsertRows(
@@ -220,5 +219,5 @@
  * the same psMetadata format as used in psDBInsertOneRow() & psDBInsertRows().
  *
- * @return A psArray of psMetadata or NULL on failure
+ * @return psArray*:    A psArray of psMetadata or NULL on failure
  */
 psArray *psDBDumpRows(
@@ -233,5 +232,5 @@
  * psMetadata structure where psMetadataItem.name contains the column's name.
  *
- * @return A psMetadata containing either a psArrays or psVector per column
+ * @return psMetadata*:     A psMetadata containing either a psArrays or psVector per column
  */
 psMetadata *psDBDumpCols(
@@ -249,7 +248,7 @@
  * used in psDBInsertOneRow(), etc.
  *
- * @return The number of rows modified or a negative value on error
- */
-psS64 psDBUpdateRows(
+ * @return long:    The number of rows modified or a negative value on error
+ */
+long psDBUpdateRows(
     psDB *dbh,                         ///< Database handle
     const char *tableName,             ///< Table name
@@ -266,7 +265,7 @@
  * the number of rows that were dropped, only 1 will be returned on success.
  *
- * @return The number of rows removed or a negative value on error
- */
-psS64 psDBDeleteRows(
+ * @return long:    The number of rows removed or a negative value on error
+ */
+long psDBDeleteRows(
     psDB *dbh,                         ///< Database handle
     const char *tableName,             ///< Table name
Index: /trunk/psLib/src/imageops/psImagePixelManip.c
===================================================================
--- /trunk/psLib/src/imageops/psImagePixelManip.c	(revision 4588)
+++ /trunk/psLib/src/imageops/psImagePixelManip.c	(revision 4589)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:33:49 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -187,6 +187,6 @@
 int psImageOverlaySection(psImage* image,
                           const psImage* overlay,
-                          int col0,
-                          int row0,
+                          int x0,
+                          int y0,
                           const char *op)
 {
@@ -229,10 +229,10 @@
     overlayNumRows = overlay->numRows;
     overlayNumCols = overlay->numCols;
-    imageRowLimit = row0 + overlayNumRows;
-    imageColLimit = col0 + overlayNumCols;
+    imageRowLimit = y0 + overlayNumRows;
+    imageColLimit = x0 + overlayNumCols;
 
     /* check to see if overlay is within the input image */
-    if ( row0 < 0 ||
-            col0 < 0 ||
+    if ( y0 < 0 ||
+            x0 < 0 ||
             imageRowLimit > imageNumRows ||
             imageColLimit > imageNumCols) {
@@ -240,5 +240,5 @@
         psError(PS_ERR_BAD_PARAMETER_VALUE, true,
                 PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID,
-                col0, imageColLimit, row0, imageRowLimit,
+                x0, imageColLimit, y0, imageRowLimit,
                 imageNumCols, imageNumRows);
         return pixelsOverlaid;
@@ -247,12 +247,12 @@
 
     #define psImageOverlayLoop(DATATYPE,OP) { \
-        for (int row=row0;row<imageRowLimit;row++) { \
+        for (int row=y0;row<imageRowLimit;row++) { \
             ps##DATATYPE* imageRow = image->data.DATATYPE[row]; \
-            ps##DATATYPE* overlayRow = overlay->data.DATATYPE[row-row0]; \
-            for (int col=col0;col<imageColLimit;col++) { \
-                imageRow[col] OP overlayRow[col-col0]; \
-            } \
-        } \
-        pixelsOverlaid += (imageRowLimit - row0) * (imageColLimit - col0); \
+            ps##DATATYPE* overlayRow = overlay->data.DATATYPE[row-y0]; \
+            for (int col=x0;col<imageColLimit;col++) { \
+                imageRow[col] OP overlayRow[col-x0]; \
+            } \
+        } \
+        pixelsOverlaid += (imageRowLimit - y0) * (imageColLimit - x0); \
     }
 
Index: /trunk/psLib/src/imageops/psImagePixelManip.h
===================================================================
--- /trunk/psLib/src/imageops/psImagePixelManip.h	(revision 4588)
+++ /trunk/psLib/src/imageops/psImagePixelManip.h	(revision 4589)
@@ -8,6 +8,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:01 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -83,6 +83,6 @@
     psImage* image,                    ///< target image
     const psImage* overlay,            ///< the overlay image
-    int col0,                          ///< the column to start overlay
-    int row0,                          ///< the row to start overlay
+    int x0,                            ///< the column to start overlay
+    int y0,                            ///< the row to start overlay
     const char *op                     ///< the operation to perform for overlay
 );
Index: /trunk/psLib/src/math/psMatrix.c
===================================================================
--- /trunk/psLib/src/math/psMatrix.c	(revision 4588)
+++ /trunk/psLib/src/math/psMatrix.c	(revision 4589)
@@ -21,6 +21,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:01 $
+ *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -95,5 +95,6 @@
 
 /** Static function to copy psF32 or psF64 vector data to a GSL vector */
-static void  psVectorToGslVector(gsl_vector *outGslVector, const psVector *inVector)
+static void  psVectorToGslVector(gsl_vector *outGslVector,
+                                 const psVector *inVector)
 {
     psU32 i = 0;
@@ -112,5 +113,6 @@
 
 /** Static function to copy GSL vector data to a psF32 or psF64 vector */
-static void gslVectorToPsVector(psVector *outVector, gsl_vector *inGslVector)
+static void gslVectorToPsVector(psVector *outVector,
+                                gsl_vector *inGslVector)
 {
     psU32 i = 0;
@@ -129,5 +131,6 @@
 
 /** Static function to copy psF32 or psF64 image data to a GSL matrix */
-static void  psImageToGslMatrix(gsl_matrix *outGslMatrix, const psImage *inImage)
+static void  psImageToGslMatrix(gsl_matrix *outGslMatrix,
+                                const psImage *inImage)
 {
     psU32 i = 0;
@@ -155,5 +158,6 @@
 
 /** Static function to copy GSL matrix data to a psF32 or psF64 image */
-static void gslMatrixToPsImage(psImage *outImage, gsl_matrix *inGslMatrix)
+static void gslMatrixToPsImage(psImage *outImage,
+                               gsl_matrix *inGslMatrix)
 {
     psU32 i = 0;
@@ -185,5 +189,7 @@
 /*****************************************************************************/
 
-psImage* psMatrixLUD(psImage* out, psVector** perm, psImage* in)
+psImage* psMatrixLUD(psImage* out,
+                     psVector** perm,
+                     const psImage* in)
 {
     psS32 signum = 0;
@@ -243,5 +249,7 @@
 }
 
-psVector* psMatrixLUSolve(psVector* out, const psImage* LU, const psVector* RHS,
+psVector* psMatrixLUSolve(psVector* out,
+                          const psImage* LU,
+                          const psVector* RHS,
                           const psVector* perm)
 {
@@ -298,5 +306,7 @@
 }
 
-psImage* psMatrixInvert(psImage* out, const psImage* in, float *determinant)
+psImage* psMatrixInvert(psImage* out,
+                        const psImage* in,
+                        float *determinant)
 {
     psS32 signum = 0;
@@ -346,14 +356,14 @@
 }
 
-float *psMatrixDeterminant(const psImage* in)
+float psMatrixDeterminant(const psImage* in)
 {
     psS32 signum = 0;
     psS32 numRows = 0;
     psS32 numCols = 0;
-    psF32 *det = NULL;
+    psF32 det = 0;
     gsl_matrix *lu = NULL;
     gsl_permutation *perm = NULL;
 
-    #define DETERMINANT_EXIT { return NULL; }
+    #define DETERMINANT_EXIT { return 0; }
     // Error checks
     PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, DETERMINANT_EXIT);
@@ -372,7 +382,7 @@
 
     // Calculate determinant
-    det = (psF32*)psAlloc(sizeof(psF32));
+    //    det = psAlloc(sizeof(psF32));
     gsl_linalg_LU_decomp(lu, perm, &signum);
-    *det = (psF32)gsl_linalg_LU_det(lu, signum);
+    det = (psF32)gsl_linalg_LU_det(lu, signum);
 
     // Free GSL structs
@@ -383,5 +393,7 @@
 }
 
-psImage* psMatrixMultiply(psImage* out, psImage* in1, psImage* in2)
+psImage* psMatrixMultiply(psImage* out,
+                          const psImage* in1,
+                          const psImage* in2)
 {
     gsl_matrix *m1 = NULL;
@@ -434,5 +446,6 @@
 }
 
-psImage* psMatrixTranspose(psImage* out, const psImage* in)
+psImage* psMatrixTranspose(psImage* out,
+                           const psImage* in)
 {
     psU32 i = 0;
@@ -480,5 +493,6 @@
 }
 
-psImage* psMatrixEigenvectors(psImage* out, psImage* in)
+psImage* psMatrixEigenvectors(psImage* out,
+                              const psImage* in)
 {
     psS32 numRows = 0;
@@ -529,5 +543,6 @@
 }
 
-psVector* psMatrixToVector(psVector* outVector, const psImage* inImage)
+psVector* psMatrixToVector(psVector* outVector,
+                           const psImage* inImage)
 {
     psS32 size = 0;
@@ -593,5 +608,6 @@
 }
 
-psImage* psVectorToMatrix(psImage* outImage, const psVector* inVector)
+psImage* psVectorToMatrix(psImage* outImage,
+                          const psVector* inVector)
 {
     psS32 size = 0;
Index: /trunk/psLib/src/math/psMatrix.h
===================================================================
--- /trunk/psLib/src/math/psMatrix.h	(revision 4588)
+++ /trunk/psLib/src/math/psMatrix.h	(revision 4589)
@@ -21,6 +21,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-25 01:15:01 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -45,5 +45,5 @@
     psImage* out,                      ///< Image to return, or NULL.
     psVector** perm,                   ///< Output permutation vector used by psMatrixLUSolve.
-    psImage* in                        ///< Image to decompose.
+    const psImage* in                  ///< Image to decompose.
 );
 
@@ -87,5 +87,5 @@
  *  @return  float: Determinant from psImage.
  */
-float *psMatrixDeterminant(
+float psMatrixDeterminant(
     const psImage* in                  ///< Image used to calculate determinant.
 );
@@ -102,6 +102,6 @@
 psImage* psMatrixMultiply(
     psImage* out,                      ///< Matrix to return, or NULL.
-    psImage* in1,                      ///< First input image.
-    psImage* in2                       ///< Second input image.
+    const psImage* in1,                ///< First input image.
+    const psImage* in2                 ///< Second input image.
 );
 
@@ -116,6 +116,6 @@
  */
 psImage* psMatrixTranspose(
-    psImage* out,                 ///< Image to return, or NULL
-    const psImage* inImage             ///< Image to transpose
+    psImage* out,                      ///< Image to return, or NULL
+    const psImage* in                  ///< Image to transpose
 );
 
@@ -130,5 +130,5 @@
 psImage* psMatrixEigenvectors(
     psImage* out,                      ///< Eigenvectors to return, or NULL.
-    psImage* in                        ///< Input image.
+    const psImage* in                  ///< Input image.
 );
 
Index: /trunk/psLib/src/sys/psMemory.c
===================================================================
--- /trunk/psLib/src/sys/psMemory.c	(revision 4588)
+++ /trunk/psLib/src/sys/psMemory.c	(revision 4589)
@@ -8,6 +8,6 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-15 02:33:54 $
+*  @version $Revision: 1.60 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-21 01:40:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -102,5 +102,7 @@
 }
 
-static void memProblemCallbackDefault( psMemBlock* ptr, const char *file, unsigned int lineno)
+static void memProblemCallbackDefault(psMemBlock* ptr,
+                                      const char *file,
+                                      unsigned int lineno)
 {
     if (ptr->refCounter < 1) {
@@ -120,5 +122,6 @@
  * N.b. If the block wasn't allocated by psAlloc, it will appear corrupted
  */
-static psS32 checkMemBlock(const psMemBlock* m, const char *funcName)
+static psS32 checkMemBlock(const psMemBlock* m,
+                           const char *funcName)
 {
     // n.b. since this is called by psMemCheckCorruption while the memblock list is mutex locked,
@@ -286,5 +289,7 @@
 }
 
-psPtr p_psAlloc(size_t size, const char *file, unsigned int lineno)
+psPtr p_psAlloc(size_t size,
+                const char *file,
+                unsigned int lineno)
 {
 
@@ -370,5 +375,8 @@
 }
 
-psPtr p_psRealloc(psPtr vptr, size_t size, const char *file, unsigned int lineno)
+psPtr p_psRealloc(psPtr vptr,
+                  size_t size,
+                  const char *file,
+                  unsigned int lineno)
 {
     size = (size < recycleBinSize[0]) ? recycleBinSize[0] : size; // set the minimum size to allocate
@@ -424,5 +432,7 @@
 }
 
-void p_psFree(psPtr vptr, const char *file, unsigned int lineno)
+void p_psFree(psPtr vptr,
+              const char *filename,
+              unsigned int lineno)
 {
     if (vptr == NULL) {
@@ -434,13 +444,13 @@
 
         psAbort(__func__,PS_ERRORTEXT_psMemory_MULTIPLE_FREE,
-                ptr->id, ptr->file, ptr->lineno, file, lineno);
+                ptr->id, ptr->file, ptr->lineno, filename, lineno);
     }
 
     if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, file, lineno);
+        memProblemCallback(ptr, filename, lineno);
         psAbort(__func__,"Memory Corruption Detected.");
     }
 
-    (void)p_psMemDecrRefCounter(vptr, file, lineno);    // this handles the free, if required.
+    (void)p_psMemDecrRefCounter(vptr, filename, lineno);    // this handles the free, if required.
 }
 
@@ -448,5 +458,8 @@
  * Check for memory leaks.
  */
-psS32 psMemCheckLeaks(psMemId id0, psMemBlock* ** arr, FILE * fd, psBool persistence)
+int psMemCheckLeaks(psMemId id0,
+                    psMemBlock* ** arr,
+                    FILE * fd,
+                    psBool persistence)
 {
     psS32 nleak = 0;
@@ -527,5 +540,7 @@
 
 // increment and return refCounter
-psPtr p_psMemIncrRefCounter(psPtr vptr, const char *file, psS32 lineno)
+psPtr p_psMemIncrRefCounter(psPtr vptr,
+                            const char *file,
+                            psS32 lineno)
 {
     psMemBlock* ptr;
@@ -549,5 +564,7 @@
 
 // decrement and return refCounter
-psPtr p_psMemDecrRefCounter(psPtr vptr, const char *file, psS32 lineno)
+psPtr p_psMemDecrRefCounter(psPtr vptr,
+                            const char *file,
+                            psS32 lineno)
 {
     if (vptr == NULL) {
@@ -640,5 +657,6 @@
 }
 
-void psMemSetDeallocator(psPtr ptr, psFreeFunc freeFunc)
+void psMemSetDeallocator(psPtr ptr,
+                         psFreeFunc freeFunc)
 {
     if (ptr == NULL) {
@@ -655,5 +673,5 @@
 
 }
-psFreeFunc psMemGetDeallocator(psPtr ptr)
+psFreeFunc psMemGetDeallocator(const psPtr ptr)
 {
     if (ptr == NULL) {
@@ -685,5 +703,6 @@
 }
 
-void p_psMemSetPersistent(psPtr vptr, bool value)
+void p_psMemSetPersistent(psPtr vptr,
+                          bool value)
 {
     if (vptr == NULL) {
Index: /trunk/psLib/src/sys/psMemory.h
===================================================================
--- /trunk/psLib/src/sys/psMemory.h	(revision 4588)
+++ /trunk/psLib/src/sys/psMemory.h	(revision 4589)
@@ -12,6 +12,6 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-18 20:54:22 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -169,5 +169,5 @@
  */
 psFreeFunc psMemGetDeallocator(
-    psPtr ptr                          ///< the memory block
+    const psPtr ptr                          ///< the memory block
 );
 
@@ -239,5 +239,5 @@
 void p_psFree(
     psPtr ptr,                         ///< Pointer to free
-    const char *file,                  ///< File of call
+    const char *filename,              ///< File of call
     unsigned int lineno                ///< Line number of call
 );
@@ -260,10 +260,10 @@
  *  If memory leaks are found, the Memory Problem callback will be called as well.
  *
- *  return psS32  number of memory blocks found as 'leaks', i.e., the number of currently allocated memory
+ *  @return int  number of memory blocks found as 'leaks', i.e., the number of currently allocated memory
  *              blocks above id0 that have not been freed.
  *  @see psAlloc, psFree, psgetMemId, psMemProblemCallbackSet
  *  @ingroup memTracing
  */
-psS32 psMemCheckLeaks(
+int psMemCheckLeaks(
     psMemId id0,                       ///< don't list blocks with id < id0
     psMemBlock* ** arr,                ///< pointer to array of pointers to leaked blocks, or NULL
@@ -275,4 +275,6 @@
  *  i.e., invalid markers that signify a buffer under/overflow.
  *
+ *  @return int
+ *
  *  @ingroup memTracing
  */
@@ -283,4 +285,6 @@
 /** Return reference counter
  *
+ *  @return psReferenceCount
+ *
  *  @ingroup memRefCount
  */
@@ -290,4 +294,6 @@
 
 /** Increment reference counter and return the pointer
+ *
+ *  @return psPtr
  *
  *  @ingroup memRefCount
Index: /trunk/psLib/src/types/psLookupTable.c
===================================================================
--- /trunk/psLib/src/types/psLookupTable.c	(revision 4588)
+++ /trunk/psLib/src/types/psLookupTable.c	(revision 4589)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-15 02:33:54 $
+*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-21 01:40:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -83,5 +83,6 @@
 /** Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null
  *  terminated copy of the original input string. */
-static char *cleanString(char *inString, int sLen)
+static char *cleanString(char *inString,
+                         int sLen)
 {
     char *ptrB = NULL;
@@ -114,5 +115,7 @@
 /** Returns cleaned token based on delimiter, but not including delimiter. Also changes the pointer location
  * the beginning of the string. Tokens are newly allocated null terminated strings. */
-static char* getToken(char **inString, char *delimiter, psParseErrorType *status)
+static char* getToken(char **inString,
+                      char *delimiter,
+                      psParseErrorType *status)
 {
     char *cleanToken = NULL;
@@ -141,5 +144,6 @@
 
 /** Returns single parsed value as a psS32. The input string must be cleaned and null terminated. */
-static psS32 parseS32(char *inString, psParseErrorType *status)
+static psS32 parseS32(char *inString,
+                      psParseErrorType *status)
 {
     char *end = NULL;
@@ -158,5 +162,6 @@
 
 /** Returns single parsed value as a psS64. The input string must be cleaned and null terminated. */
-static psS64 parseS64(char *inString, psParseErrorType *status)
+static psS64 parseS64(char *inString,
+                      psParseErrorType *status)
 {
     char *end = NULL;
@@ -174,5 +179,6 @@
 
 /** Returns single parsed value as a psF32. The input string must be cleaned and null terminated. */
-static psF32 parseF32(char *inString, psParseErrorType *status)
+static psF32 parseF32(char *inString,
+                      psParseErrorType *status)
 {
     char *end = NULL;
@@ -190,5 +196,6 @@
 
 /** Returns single parsed value as a psF64. The input string must be cleaned and null terminated. */
-static psF64 parseF64(char *inString, psParseErrorType *status)
+static psF64 parseF64(char *inString,
+                      psParseErrorType *status)
 {
     char *end = NULL;
@@ -207,5 +214,8 @@
 /** Returns single parsed value as a double precision number. The input string must be cleaned and null
  * terminated. */
-static void parseValue(psVector *vec, psU64 index, char* strValue, psParseErrorType *status)
+static void parseValue(psVector *vec,
+                       psU64 index,
+                       char* strValue,
+                       psParseErrorType *status)
 {
     psElemType type;
@@ -254,10 +264,12 @@
 /*****************************************************************************/
 
-psLookupTable* psLookupTableAlloc(const char *fileName, const char *format, long indexCol)
+psLookupTable* psLookupTableAlloc(const char *filename,
+                                  const char *format,
+                                  long indexCol)
 {
     psLookupTable *outTable = NULL;
 
     // Can't read table if you don't know its name
-    PS_ASSERT_PTR_NON_NULL(fileName,NULL);
+    PS_ASSERT_PTR_NON_NULL(filename,NULL);
 
     // Can't read table if you don't know its format
@@ -271,5 +283,5 @@
 
     // Allocate and set file name and format strings
-    outTable->filename = psStringCopy(fileName);
+    outTable->filename = psStringCopy(filename);
     outTable->format = psStringCopy(format);
 
@@ -396,5 +408,6 @@
 }
 
-psArray *psVectorsReadFromFile(const char *filename, const char *format)
+psArray *psVectorsReadFromFile(const char *filename,
+                               const char *format)
 {
     psArray*          outputArray = NULL;
@@ -548,5 +561,7 @@
 }
 
-psLookupTable *psLookupTableImport(psLookupTable *table, const psArray *vectors, long indexCol)
+psLookupTable *psLookupTableImport(psLookupTable *table,
+                                   const psArray *vectors,
+                                   long indexCol)
 {
     psLookupTable* outputTable = NULL;
@@ -745,5 +760,7 @@
 }
 
-double psLookupTableInterpolate(const psLookupTable *table, double index, long column)
+double psLookupTableInterpolate(const psLookupTable *table,
+                                double index,
+                                long column)
 {
     psU64 hiIdx = 0;
@@ -818,5 +835,6 @@
 }
 
-psVector* psLookupTableInterpolateAll(const psLookupTable *table, double index)
+psVector* psLookupTableInterpolateAll(const psLookupTable *table,
+                                      double index)
 {
     long numCols = 0;
Index: /trunk/psLib/src/types/psLookupTable.h
===================================================================
--- /trunk/psLib/src/types/psLookupTable.h	(revision 4588)
+++ /trunk/psLib/src/types/psLookupTable.h	(revision 4589)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-15 02:33:54 $
+*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-21 01:40:10 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -68,5 +68,5 @@
  */
 psLookupTable* psLookupTableAlloc(
-    const char *fileName,           ///< Name of file to read
+    const char *filename,           ///< Name of file to read
     const char *format,             ///< scanf-like format string
     long indexCol                    ///< Column of the index vector (starting at zero)
Index: /trunk/psLib/src/types/psMetadata.c
===================================================================
--- /trunk/psLib/src/types/psMetadata.c	(revision 4588)
+++ /trunk/psLib/src/types/psMetadata.c	(revision 4589)
@@ -12,6 +12,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.71 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-15 02:33:54 $
+*  @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-21 01:40:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -69,5 +69,7 @@
 /*****************************************************************************/
 
-static psMetadataItem* makeMetaMulti(psHash* table, const char* key, psMetadataItem* existing)
+static psMetadataItem* makeMetaMulti(psHash* table,
+                                     const char* key,
+                                     psMetadataItem* existing)
 {
 
@@ -99,5 +101,5 @@
 static void metadataItemFree(psMetadataItem* metadataItem)
 {
-    psMetadataType type;
+    psDataType type;
 
     type = metadataItem->type;
@@ -141,6 +143,8 @@
 /*****************************************************************************/
 
-psMetadataItem* psMetadataItemAlloc(const char *name, psMetadataType type,
-                                    const char *comment, ...)
+psMetadataItem* psMetadataItemAlloc(const char *name,
+                                    psDataType type,
+                                    const char *comment,
+                                    ...)
 {
     va_list argPtr;
@@ -173,6 +177,8 @@
 METADATAITEM_ALLOC_TYPE(Bool,psBool,PS_META_BOOL)
 
-psMetadataItem* psMetadataItemAllocV(const char *name, psMetadataType type,
-                                     const char *comment, va_list argPtr)
+psMetadataItem* psMetadataItemAllocV(const char *name,
+                                     psDataType type,
+                                     const char *comment,
+                                     va_list argPtr)
 {
     psMetadataItem* metadataItem = NULL;
@@ -268,5 +274,8 @@
 }
 
-bool psMetadataAddItem(psMetadata *md, const psMetadataItem *item, long location, psS32 flags)
+bool psMetadataAddItem(psMetadata *md,
+                       const psMetadataItem *item,
+                       int location,
+                       psS32 flags)
 {
     char * key = NULL;
@@ -360,6 +369,10 @@
 }
 
-bool psMetadataAdd(psMetadata *md, long location, const char *name,
-                   int format, const char *comment, ...)
+bool psMetadataAdd(psMetadata *md,
+                   long location,
+                   const char *name,
+                   int format,
+                   const char *comment,
+                   ...)
 {
     va_list argPtr;
@@ -372,6 +385,10 @@
 }
 
-bool psMetadataAddV(psMetadata *md, long location, const char *name,
-                    int format, const char *comment, va_list list)
+bool psMetadataAddV(psMetadata *md,
+                    long location,
+                    const char *name,
+                    int format,
+                    const char *comment,
+                    va_list list)
 {
     psMetadataItem* metadataItem = NULL;
@@ -409,5 +426,7 @@
 METADATA_ADD_TYPE(Array,psArray*,PS_META_ARRAY)
 
-psBool psMetadataRemove(psMetadata *md, long where, const char *key)
+psBool psMetadataRemove(psMetadata *md,
+                        long where,
+                        const char *key)
 {
     PS_ASSERT_PTR_NON_NULL(md,NULL);
@@ -477,5 +496,6 @@
 }
 
-psMetadataItem* psMetadataLookup(const psMetadata *md, const char *key)
+psMetadataItem* psMetadataLookup(const psMetadata *md,
+                                 const char *key)
 {
     psHash* mdTable = NULL;
@@ -493,5 +513,7 @@
 }
 
-void* psMetadataLookupPtr(bool *status, const psMetadata *md, const char *key)
+void* psMetadataLookupPtr(bool *status,
+                          const psMetadata *md,
+                          const char *key)
 {
     psMetadataItem *metadataItem = NULL;
@@ -580,5 +602,6 @@
 psMetadataLookupNumTYPE(Bool)
 
-psMetadataItem* psMetadataGet(const psMetadata *md, long location)
+psMetadataItem* psMetadataGet(const psMetadata *md,
+                              int location)
 {
     psMetadataItem* entry = NULL;
Index: /trunk/psLib/src/types/psMetadata.h
===================================================================
--- /trunk/psLib/src/types/psMetadata.h	(revision 4588)
+++ /trunk/psLib/src/types/psMetadata.h	(revision 4589)
@@ -11,6 +11,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-15 02:33:54 $
+*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-21 01:40:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -118,5 +118,5 @@
     const psS32 id;                    ///< Unique ID for metadata item.
     psString name;                     ///< Name of metadata item.
-    psMetadataType type;               ///< Type of metadata item.
+    psDataType type;                   ///< Type of metadata item.
     union {
         psBool B;                      ///< boolean data
@@ -149,5 +149,5 @@
 psMetadataItem* psMetadataItemAlloc(
     const char *name,                  ///< Name of metadata item.
-    psMetadataType type,               ///< Type of metadata item.
+    psDataType type,                   ///< Type of metadata item.
     const char *comment,               ///< Comment for metadata item.
     ...                                ///< Arguments for name formatting and metadata item data.
@@ -238,5 +238,5 @@
 psMetadataItem* psMetadataItemAllocV(
     const char *name,                  ///< Name of metadata item.
-    psMetadataType type,               ///< Type of metadata item.
+    psDataType type,               ///< Type of metadata item.
     const char *comment,               ///< Comment for metadata item.
     va_list list                       ///< Arguments for name formatting and metadata item data.
@@ -263,5 +263,5 @@
     psMetadata*  md,                   ///< Metadata collection to insert metadat item.
     const psMetadataItem* item,        ///< Metadata item to be added.
-    long location,                     ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    int location,                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
     psS32 flags                        ///< Options flag mask, see psMetadataFlags enum
 );
@@ -551,5 +551,5 @@
 psMetadataItem* psMetadataGet(
     const psMetadata* md,              ///< Metadata collection to retrieve metadata item.
-    long location                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    int location                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
 );
 
Index: /trunk/psLib/src/types/psMetadataConfig.c
===================================================================
--- /trunk/psLib/src/types/psMetadataConfig.c	(revision 4588)
+++ /trunk/psLib/src/types/psMetadataConfig.c	(revision 4589)
@@ -10,6 +10,6 @@
 *  @author Eric Van Alst, MHPCC
 *
-*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-15 02:33:54 $
+*  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-21 01:40:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -86,9 +86,8 @@
 ;
 static void parseLevelInfoFree(p_psParseLevelInfo* info);
-static psBool parseLine(psS32* level,   psArray* levelArray,
-                        char*  linePtr, psS32 lineCount,     char* fileName, psBool overwrite);
-static psBool parseMetadataItem(char* keyName, psS32* level,     psArray* levelArray,
-                                char* linePtr, psS32  lineCount, char*    fileName,    psMetadataFlags flags);
-
+static psBool parseLine(psS32* level,   psArray* levelArray, char*  linePtr, psS32 lineCount,
+                        char* fileName, psBool overwrite);
+static psBool parseMetadataItem(char* keyName, psS32* level, psArray* levelArray, char* linePtr,
+                                psS32 lineCount, char* fileName, psMetadataFlags flags);
 static void parseLevelInfoFree(p_psParseLevelInfo* info)
 {
@@ -117,5 +116,7 @@
 //  Removes leading and trailing whitespace and # characters from a string. The cleaned string is a new null
 //  terminated copy of the original input string.
-static char *cleanString(char *inString, psS32 sLen, psBool ignoreComment)
+static char *cleanString(char *inString,
+                         psS32 sLen,
+                         psBool ignoreComment)
 {
     char *ptrB = NULL;
@@ -163,5 +164,6 @@
 
 // Count repeat occurances of a single character within a line. The input string must be null terminated.
-static psS32 repeatedChars(char *inString, char ch)
+static psS32 repeatedChars(char *inString,
+                           char ch)
 {
     psS32 count = 0;
@@ -179,5 +181,8 @@
 // Returns cleaned token based on delimiter, but not including delimiter. Also changes the pointer location
 // the beginning of the string. Tokens are newly allocated null terminated strings.
-static char* getToken(char **inString, char *delimiter, psS32 *status, psBool ignoreComment)
+static char* getToken(char **inString,
+                      char *delimiter,
+                      psS32 *status,
+                      psBool ignoreComment)
 {
     char *cleanToken = NULL;
@@ -213,5 +218,6 @@
 // Returns single parsed value as a double precision number. The input string must be cleaned and null
 // terminated.
-static double parseValue(char *inString, psS32 *status)
+static double parseValue(char *inString,
+                         psS32 *status)
 {
     char *end = NULL;
@@ -229,5 +235,6 @@
 
 /** Returns true or false. 'T', 't', '1', 'F', 'f', and '0' are acceptable, parsable variations. */
-static psBool parseBool(char *inString, psS32 *status)
+static psBool parseBool(char *inString,
+                        psS32 *status)
 {
     psBool value = false;
@@ -246,5 +253,7 @@
 
 /** Returns parsed vector filled with with data. The input string must be null terminated. */
-static psVector* parseVector(char *inString, psElemType elemType, psS32 *status)
+static psVector* parseVector(char *inString,
+                             psElemType elemType,
+                             psS32 *status)
 {
     char*      end       = NULL;
@@ -363,5 +372,7 @@
 }
 
-bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* item)
+bool psMetadataItemPrint(FILE * fd,
+                         const char *format,
+                         const psMetadataItem* item)
 {
     psMetadataType type;
@@ -453,5 +464,8 @@
 
 
-psMetadata* psMetadataReadHeader(psMetadata* output, char *extName, psS32 extNum, char *fileName)
+psMetadata* psMetadataReadHeader(psMetadata* output,
+                                 char *extName,
+                                 psS32 extNum,
+                                 char *fileName)
 {
     psBool tempBool;
@@ -604,5 +618,6 @@
 }
 
-static psMetadata* setMetadataItem(psMetadata* template, char* linePtr)
+static psMetadata* setMetadataItem(psMetadata* template,
+                                   char* linePtr)
 {
     psMetadata*      md           = NULL;
@@ -674,6 +689,11 @@
 }
 
-psBool parseMetadataItem(char* keyName, psS32* level,     psArray* levelArray,
-                         char* linePtr, psS32  lineCount, char*    fileName,   psMetadataFlags flags)
+psBool parseMetadataItem(char* keyName,
+                         psS32* level,
+                         psArray* levelArray,
+                         char* linePtr,
+                         psS32 lineCount,
+                         char* fileName,
+                         psMetadataFlags flags)
 {
     psBool               returnValue   = true;
@@ -940,6 +960,10 @@
 }
 
-psBool parseLine(psS32* level,     psArray* levelArray, char*  linePtr,
-                 psS32  lineCount, char*    fileName,   psBool overwrite)
+psBool parseLine(psS32* level,
+                 psArray* levelArray,
+                 char* linePtr,
+                 psS32 lineCount,
+                 char* fileName,
+                 psBool overwrite)
 {
     psBool              returnValue    = true;
@@ -1075,5 +1099,8 @@
 }
 
-psMetadata* psMetadataConfigParse(psMetadata* md, unsigned int *nFail, const char *fileName, bool overwrite)
+psMetadata* psMetadataConfigParse(psMetadata* md,
+                                  unsigned int *nFail,
+                                  const char *filename,
+                                  bool overwrite)
 {
     FILE*               fp                   = NULL;
@@ -1086,5 +1113,5 @@
 
     // Check for NULL file name
-    PS_ASSERT_PTR_NON_NULL(fileName,NULL);
+    PS_ASSERT_PTR_NON_NULL(filename,NULL);
 
     // Check for NULL nFail
@@ -1092,6 +1119,6 @@
 
     // Attempt to open specified file
-    if((fp=fopen(fileName, "r")) == NULL) {
-        psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_FILE_OPEN_FAILED, fileName);
+    if((fp=fopen(filename, "r")) == NULL) {
+        psError(PS_ERR_IO, true, PS_ERRORTEXT_psMetadataIO_FILE_OPEN_FAILED, filename);
         return NULL;
     }
@@ -1122,5 +1149,5 @@
         lineCount++;
 
-        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)fileName,overwrite)) {
+        if(!parseLine(&nestingLevel,parseLevelInfoArray,linePtr,lineCount,(char*)filename,overwrite)) {
             (*nFail)++;
         }
Index: /trunk/psLib/src/types/psMetadataConfig.h
===================================================================
--- /trunk/psLib/src/types/psMetadataConfig.h	(revision 4588)
+++ /trunk/psLib/src/types/psMetadataConfig.h	(revision 4589)
@@ -10,6 +10,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-15 02:33:54 $
+ *  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -82,5 +82,5 @@
     psMetadata* md,                    ///< Resulting metadata from read.
     unsigned int *nFail,               ///< Number of failed lines.
-    const char *fileName,              ///< Name of file to read.
+    const char *filename,              ///< Name of file to read.
     bool overwrite                     ///< Allow overwrite of duplicate specifications.
 );
Index: /trunk/psLib/test/math/tst_psMatrix04.c
===================================================================
--- /trunk/psLib/test/math/tst_psMatrix04.c	(revision 4588)
+++ /trunk/psLib/test/math/tst_psMatrix04.c	(revision 4589)
@@ -13,6 +13,6 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.1 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-07-13 02:47:00 $
+ *  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-07-21 01:40:10 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -51,5 +51,5 @@
 {
     float det = 0.0f;
-    float *det2 = NULL;
+    float det2 = 0;
     psImage *outImage = NULL;
     psImage *inImage = NULL;
@@ -120,9 +120,7 @@
     printPositiveTestHeader(stdout, "psMatrix", "Calculate determinant only");
     det2 = psMatrixDeterminant(inImage);
-    CHECK_VALUE(*det2);
-    psFree(det2);
+    CHECK_VALUE(det2);
     det2 = psMatrixDeterminant(inImage32);
-    CHECK_VALUE(*det2);
-    psFree(det2);
+    CHECK_VALUE(det2);
     printFooter(stdout, "psMatrix", "Calculate determinant only", true);
 
Index: /trunk/psLib/test/types/verified/tst_psLookupTable_01.stderr
===================================================================
--- /trunk/psLib/test/types/verified/tst_psLookupTable_01.stderr	(revision 4588)
+++ /trunk/psLib/test/types/verified/tst_psLookupTable_01.stderr	(revision 4589)
@@ -8,5 +8,5 @@
     Following should generate error message for invalid file name
 <DATE><TIME>|<HOST>|E|psLookupTableAlloc (FILE:LINENO)
-    Unallowable operation: fileName is NULL.
+    Unallowable operation: filename is NULL.
 <DATE><TIME>|<HOST>|I|testLookupTableAlloc
     Following should generate error message for invalid format string
Index: /trunk/psLib/test/types/verified/tst_psMetadataIO.stderr
===================================================================
--- /trunk/psLib/test/types/verified/tst_psMetadataIO.stderr	(revision 4588)
+++ /trunk/psLib/test/types/verified/tst_psMetadataIO.stderr	(revision 4589)
@@ -65,5 +65,5 @@
     Following should generate an error message for NULL file name arg
 <DATE><TIME>|<HOST>|E|psMetadataConfigParse (FILE:LINENO)
-    Unallowable operation: fileName is NULL.
+    Unallowable operation: filename is NULL.
 
 ---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse} | tst_psMetadataIO.c)