Changeset 4321

Timestamp:

Jun 20, 2005, 12:42:30 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib

Files:

• pslib.kdevses (modified) (1 diff)
• src/astro/psCoord.c (modified) (2 diffs)
• src/astro/psCoord.h (modified) (2 diffs)
• src/astronomy/psCoord.c (modified) (2 diffs)
• src/astronomy/psCoord.h (modified) (2 diffs)
• src/collections/psMetadata.c (modified) (8 diffs)
• src/collections/psMetadata.h (modified) (17 diffs)
• src/collections/psPixels.c (modified) (3 diffs)
• src/collections/psPixels.h (modified) (2 diffs)
• src/dataIO/psLookupTable.c (modified) (3 diffs)
• src/dataIO/psLookupTable.h (modified) (3 diffs)
• src/dataManip/psMatrix.c (modified) (11 diffs)
• src/dataManip/psMatrix.h (modified) (4 diffs)
• src/dataManip/psMinimize.c (modified) (5 diffs)
• src/dataManip/psMinimize.h (modified) (6 diffs)
• src/math/psMatrix.c (modified) (11 diffs)
• src/math/psMatrix.h (modified) (4 diffs)
• src/math/psMinimize.c (modified) (5 diffs)
• src/math/psMinimize.h (modified) (6 diffs)
• src/sys/psLogMsg.c (modified) (5 diffs)
• src/sys/psLogMsg.h (modified) (3 diffs)
• src/sys/psMemory.c (modified) (3 diffs)
• src/sys/psMemory.h (modified) (5 diffs)
• src/sysUtils/psLogMsg.c (modified) (5 diffs)
• src/sysUtils/psLogMsg.h (modified) (3 diffs)
• src/sysUtils/psMemory.c (modified) (3 diffs)
• src/sysUtils/psMemory.h (modified) (5 diffs)
• src/types/psLookupTable.c (modified) (3 diffs)
• src/types/psLookupTable.h (modified) (3 diffs)
• src/types/psMetadata.c (modified) (8 diffs)
• src/types/psMetadata.h (modified) (17 diffs)
• src/types/psPixels.c (modified) (3 diffs)
• src/types/psPixels.h (modified) (2 diffs)

trunk/psLib/pslib.kdevses

@@ -4 +4 @@
  <DocsAndViews NumberOfDocuments="4" >
   <Doc0 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/collections/psList.h" >
-   <View0 line="197" Type="Source" />
+   <View0 Type="Source" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/collections/psList.c" >
-   <View0 line="565" Type="Source" />
+   <View0 Type="Source" />
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/sysUtils/psLogMsg.h" >
-   <View0 line="69" Type="Source" />
+   <View0 Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:/home/drobbin/panstarrs/psLib/src/sysUtils/psLogMsg.c" >

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-16 22:42:09 $
+*  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -268 +268 @@
 }
 
-psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4)
+psPlaneDistort* psPlaneDistortAlloc(int n1, int n2, int n3, int n4)
 {
     PS_ASSERT_INT_NONNEGATIVE(n1, NULL);

trunk/psLib/src/astro/psCoord.h

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-09 19:26:47 $
+*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -208 +208 @@
 
 psPlaneDistort* psPlaneDistortAlloc(
-    psS32 n1,  ///< The order of the w term in the transform.
-    psS32 n2,  ///< The order of the x term in the transform.
-    psS32 n3,  ///< The order of the y term in the transform.
-    psS32 n4   ///< The order of the z term in the transform.
+    int n1,                            ///< The order of the w term in the transform.
+    int n2,                            ///< The order of the x term in the transform.
+    int n3,                            ///< The order of the y term in the transform.
+    int n4                             ///< The order of the z term in the transform.
 );
 

trunk/psLib/src/astronomy/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-16 22:42:09 $
+*  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -268 +268 @@
 }
 
-psPlaneDistort* psPlaneDistortAlloc(psS32 n1, psS32 n2, psS32 n3, psS32 n4)
+psPlaneDistort* psPlaneDistortAlloc(int n1, int n2, int n3, int n4)
 {
     PS_ASSERT_INT_NONNEGATIVE(n1, NULL);

trunk/psLib/src/astronomy/psCoord.h

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-09 19:26:47 $
+*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -208 +208 @@
 
 psPlaneDistort* psPlaneDistortAlloc(
-    psS32 n1,  ///< The order of the w term in the transform.
-    psS32 n2,  ///< The order of the x term in the transform.
-    psS32 n3,  ///< The order of the y term in the transform.
-    psS32 n4   ///< The order of the z term in the transform.
+    int n1,                            ///< The order of the w term in the transform.
+    int n2,                            ///< The order of the x term in the transform.
+    int n3,                            ///< The order of the y term in the transform.
+    int n4                             ///< The order of the z term in the transform.
 );
 

trunk/psLib/src/collections/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 23:44:21 $
+*  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -267 +267 @@
 }
 
-psBool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)
+bool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)
 {
     char * key = NULL;
@@ -359 +359 @@
 }
 
-psBool psMetadataAdd(psMetadata *md, psS32 location, const char *name,
-                     psS32 type, const char *comment, ...)
+bool psMetadataAdd(psMetadata *md, int location, const char *name,
+                   int format, const char *comment, ...)
 {
     va_list argPtr;
 
     va_start(argPtr, comment);
-    psBool result = psMetadataAddV(md,location,name,type,comment,argPtr);
+    psBool result = psMetadataAddV(md,location,name,format,comment,argPtr);
     va_end(argPtr);
 
@@ -371 +371 @@
 }
 
-psBool psMetadataAddV(psMetadata *md, psS32 location, const char *name,
-                      psS32 type, const char *comment, va_list list)
+bool psMetadataAddV(psMetadata *md, int location, const char *name,
+                    int format, const char *comment, va_list list)
 {
     psMetadataItem* metadataItem = NULL;
 
-    metadataItem = psMetadataItemAllocV(name, type & PS_METADATA_TYPE_MASK, comment, list);
-
-    if (!psMetadataAddItem(md, metadataItem, location, type & PS_METADATA_FLAGS_MASK)) {
+    metadataItem = psMetadataItemAllocV(name, format & PS_METADATA_TYPE_MASK, comment, list);
+
+    if (!psMetadataAddItem(md, metadataItem, location, format & PS_METADATA_FLAGS_MASK)) {
         psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_FAILED);
         psFree(metadataItem);
@@ -475 +475 @@
 }
 
-psMetadataItem* psMetadataLookup(psMetadata *md, const char *key)
+psMetadataItem* psMetadataLookup(const psMetadata *md, const char *key)
 {
     psHash* mdTable = NULL;
@@ -491 +491 @@
 }
 
-void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key)
+void* psMetadataLookupPtr(bool *status, const psMetadata *md, const char *key)
 {
     psMetadataItem *metadataItem = NULL;
@@ -525 +525 @@
 
 #define psMetadataLookupNumTYPE(TYPE) \
-ps##TYPE psMetadataLookup##TYPE(psBool *status, psMetadata *md, const char *key) \
+ps##TYPE psMetadataLookup##TYPE(bool *status, const psMetadata *md, const char *key) \
 { \
     psMetadataItem *metadataItem = NULL; \
@@ -630 +630 @@
 }
 
-psBool psMetadataIteratorSet(psMetadataIterator* iterator,
-                             int location)
+bool psMetadataIteratorSet(psMetadataIterator* iterator,
+                           int location)
 {
     int match;

trunk/psLib/src/collections/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-14 02:54:06 $
+*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -214 +214 @@
     const char* name,                  ///< Name of metadata item.
     const char* comment,               ///< Comment for metadata item.
-    psBool value                       ///< the value of the metadata item.
+    bool value                       ///< the value of the metadata item.
 );
 
@@ -257 +257 @@
  *  @return bool: True for success, false for failure.
  */
-psBool psMetadataAddItem(
+bool psMetadataAddItem(
     psMetadata*  md,                   ///< Metadata collection to insert metadat item.
     psMetadataItem*  item,             ///< Metadata item to be added.
@@ -270 +270 @@
  * @return bool: True for success, false for failure.
  */
-psBool psMetadataAdd(
+bool psMetadataAdd(
     psMetadata* md,                    ///< Metadata collection to insert metadata item.
-    psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    int location,                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
     const char *name,                  ///< Name of metadata item.
-    int type,                          ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
+    int format,                      ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
     const char *comment,               ///< Comment for metadata item.
     ...                                ///< Arguments for name formatting and metadata item data.
@@ -286 +286 @@
  * @return bool: True for success, false for failure.
  */
-psBool psMetadataAddV(
+bool psMetadataAddV(
     psMetadata* md,                    ///< Metadata collection to insert metadata item.
-    psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    int location,                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
     const char *name,                  ///< Name of metadata item.
-    int type,                          ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
+    int format,                        ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
     const char *comment,               ///< Comment for metadata item.
     va_list list                       ///< Arguments for name formatting and metadata item data.
@@ -300 +300 @@
  *  @return psBool:  True for success, False for failure. 
  */
-psBool psMetadataAddS32(
+bool psMetadataAddS32(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -312 +312 @@
  *  @return psBool:  True for success, False for failure.
 */
-psBool psMetadataAddF32(
+bool psMetadataAddF32(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -324 +324 @@
  *  @return psBool:  True for success, False for failure.
 */
-psBool psMetadataAddF64(
+bool psMetadataAddF64(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -348 +348 @@
  *  @return psBool:  True for success, False for failure.
  */
-psBool psMetadataAddStr(
+bool psMetadataAddStr(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -438 +438 @@
  * @return bool: True for success, false for failure.
  */
-psBool psMetadataRemove(
-    psMetadata*  md,           ///< Metadata collection to remove metadata item.
-    psS32 where,               ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
-    const char * key           ///< Name of metadata key.
+bool psMetadataRemove(
+    psMetadata*  md,                   ///< Metadata collection to remove metadata item.
+    int location,                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    const char * key                   ///< Name of metadata key.
 );
 
@@ -453 +453 @@
  */
 psMetadataItem* psMetadataLookup(
-    psMetadata * md,                   ///< Metadata collection to lookup metadata item.
+    const psMetadata * md,                   ///< Metadata collection to lookup metadata item.
     const char * key                   ///< Name of metadata key.
 );
@@ -466 +466 @@
  */
 psF64 psMetadataLookupF64(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata *md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -480 +480 @@
  */
 psF32 psMetadataLookupF32(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata *md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -494 +494 @@
  */
 psS32 psMetadataLookupS32(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata *md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -508 +508 @@
  */
 psBool psMetadataLookupBool(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata *md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -522 +522 @@
  */
 psPtr psMetadataLookupPtr(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata* md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata* md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -560 +560 @@
  *  @return psBool        TRUE if iterator successfully set, otherwise FALSE.
 */
-psBool psMetadataIteratorSet(
+bool psMetadataIteratorSet(
     psMetadataIterator* iterator,      ///< psMetadata iterator
     int location                       ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL

trunk/psLib/src/collections/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-13 20:43:40 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:29 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -114 +114 @@
 }
 
-psPixels* psPixelsCopy(psPixels* out, const psPixels* in)
-{
-    if (in == NULL) {
+psPixels* psPixelsCopy(psPixels* out, const psPixels* pixels)
+{
+    if (pixels == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL,true,PS_ERRORTEXT_psPixels_NULL);
         psFree(out);
@@ -122 +122 @@
     }
 
-    out = psPixelsRealloc(out, in->n);
-
-    memcpy(out->data,in->data, in->n*sizeof(psPixelCoord));
-    out->n = in->n;
+    out = psPixelsRealloc(out, pixels->n);
+
+    memcpy(out->data,pixels->data, pixels->n*sizeof(psPixelCoord));
+    out->n = pixels->n;
 
     return out;

trunk/psLib/src/collections/psPixels.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 00:11:02 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:29 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -85 +85 @@
 psPixels* psPixelsCopy(
     psPixels* out,                     ///< psPixels struct to recycle, or NULL
-    const psPixels* in                 ///< psPixels struct to copy
+    const psPixels* pixels             ///< psPixels struct to copy
 );
 

trunk/psLib/src/dataIO/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 23:44:21 $
+*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -254 +254 @@
 /*****************************************************************************/
 
-psLookupTable* psLookupTableAlloc(const char *fileName, const char *format, int indexCol)
+psLookupTable* psLookupTableAlloc(const char *fileName, const char *format, long indexCol)
 {
     psLookupTable *outTable = NULL;
@@ -633 +633 @@
 }
 
-psS32 psLookupTableRead(psLookupTable* table)
+long psLookupTableRead(psLookupTable* table)
 {
     psS32           numRows  = 0;

trunk/psLib/src/dataIO/psLookupTable.h

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-08 23:40:45 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -70 +70 @@
     const char *fileName,           ///< Name of file to read
     const char *format,             ///< scanf-like format string
-    int indexCol                    ///< Column of the index vector (starting at zero)
+    long indexCol                    ///< Column of the index vector (starting at zero)
 );
 
@@ -102 +102 @@
  *  @return psS32     Number of valid lines read
  */
-psS32 psLookupTableRead(
+long psLookupTableRead(
     psLookupTable *table            ///< Table to read
 );

trunk/psLib/src/dataManip/psMatrix.c

@@ -21 +21 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 22:28:07 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:29 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -191 +191 @@
     psS32 numCols = 0;
     gsl_matrix *lu = NULL;
-    gsl_permutation perm;
+    gsl_permutation permGSL;
 
 
@@ -212 +212 @@
 
     // Initialize GSL data
-    perm.size = numCols;
+    permGSL.size = numCols;
     if (sizeof(size_t) == 4) {
         *outPerm = psVectorRecycle(*outPerm, numCols, PS_TYPE_S32);
@@ -225 +225 @@
 
     (*outPerm)->n = numCols;
-    perm.data = (psPtr)((*outPerm)->data.U8);
+    permGSL.data = (psPtr)((*outPerm)->data.U8);
     lu = gsl_matrix_alloc(numRows, numCols);
 
@@ -232 +232 @@
 
     // Calculate LU decomposition
-    gsl_linalg_LU_decomp(lu, &perm, &signum); // N.B., uses Gaussian Elimination with partial pivoting.
+    gsl_linalg_LU_decomp(lu, &permGSL, &signum); // N.B., uses Gaussian Elimination with partial pivoting.
 
     // Copy GSL matrix data to psImage data
@@ -298 +298 @@
 }
 
-psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, psF32 *det)
+psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, float *det)
 {
     psS32 signum = 0;
@@ -346 +346 @@
 }
 
-psF32 *psMatrixDeterminant(const psImage* inImage)
+float *psMatrixDeterminant(const psImage* in)
 {
     psS32 signum = 0;
@@ -357 +357 @@
     #define DETERMINANT_EXIT { return NULL; }
     // Error checks
-    PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, DETERMINANT_EXIT);
-    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, DETERMINANT_EXIT);
-    PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, DETERMINANT_EXIT);
-    PS_CHECK_SQUARE(inImage, DETERMINANT_EXIT);
+    PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, DETERMINANT_EXIT);
+    PS_CHECK_DIMEN_AND_TYPE(in, PS_DIMEN_IMAGE, DETERMINANT_EXIT);
+    PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(in, DETERMINANT_EXIT);
+    PS_CHECK_SQUARE(in, DETERMINANT_EXIT);
 
     // Initialize data
-    numRows = inImage->numRows;
-    numCols = inImage->numCols;
+    numRows = in->numRows;
+    numCols = in->numCols;
 
     // Allocate GSL structs
     perm = gsl_permutation_alloc(numRows);
     lu = gsl_matrix_alloc(numRows, numCols);
-    psImageToGslMatrix(lu, inImage);
+    psImageToGslMatrix(lu, in);
 
     // Calculate determinant
@@ -480 +480 @@
 }
 
-psImage* psMatrixEigenvectors(psImage* outImage, psImage* inImage)
+psImage* psMatrixEigenvectors(psImage* out, psImage* in)
 {
     psS32 numRows = 0;
@@ -486 +486 @@
     gsl_vector *eVals = NULL;
     gsl_eigen_symmv_workspace *w = NULL;
-    gsl_matrix *out = NULL;
-    gsl_matrix *in = NULL;
-
-    #define EIGENVECTORS_CLEANUP { psFree(outImage); return NULL; }
-    // Error checks
-    PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, EIGENVECTORS_CLEANUP);
-    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, EIGENVECTORS_CLEANUP);
-    PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, EIGENVECTORS_CLEANUP);
-    PS_CHECK_POINTERS(inImage, outImage, EIGENVECTORS_CLEANUP);
-
-    outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
+    gsl_matrix *outGSL = NULL;
+    gsl_matrix *inGSL = NULL;
+
+    #define EIGENVECTORS_CLEANUP { psFree(out); return NULL; }
+    // Error checks
+    PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, EIGENVECTORS_CLEANUP);
+    PS_CHECK_DIMEN_AND_TYPE(in, PS_DIMEN_IMAGE, EIGENVECTORS_CLEANUP);
+    PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(in, EIGENVECTORS_CLEANUP);
+    PS_CHECK_POINTERS(in, out, EIGENVECTORS_CLEANUP);
+
+    out = psImageRecycle(out, in->numCols, in->numRows, in->type.type);
 
     // Initialize data
-    numRows = inImage->numRows;
-    numCols = inImage->numCols;
-
-    in = gsl_matrix_alloc(numRows, numCols);
-    psImageToGslMatrix(in, inImage);
-    out = gsl_matrix_alloc(numRows, numCols);
+    numRows = in->numRows;
+    numCols = in->numCols;
+
+    inGSL = gsl_matrix_alloc(numRows, numCols);
+    psImageToGslMatrix(inGSL, in);
+    outGSL = gsl_matrix_alloc(numRows, numCols);
 
     // Allocate GSL structs
@@ -511 +511 @@
 
     // Non-square matrices not allowed
-    PS_CHECK_SQUARE(inImage, EIGENVECTORS_CLEANUP);
-    PS_CHECK_SQUARE(outImage, EIGENVECTORS_CLEANUP);
+    PS_CHECK_SQUARE(in, EIGENVECTORS_CLEANUP);
+    PS_CHECK_SQUARE(out, EIGENVECTORS_CLEANUP);
 
     // Calculate Eigenvalues and Eigenvectors...Eigenvalues not currently used
-    gsl_eigen_symmv(in, eVals, out, w);
+    gsl_eigen_symmv(inGSL, eVals, outGSL, w);
 
     // Copy GSL matrix data to psImage data
-    gslMatrixToPsImage(outImage, out);
+    gslMatrixToPsImage(out, outGSL);
 
     // Free GSL structs
-    gsl_matrix_free(in);
-    gsl_matrix_free(out);
+    gsl_matrix_free(inGSL);
+    gsl_matrix_free(outGSL);
     gsl_eigen_symmv_free(w);
     gsl_vector_free(eVals);
 
-    return outImage;
+    return out;
 }
 

trunk/psLib/src/dataManip/psMatrix.h

@@ -21 +21 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:29 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -76 +76 @@
     psImage* outImage,                 ///< Image to return, or NULL for in-place substitution.
     const psImage* inImage,            ///< Image to be inverted
-    psF32 *det                         ///< Determinant to return, or NULL
+    float *det                         ///< Determinant to return, or NULL
 );
 
@@ -87 +87 @@
  *  @return  float: Determinant from psImage.
  */
-psF32 *psMatrixDeterminant(
-    const psImage* inMatrix        ///< Image used to calculate determinant.
+float *psMatrixDeterminant(
+    const psImage* in                  ///< Image used to calculate determinant.
 );
 
@@ -129 +129 @@
  */
 psImage* psMatrixEigenvectors(
-    psImage* outImage,                 ///< Eigenvectors to return, or NULL.
-    psImage* inImage                   ///< Input image.
+    psImage* out,                      ///< Eigenvectors to return, or NULL.
+    psImage* in                        ///< Input image.
 );
 

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.122 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-13 20:18:18 $
+ *  @version $Revision: 1.123 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -562 +562 @@
 
 // XXX EAM this is my re-implementation of MinLM
-psBool psMinimizeLMChi2(psMinimization *min,
-                        psImage *covar,
-                        psVector *params,
-                        const psVector *paramMask,
-                        const psArray *x,
-                        const psVector *y,
-                        const psVector *yErr,
-                        psMinimizeLMChi2Func func)
+bool psMinimizeLMChi2(psMinimization *min,
+                      psImage *covar,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *x,
+                      const psVector *y,
+                      const psVector *yErr,
+                      psMinimizeLMChi2Func func)
 {
     PS_ASSERT_PTR_NON_NULL(min, NULL);
@@ -1426 +1426 @@
 /******************************************************************************
  *****************************************************************************/
-psMinimization *psMinimizationAlloc(psS32 maxIter,
-                                    psF32 tol)
+psMinimization *psMinimizationAlloc(int maxIter,
+                                    float tol)
 {
     PS_ASSERT_INT_NONNEGATIVE(maxIter, NULL);
@@ -1912 +1912 @@
 #define PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE 0.01
 
-psBool psMinimizePowell(psMinimization *min,
-                        psVector *params,
-                        const psVector *paramMask,
-                        const psArray *coords,
-                        psMinimizePowellFunc func)
+bool psMinimizePowell(psMinimization *min,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *coords,
+                      psMinimizePowellFunc func)
 {
     PS_ASSERT_PTR_NON_NULL(min, NULL);
@@ -2189 +2189 @@
 psMinimizePowell().
  *****************************************************************************/
-psBool psMinimizeChi2Powell(psMinimization *min,
-                            psVector *params,
-                            const psVector *paramMask,
-                            const psArray *coords,
-                            const psVector *value,
-                            const psVector *error,
-                            psMinimizeChi2PowellFunc func)
+bool psMinimizeChi2Powell(psMinimization *min,
+                          psVector *params,
+                          const psVector *paramMask,
+                          const psArray *coords,
+                          const psVector *value,
+                          const psVector *error,
+                          psMinimizeChi2PowellFunc model)
 {
     myValue = (psVector *) value;
     myError = (psVector *) error;
 
-    Chi2PowellFunc = func;
+    Chi2PowellFunc = model;
 
     return(psMinimizePowell(min, params, paramMask, coords, myPowellChi2Func));

trunk/psLib/src/dataManip/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-16 03:51:58 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -56 +56 @@
 */
 psMinimization *psMinimizationAlloc(
-    psS32 maxIter,                     ///< Number of minimization iterations to perform.
-    psF32 tol                          ///< Requested error tolerance
+    int maxIter,                       ///< Number of minimization iterations to perform.
+    float tol                          ///< Requested error tolerance
 );
 
@@ -111 +111 @@
  *  @return psBool:   True if successful.
  */
-psBool psMinimizeLMChi2(
+bool psMinimizeLMChi2(
     psMinimization *min,               ///< Minimization specification
     psImage *covar,                    ///< Covariance matrix
@@ -167 +167 @@
  *  @return psBool:   True if successful.
  */
-psBool psMinimizePowell(
+bool psMinimizePowell(
     psMinimization *min,               ///< Minimization specification
     psVector *params,                  ///< "Best guess" for parameters that minimize func
@@ -211 +211 @@
  *  @return psBool:   True is successful.
  */
-psBool psMinimizeChi2Powell(
+bool psMinimizeChi2Powell(
     psMinimization *min,               ///< Minimization specification
     psVector *params,                  ///< "Best guess" for parameters that minimize func
@@ -218 +218 @@
     const psVector *value,             ///< Measured values at the coordinates
     const psVector *error,             ///< Errors in the measure values (or NULL)
-    psMinimizeChi2PowellFunc func      ///< Specified function
+    psMinimizeChi2PowellFunc model     ///< Specified function
 );
 

trunk/psLib/src/math/psMatrix.c

@@ -21 +21 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 22:28:07 $
+ *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:29 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -191 +191 @@
     psS32 numCols = 0;
     gsl_matrix *lu = NULL;
-    gsl_permutation perm;
+    gsl_permutation permGSL;
 
 
@@ -212 +212 @@
 
     // Initialize GSL data
-    perm.size = numCols;
+    permGSL.size = numCols;
     if (sizeof(size_t) == 4) {
         *outPerm = psVectorRecycle(*outPerm, numCols, PS_TYPE_S32);
@@ -225 +225 @@
 
     (*outPerm)->n = numCols;
-    perm.data = (psPtr)((*outPerm)->data.U8);
+    permGSL.data = (psPtr)((*outPerm)->data.U8);
     lu = gsl_matrix_alloc(numRows, numCols);
 
@@ -232 +232 @@
 
     // Calculate LU decomposition
-    gsl_linalg_LU_decomp(lu, &perm, &signum); // N.B., uses Gaussian Elimination with partial pivoting.
+    gsl_linalg_LU_decomp(lu, &permGSL, &signum); // N.B., uses Gaussian Elimination with partial pivoting.
 
     // Copy GSL matrix data to psImage data
@@ -298 +298 @@
 }
 
-psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, psF32 *det)
+psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, float *det)
 {
     psS32 signum = 0;
@@ -346 +346 @@
 }
 
-psF32 *psMatrixDeterminant(const psImage* inImage)
+float *psMatrixDeterminant(const psImage* in)
 {
     psS32 signum = 0;
@@ -357 +357 @@
     #define DETERMINANT_EXIT { return NULL; }
     // Error checks
-    PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, DETERMINANT_EXIT);
-    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, DETERMINANT_EXIT);
-    PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, DETERMINANT_EXIT);
-    PS_CHECK_SQUARE(inImage, DETERMINANT_EXIT);
+    PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, DETERMINANT_EXIT);
+    PS_CHECK_DIMEN_AND_TYPE(in, PS_DIMEN_IMAGE, DETERMINANT_EXIT);
+    PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(in, DETERMINANT_EXIT);
+    PS_CHECK_SQUARE(in, DETERMINANT_EXIT);
 
     // Initialize data
-    numRows = inImage->numRows;
-    numCols = inImage->numCols;
+    numRows = in->numRows;
+    numCols = in->numCols;
 
     // Allocate GSL structs
     perm = gsl_permutation_alloc(numRows);
     lu = gsl_matrix_alloc(numRows, numCols);
-    psImageToGslMatrix(lu, inImage);
+    psImageToGslMatrix(lu, in);
 
     // Calculate determinant
@@ -480 +480 @@
 }
 
-psImage* psMatrixEigenvectors(psImage* outImage, psImage* inImage)
+psImage* psMatrixEigenvectors(psImage* out, psImage* in)
 {
     psS32 numRows = 0;
@@ -486 +486 @@
     gsl_vector *eVals = NULL;
     gsl_eigen_symmv_workspace *w = NULL;
-    gsl_matrix *out = NULL;
-    gsl_matrix *in = NULL;
-
-    #define EIGENVECTORS_CLEANUP { psFree(outImage); return NULL; }
-    // Error checks
-    PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, EIGENVECTORS_CLEANUP);
-    PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, EIGENVECTORS_CLEANUP);
-    PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, EIGENVECTORS_CLEANUP);
-    PS_CHECK_POINTERS(inImage, outImage, EIGENVECTORS_CLEANUP);
-
-    outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type);
+    gsl_matrix *outGSL = NULL;
+    gsl_matrix *inGSL = NULL;
+
+    #define EIGENVECTORS_CLEANUP { psFree(out); return NULL; }
+    // Error checks
+    PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, EIGENVECTORS_CLEANUP);
+    PS_CHECK_DIMEN_AND_TYPE(in, PS_DIMEN_IMAGE, EIGENVECTORS_CLEANUP);
+    PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(in, EIGENVECTORS_CLEANUP);
+    PS_CHECK_POINTERS(in, out, EIGENVECTORS_CLEANUP);
+
+    out = psImageRecycle(out, in->numCols, in->numRows, in->type.type);
 
     // Initialize data
-    numRows = inImage->numRows;
-    numCols = inImage->numCols;
-
-    in = gsl_matrix_alloc(numRows, numCols);
-    psImageToGslMatrix(in, inImage);
-    out = gsl_matrix_alloc(numRows, numCols);
+    numRows = in->numRows;
+    numCols = in->numCols;
+
+    inGSL = gsl_matrix_alloc(numRows, numCols);
+    psImageToGslMatrix(inGSL, in);
+    outGSL = gsl_matrix_alloc(numRows, numCols);
 
     // Allocate GSL structs
@@ -511 +511 @@
 
     // Non-square matrices not allowed
-    PS_CHECK_SQUARE(inImage, EIGENVECTORS_CLEANUP);
-    PS_CHECK_SQUARE(outImage, EIGENVECTORS_CLEANUP);
+    PS_CHECK_SQUARE(in, EIGENVECTORS_CLEANUP);
+    PS_CHECK_SQUARE(out, EIGENVECTORS_CLEANUP);
 
     // Calculate Eigenvalues and Eigenvectors...Eigenvalues not currently used
-    gsl_eigen_symmv(in, eVals, out, w);
+    gsl_eigen_symmv(inGSL, eVals, outGSL, w);
 
     // Copy GSL matrix data to psImage data
-    gslMatrixToPsImage(outImage, out);
+    gslMatrixToPsImage(out, outGSL);
 
     // Free GSL structs
-    gsl_matrix_free(in);
-    gsl_matrix_free(out);
+    gsl_matrix_free(inGSL);
+    gsl_matrix_free(outGSL);
     gsl_eigen_symmv_free(w);
     gsl_vector_free(eVals);
 
-    return outImage;
+    return out;
 }
 

trunk/psLib/src/math/psMatrix.h

@@ -21 +21 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 23:40:45 $
+ *  @version $Revision: 1.17 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:29 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -76 +76 @@
     psImage* outImage,                 ///< Image to return, or NULL for in-place substitution.
     const psImage* inImage,            ///< Image to be inverted
-    psF32 *det                         ///< Determinant to return, or NULL
+    float *det                         ///< Determinant to return, or NULL
 );
 
@@ -87 +87 @@
  *  @return  float: Determinant from psImage.
  */
-psF32 *psMatrixDeterminant(
-    const psImage* inMatrix        ///< Image used to calculate determinant.
+float *psMatrixDeterminant(
+    const psImage* in                  ///< Image used to calculate determinant.
 );
 
@@ -129 +129 @@
  */
 psImage* psMatrixEigenvectors(
-    psImage* outImage,                 ///< Eigenvectors to return, or NULL.
-    psImage* inImage                   ///< Input image.
+    psImage* out,                      ///< Eigenvectors to return, or NULL.
+    psImage* in                        ///< Input image.
 );
 

trunk/psLib/src/math/psMinimize.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.122 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-13 20:18:18 $
+ *  @version $Revision: 1.123 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -562 +562 @@
 
 // XXX EAM this is my re-implementation of MinLM
-psBool psMinimizeLMChi2(psMinimization *min,
-                        psImage *covar,
-                        psVector *params,
-                        const psVector *paramMask,
-                        const psArray *x,
-                        const psVector *y,
-                        const psVector *yErr,
-                        psMinimizeLMChi2Func func)
+bool psMinimizeLMChi2(psMinimization *min,
+                      psImage *covar,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *x,
+                      const psVector *y,
+                      const psVector *yErr,
+                      psMinimizeLMChi2Func func)
 {
     PS_ASSERT_PTR_NON_NULL(min, NULL);
@@ -1426 +1426 @@
 /******************************************************************************
  *****************************************************************************/
-psMinimization *psMinimizationAlloc(psS32 maxIter,
-                                    psF32 tol)
+psMinimization *psMinimizationAlloc(int maxIter,
+                                    float tol)
 {
     PS_ASSERT_INT_NONNEGATIVE(maxIter, NULL);
@@ -1912 +1912 @@
 #define PS_MINIMIZE_POWELL_LINEMIN_ERROR_TOLERANCE 0.01
 
-psBool psMinimizePowell(psMinimization *min,
-                        psVector *params,
-                        const psVector *paramMask,
-                        const psArray *coords,
-                        psMinimizePowellFunc func)
+bool psMinimizePowell(psMinimization *min,
+                      psVector *params,
+                      const psVector *paramMask,
+                      const psArray *coords,
+                      psMinimizePowellFunc func)
 {
     PS_ASSERT_PTR_NON_NULL(min, NULL);
@@ -2189 +2189 @@
 psMinimizePowell().
  *****************************************************************************/
-psBool psMinimizeChi2Powell(psMinimization *min,
-                            psVector *params,
-                            const psVector *paramMask,
-                            const psArray *coords,
-                            const psVector *value,
-                            const psVector *error,
-                            psMinimizeChi2PowellFunc func)
+bool psMinimizeChi2Powell(psMinimization *min,
+                          psVector *params,
+                          const psVector *paramMask,
+                          const psArray *coords,
+                          const psVector *value,
+                          const psVector *error,
+                          psMinimizeChi2PowellFunc model)
 {
     myValue = (psVector *) value;
     myError = (psVector *) error;
 
-    Chi2PowellFunc = func;
+    Chi2PowellFunc = model;
 
     return(psMinimizePowell(min, params, paramMask, coords, myPowellChi2Func));

trunk/psLib/src/math/psMinimize.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-16 03:51:58 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -56 +56 @@
 */
 psMinimization *psMinimizationAlloc(
-    psS32 maxIter,                     ///< Number of minimization iterations to perform.
-    psF32 tol                          ///< Requested error tolerance
+    int maxIter,                       ///< Number of minimization iterations to perform.
+    float tol                          ///< Requested error tolerance
 );
 
@@ -111 +111 @@
  *  @return psBool:   True if successful.
  */
-psBool psMinimizeLMChi2(
+bool psMinimizeLMChi2(
     psMinimization *min,               ///< Minimization specification
     psImage *covar,                    ///< Covariance matrix
@@ -167 +167 @@
  *  @return psBool:   True if successful.
  */
-psBool psMinimizePowell(
+bool psMinimizePowell(
     psMinimization *min,               ///< Minimization specification
     psVector *params,                  ///< "Best guess" for parameters that minimize func
@@ -211 +211 @@
  *  @return psBool:   True is successful.
  */
-psBool psMinimizeChi2Powell(
+bool psMinimizeChi2Powell(
     psMinimization *min,               ///< Minimization specification
     psVector *params,                  ///< "Best guess" for parameters that minimize func
@@ -218 +218 @@
     const psVector *value,             ///< Measured values at the coordinates
     const psVector *error,             ///< Errors in the measure values (or NULL)
-    psMinimizeChi2PowellFunc func      ///< Specified function
+    psMinimizeChi2PowellFunc model     ///< Specified function
 );
 

trunk/psLib/src/sys/psLogMsg.c

@@ -12 +12 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 03:13:02 $
+ *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
  The old log level.
  *****************************************************************************/
-psS32 psLogSetLevel(psS32 level)
+int psLogSetLevel(int level)
 {
     // Save old global log level for changing it.
@@ -233 +233 @@
    ap
  *****************************************************************************/
-void psLogMsgV(const char *name, psS32 level, const char *fmt, va_list ap)
+void psLogMsgV(const char *name, int level, const char *format, va_list ap)
 {
     static psS32 first = 1;       // Flag for calling gethostname()
@@ -287 +287 @@
 
     default:
-        psTrace("utils.logMsg", 2, "Invalid logMsg level: %d (%s)\n", level, fmt);
+        psTrace("utils.logMsg", 2, "Invalid logMsg level: %d (%s)\n", level, format);
         level = (level < 0) ? 0 : 9;
         clevel = level + '0';
@@ -335 +335 @@
         char msg[1024];
         char* msgPtr;
-        vsnprintf(msg,1024, fmt, ap);  // create message
+        vsnprintf(msg,1024, format, ap);  // create message
 
         // detect multiple lines in message and indent each line by 4 spaces.

trunk/psLib/src/sys/psLogMsg.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 03:13:02 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
  *  @return psS32    old logging level
  */
-psS32 psLogSetLevel(
-    psS32 level                          ///< Specifies the system log level
+int psLogSetLevel(
+    int level                          ///< Specifies the system log level
 );
 
@@ -79 +79 @@
 void psLogMsgV(
     const char *name,                  ///< name of the log source
-    psS32 myLevel,                       ///< severity level of this log message
-    const char *fmt,                   ///< printf-style format command
+    int level,                         ///< severity level of this log message
+    const char *format,                ///< printf-style format command
     va_list ap                         ///< varargs argument list
 );

trunk/psLib/src/sys/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 21:42:02 $
+*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -255 +255 @@
 }
 
-psS32 psMemCheckCorruption(psBool abort_on_error)
+int psMemCheckCorruption(bool abort_on_error)
 {
     psS32 nbad = 0;               // number of bad blocks
@@ -504 +504 @@
 
 // return refCounter
-psReferenceCount psMemGetRefCounter(psPtr vptr)
-{
-    psMemBlock* ptr;
+psReferenceCount psMemGetRefCounter(const psPtr ptr)
+{
+    psMemBlock* ptr2;
     psU32 refCount;
 
-    if (vptr == NULL) {
+    if (ptr == NULL) {
         return 0;
     }
 
-    ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
-    pthread_mutex_lock(&ptr->refCounterMutex);
-    refCount = ptr->refCounter;
-    pthread_mutex_unlock(&ptr->refCounterMutex);
+    ptr2 = ((psMemBlock* ) ptr) - 1;
+
+    if (checkMemBlock(ptr2, __func__) != 0) {
+        memProblemCallback(ptr2, __func__, __LINE__);
+    }
+
+    pthread_mutex_lock(&ptr2->refCounterMutex);
+    refCount = ptr2->refCounter;
+    pthread_mutex_unlock(&ptr2->refCounterMutex);
 
     return refCount;

trunk/psLib/src/sys/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:44:21 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -270 +270 @@
  *  @ingroup memTracing
  */
-psS32 psMemCheckCorruption(
-    psBool abort_on_error                ///< Abort on detecting corruption?
+int psMemCheckCorruption(
+    bool abort_on_error                ///< Abort on detecting corruption?
 );
 
@@ -279 +279 @@
  */
 psReferenceCount psMemGetRefCounter(
-    psPtr vptr                         ///< Pointer to get refCounter for
+    const psPtr ptr                    ///< Pointer to get refCounter for
 );
 
@@ -288 +288 @@
 #ifdef DOXYGEN
 psPtr psMemIncrRefCounter(
-    psPtr vptr                         ///< Pointer to increment refCounter, and return
+    const psPtr ptr                         ///< Pointer to increment refCounter, and return
 );
 #else
@@ -312 +312 @@
 #ifdef DOXYGEN
 psPtr psMemDecrRefCounter(
-    psPtr vptr                         ///< Pointer to decrement refCounter, and return
+    psPtr ptr                         ///< Pointer to decrement refCounter, and return
 );
 #else // DOXYGEN

trunk/psLib/src/sysUtils/psLogMsg.c

@@ -12 +12 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.45 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 03:13:02 $
+ *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
  The old log level.
  *****************************************************************************/
-psS32 psLogSetLevel(psS32 level)
+int psLogSetLevel(int level)
 {
     // Save old global log level for changing it.
@@ -233 +233 @@
    ap
  *****************************************************************************/
-void psLogMsgV(const char *name, psS32 level, const char *fmt, va_list ap)
+void psLogMsgV(const char *name, int level, const char *format, va_list ap)
 {
     static psS32 first = 1;       // Flag for calling gethostname()
@@ -287 +287 @@
 
     default:
-        psTrace("utils.logMsg", 2, "Invalid logMsg level: %d (%s)\n", level, fmt);
+        psTrace("utils.logMsg", 2, "Invalid logMsg level: %d (%s)\n", level, format);
         level = (level < 0) ? 0 : 9;
         clevel = level + '0';
@@ -335 +335 @@
         char msg[1024];
         char* msgPtr;
-        vsnprintf(msg,1024, fmt, ap);  // create message
+        vsnprintf(msg,1024, format, ap);  // create message
 
         // detect multiple lines in message and indent each line by 4 spaces.

trunk/psLib/src/sysUtils/psLogMsg.h

@@ -11 +11 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-18 03:13:02 $
+ *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -44 +44 @@
  *  @return psS32    old logging level
  */
-psS32 psLogSetLevel(
-    psS32 level                          ///< Specifies the system log level
+int psLogSetLevel(
+    int level                          ///< Specifies the system log level
 );
 
@@ -79 +79 @@
 void psLogMsgV(
     const char *name,                  ///< name of the log source
-    psS32 myLevel,                       ///< severity level of this log message
-    const char *fmt,                   ///< printf-style format command
+    int level,                         ///< severity level of this log message
+    const char *format,                ///< printf-style format command
     va_list ap                         ///< varargs argument list
 );

trunk/psLib/src/sysUtils/psMemory.c

@@ -8 +8 @@
 *  @author Robert Lupton, Princeton University
 *
-*  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 21:42:02 $
+*  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:30 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -255 +255 @@
 }
 
-psS32 psMemCheckCorruption(psBool abort_on_error)
+int psMemCheckCorruption(bool abort_on_error)
 {
     psS32 nbad = 0;               // number of bad blocks
@@ -504 +504 @@
 
 // return refCounter
-psReferenceCount psMemGetRefCounter(psPtr vptr)
-{
-    psMemBlock* ptr;
+psReferenceCount psMemGetRefCounter(const psPtr ptr)
+{
+    psMemBlock* ptr2;
     psU32 refCount;
 
-    if (vptr == NULL) {
+    if (ptr == NULL) {
         return 0;
     }
 
-    ptr = ((psMemBlock* ) vptr) - 1;
-
-    if (checkMemBlock(ptr, __func__) != 0) {
-        memProblemCallback(ptr, __func__, __LINE__);
-    }
-
-    pthread_mutex_lock(&ptr->refCounterMutex);
-    refCount = ptr->refCounter;
-    pthread_mutex_unlock(&ptr->refCounterMutex);
+    ptr2 = ((psMemBlock* ) ptr) - 1;
+
+    if (checkMemBlock(ptr2, __func__) != 0) {
+        memProblemCallback(ptr2, __func__, __LINE__);
+    }
+
+    pthread_mutex_lock(&ptr2->refCounterMutex);
+    refCount = ptr2->refCounter;
+    pthread_mutex_unlock(&ptr2->refCounterMutex);
 
     return refCount;

trunk/psLib/src/sysUtils/psMemory.h

@@ -12 +12 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 23:44:21 $
+ *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:30 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -270 +270 @@
  *  @ingroup memTracing
  */
-psS32 psMemCheckCorruption(
-    psBool abort_on_error                ///< Abort on detecting corruption?
+int psMemCheckCorruption(
+    bool abort_on_error                ///< Abort on detecting corruption?
 );
 
@@ -279 +279 @@
  */
 psReferenceCount psMemGetRefCounter(
-    psPtr vptr                         ///< Pointer to get refCounter for
+    const psPtr ptr                    ///< Pointer to get refCounter for
 );
 
@@ -288 +288 @@
 #ifdef DOXYGEN
 psPtr psMemIncrRefCounter(
-    psPtr vptr                         ///< Pointer to increment refCounter, and return
+    const psPtr ptr                         ///< Pointer to increment refCounter, and return
 );
 #else
@@ -312 +312 @@
 #ifdef DOXYGEN
 psPtr psMemDecrRefCounter(
-    psPtr vptr                         ///< Pointer to decrement refCounter, and return
+    psPtr ptr                         ///< Pointer to decrement refCounter, and return
 );
 #else // DOXYGEN

trunk/psLib/src/types/psLookupTable.c

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 23:44:21 $
+*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, Univ. of Hawaii
@@ -254 +254 @@
 /*****************************************************************************/
 
-psLookupTable* psLookupTableAlloc(const char *fileName, const char *format, int indexCol)
+psLookupTable* psLookupTableAlloc(const char *fileName, const char *format, long indexCol)
 {
     psLookupTable *outTable = NULL;
@@ -633 +633 @@
 }
 
-psS32 psLookupTableRead(psLookupTable* table)
+long psLookupTableRead(psLookupTable* table)
 {
     psS32           numRows  = 0;

trunk/psLib/src/types/psLookupTable.h

@@ -7 +7 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-08 23:40:45 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -70 +70 @@
     const char *fileName,           ///< Name of file to read
     const char *format,             ///< scanf-like format string
-    int indexCol                    ///< Column of the index vector (starting at zero)
+    long indexCol                    ///< Column of the index vector (starting at zero)
 );
 
@@ -102 +102 @@
  *  @return psS32     Number of valid lines read
  */
-psS32 psLookupTableRead(
+long psLookupTableRead(
     psLookupTable *table            ///< Table to read
 );

trunk/psLib/src/types/psMetadata.c

@@ -12 +12 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.65 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-17 23:44:21 $
+*  @version $Revision: 1.66 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -267 +267 @@
 }
 
-psBool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)
+bool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags)
 {
     char * key = NULL;
@@ -359 +359 @@
 }
 
-psBool psMetadataAdd(psMetadata *md, psS32 location, const char *name,
-                     psS32 type, const char *comment, ...)
+bool psMetadataAdd(psMetadata *md, int location, const char *name,
+                   int format, const char *comment, ...)
 {
     va_list argPtr;
 
     va_start(argPtr, comment);
-    psBool result = psMetadataAddV(md,location,name,type,comment,argPtr);
+    psBool result = psMetadataAddV(md,location,name,format,comment,argPtr);
     va_end(argPtr);
 
@@ -371 +371 @@
 }
 
-psBool psMetadataAddV(psMetadata *md, psS32 location, const char *name,
-                      psS32 type, const char *comment, va_list list)
+bool psMetadataAddV(psMetadata *md, int location, const char *name,
+                    int format, const char *comment, va_list list)
 {
     psMetadataItem* metadataItem = NULL;
 
-    metadataItem = psMetadataItemAllocV(name, type & PS_METADATA_TYPE_MASK, comment, list);
-
-    if (!psMetadataAddItem(md, metadataItem, location, type & PS_METADATA_FLAGS_MASK)) {
+    metadataItem = psMetadataItemAllocV(name, format & PS_METADATA_TYPE_MASK, comment, list);
+
+    if (!psMetadataAddItem(md, metadataItem, location, format & PS_METADATA_FLAGS_MASK)) {
         psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_FAILED);
         psFree(metadataItem);
@@ -475 +475 @@
 }
 
-psMetadataItem* psMetadataLookup(psMetadata *md, const char *key)
+psMetadataItem* psMetadataLookup(const psMetadata *md, const char *key)
 {
     psHash* mdTable = NULL;
@@ -491 +491 @@
 }
 
-void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key)
+void* psMetadataLookupPtr(bool *status, const psMetadata *md, const char *key)
 {
     psMetadataItem *metadataItem = NULL;
@@ -525 +525 @@
 
 #define psMetadataLookupNumTYPE(TYPE) \
-ps##TYPE psMetadataLookup##TYPE(psBool *status, psMetadata *md, const char *key) \
+ps##TYPE psMetadataLookup##TYPE(bool *status, const psMetadata *md, const char *key) \
 { \
     psMetadataItem *metadataItem = NULL; \
@@ -630 +630 @@
 }
 
-psBool psMetadataIteratorSet(psMetadataIterator* iterator,
-                             int location)
+bool psMetadataIteratorSet(psMetadataIterator* iterator,
+                           int location)
 {
     int match;

trunk/psLib/src/types/psMetadata.h

@@ -11 +11 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-14 02:54:06 $
+*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-06-20 22:42:29 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -214 +214 @@
     const char* name,                  ///< Name of metadata item.
     const char* comment,               ///< Comment for metadata item.
-    psBool value                       ///< the value of the metadata item.
+    bool value                       ///< the value of the metadata item.
 );
 
@@ -257 +257 @@
  *  @return bool: True for success, false for failure.
  */
-psBool psMetadataAddItem(
+bool psMetadataAddItem(
     psMetadata*  md,                   ///< Metadata collection to insert metadat item.
     psMetadataItem*  item,             ///< Metadata item to be added.
@@ -270 +270 @@
  * @return bool: True for success, false for failure.
  */
-psBool psMetadataAdd(
+bool psMetadataAdd(
     psMetadata* md,                    ///< Metadata collection to insert metadata item.
-    psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    int location,                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
     const char *name,                  ///< Name of metadata item.
-    int type,                          ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
+    int format,                      ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
     const char *comment,               ///< Comment for metadata item.
     ...                                ///< Arguments for name formatting and metadata item data.
@@ -286 +286 @@
  * @return bool: True for success, false for failure.
  */
-psBool psMetadataAddV(
+bool psMetadataAddV(
     psMetadata* md,                    ///< Metadata collection to insert metadata item.
-    psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    int location,                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
     const char *name,                  ///< Name of metadata item.
-    int type,                          ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
+    int format,                        ///< Type of metadata item (psMetadataType) and options (psMetadataFlags)
     const char *comment,               ///< Comment for metadata item.
     va_list list                       ///< Arguments for name formatting and metadata item data.
@@ -300 +300 @@
  *  @return psBool:  True for success, False for failure. 
  */
-psBool psMetadataAddS32(
+bool psMetadataAddS32(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -312 +312 @@
  *  @return psBool:  True for success, False for failure.
 */
-psBool psMetadataAddF32(
+bool psMetadataAddF32(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -324 +324 @@
  *  @return psBool:  True for success, False for failure.
 */
-psBool psMetadataAddF64(
+bool psMetadataAddF64(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -348 +348 @@
  *  @return psBool:  True for success, False for failure.
  */
-psBool psMetadataAddStr(
+bool psMetadataAddStr(
     psMetadata* md,                    ///< Metadata collection to insert metadata item
     psS32 location,                    ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
@@ -438 +438 @@
  * @return bool: True for success, false for failure.
  */
-psBool psMetadataRemove(
-    psMetadata*  md,           ///< Metadata collection to remove metadata item.
-    psS32 where,               ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
-    const char * key           ///< Name of metadata key.
+bool psMetadataRemove(
+    psMetadata*  md,                   ///< Metadata collection to remove metadata item.
+    int location,                      ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL
+    const char * key                   ///< Name of metadata key.
 );
 
@@ -453 +453 @@
  */
 psMetadataItem* psMetadataLookup(
-    psMetadata * md,                   ///< Metadata collection to lookup metadata item.
+    const psMetadata * md,                   ///< Metadata collection to lookup metadata item.
     const char * key                   ///< Name of metadata key.
 );
@@ -466 +466 @@
  */
 psF64 psMetadataLookupF64(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata *md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -480 +480 @@
  */
 psF32 psMetadataLookupF32(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata *md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -494 +494 @@
  */
 psS32 psMetadataLookupS32(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata *md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -508 +508 @@
  */
 psBool psMetadataLookupBool(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata *md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata *md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -522 +522 @@
  */
 psPtr psMetadataLookupPtr(
-    psBool *status,                    ///< Status of lookup.
-    psMetadata* md,                    ///< Metadata collection to lookup metadata item.
+    bool *status,                    ///< Status of lookup.
+    const psMetadata* md,                    ///< Metadata collection to lookup metadata item.
     const char *key                    ///< Name of metadata key.
 );
@@ -560 +560 @@
  *  @return psBool        TRUE if iterator successfully set, otherwise FALSE.
 */
-psBool psMetadataIteratorSet(
+bool psMetadataIteratorSet(
     psMetadataIterator* iterator,      ///< psMetadata iterator
     int location                       ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL

trunk/psLib/src/types/psPixels.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-13 20:43:40 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:29 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -114 +114 @@
 }
 
-psPixels* psPixelsCopy(psPixels* out, const psPixels* in)
-{
-    if (in == NULL) {
+psPixels* psPixelsCopy(psPixels* out, const psPixels* pixels)
+{
+    if (pixels == NULL) {
         psError(PS_ERR_BAD_PARAMETER_NULL,true,PS_ERRORTEXT_psPixels_NULL);
         psFree(out);
@@ -122 +122 @@
     }
 
-    out = psPixelsRealloc(out, in->n);
-
-    memcpy(out->data,in->data, in->n*sizeof(psPixelCoord));
-    out->n = in->n;
+    out = psPixelsRealloc(out, pixels->n);
+
+    memcpy(out->data,pixels->data, pixels->n*sizeof(psPixelCoord));
+    out->n = pixels->n;
 
     return out;

trunk/psLib/src/types/psPixels.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-17 00:11:02 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-20 22:42:29 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -85 +85 @@
 psPixels* psPixelsCopy(
     psPixels* out,                     ///< psPixels struct to recycle, or NULL
-    const psPixels* in                 ///< psPixels struct to copy
+    const psPixels* pixels             ///< psPixels struct to copy
 );