Index: /trunk/psLib/src/collections/psHash.c =================================================================== --- /trunk/psLib/src/collections/psHash.c (revision 4314) +++ /trunk/psLib/src/collections/psHash.c (revision 4315) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-07 22:37:52 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -43,5 +43,5 @@ The linked list *****************************************************************************/ -psList* psHashKeyList(psHash* table) +psList* psHashKeyList(const psHash* hash) { psS32 i = 0; // Loop index variable @@ -49,5 +49,5 @@ psHashBucket* ptr = NULL; // Used to step thru linked list. - if (table == NULL) { + if (hash == NULL) { return NULL; } @@ -57,10 +57,10 @@ // Loop through every bucket in the hash table. If that bucket is not // NULL, then add the bucket's key to the linked list. - for (i = 0; i < table->nbucket; i++) { - if (table->buckets[i] != NULL) { + for (i = 0; i < hash->nbucket; i++) { + if (hash->buckets[i] != NULL) { // Since a bucket contains a linked list of keys/data, we must // step trough each key in that linked list: - ptr = table->buckets[i]; + ptr = hash->buckets[i]; while (ptr != NULL) { psListAdd(myLinkList, PS_LIST_HEAD, ptr->key); @@ -135,5 +135,5 @@ The new hash table. *****************************************************************************/ -psHash* psHashAlloc(psS32 nbucket) // initial number of buckets +psHash* psHashAlloc(long nalloc) // initial number of buckets { psS32 i = 0; // loop index variable @@ -145,11 +145,11 @@ // Allocate memory for the buckets. - table->buckets = psAlloc(nbucket * sizeof(psHashBucket* )); - table->nbucket = nbucket; - - psTrace("utils.hash", 1, "Creating %d-element hash table\n", nbucket); + table->buckets = psAlloc(nalloc * sizeof(psHashBucket* )); + table->nbucket = nalloc; + + psTrace("utils.hash", 1, "Creating %d-element hash table\n", nalloc); // Initialize all buckets to NULL. - for (i = 0; i < nbucket; i++) + for (i = 0; i < nalloc; i++) { table->buckets[i] = NULL; @@ -383,6 +383,6 @@ boolean value defining success or failure *****************************************************************************/ -psBool psHashRemove(psHash* table, - const char *key) +bool psHashRemove(psHash* table, + const char *key) { psPtr data = NULL; Index: /trunk/psLib/src/collections/psHash.h =================================================================== --- /trunk/psLib/src/collections/psHash.h (revision 4314) +++ /trunk/psLib/src/collections/psHash.h (revision 4315) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -47,29 +47,29 @@ /// Allocate hash buckets in table. psHash* psHashAlloc( - psS32 nbucket ///< The number of buckets to allocate. + long nalloc ///< The number of buckets to allocate. ); /// Insert entry into table. psBool psHashAdd( - psHash* table, ///< The table to insert in. - const char *key, ///< The key to use. - psPtr data ///< The data to insert. + psHash* table, ///< The table to insert in. + const char *key, ///< The key to use. + psPtr data ///< The data to insert. ); /// Lookup key in table. psPtr psHashLookup( - psHash* table, ///< The table to lookup key in. - const char *key ///< The key to lookup. + psHash* table, ///< The table to lookup key in. + const char *key ///< The key to lookup. ); /// Remove key from table. -psBool psHashRemove( - psHash* table, ///< The table to lookup key in. - const char *key ///< The key to lookup. +bool psHashRemove( + psHash* table, ///< The table to lookup key in. + const char *key ///< The key to lookup. ); /// List all keys in table. psList* psHashKeyList( - psHash* table ///< The table to list keys from.. + const psHash* hash ///< The table to list keys from.. ); @@ -79,5 +79,5 @@ */ psArray* psHashToArray( - psHash* table ///< The table to convert to psArray. + psHash* table ///< The table to convert to psArray. ); Index: /trunk/psLib/src/dataIO/psFits.c =================================================================== --- /trunk/psLib/src/dataIO/psFits.c (revision 4314) +++ /trunk/psLib/src/dataIO/psFits.c (revision 4315) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 23:44:21 $ + * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -357,5 +357,5 @@ } -bool psFitsSetExtName(const psFits* fits, const char* name) +bool psFitsSetExtName(psFits* fits, const char* name) { if (fits == NULL) { @@ -881,5 +881,5 @@ } -bool psFitsUpdateImage(const psFits* fits, +bool psFitsUpdateImage(psFits* fits, const psImage* input, psRegion region, @@ -1019,5 +1019,5 @@ } -bool psFitsWriteHeader(const psMetadata* header, +bool psFitsWriteHeader(const psMetadata* output, const psFits* fits) { @@ -1029,5 +1029,5 @@ } - if (header == NULL) { + if (output == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL); @@ -1039,5 +1039,5 @@ //transverse the metadata list and add each key. - psListIterator* iter = psListIteratorAlloc(header->list,PS_LIST_HEAD,true); + psListIterator* iter = psListIteratorAlloc(output->list,PS_LIST_HEAD,true); psMetadataItem* item; while ( (item=psListGetAndIncrement(iter)) != NULL ) { @@ -1397,5 +1397,5 @@ -psArray* psFitsReadTable(const psFits* fits) +psArray* psFitsReadTable(psFits* fits) { int status = 0; Index: /trunk/psLib/src/dataIO/psFits.h =================================================================== --- /trunk/psLib/src/dataIO/psFits.h (revision 4314) +++ /trunk/psLib/src/dataIO/psFits.h (revision 4315) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 23:44:21 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -104,5 +104,5 @@ */ bool psFitsSetExtName( - const psFits* fits, ///< the psFits object + psFits* fits, ///< the psFits object const char* name ///< the extension name ); @@ -155,5 +155,5 @@ */ bool psFitsWriteHeader( - const psMetadata* header, ///< the psMetadata data in which to write + const psMetadata* output, ///< the psMetadata data in which to write const psFits* fits ///< the psFits object ); @@ -186,5 +186,5 @@ */ bool psFitsUpdateImage( - const psFits* fits, ///< the psFits object + psFits* fits, ///< the psFits object const psImage* input, ///< the image to output psRegion region, ///< the region in the FITS image to write @@ -234,5 +234,5 @@ */ psArray* psFitsReadTable( - const psFits* fits ///< the psFits object + psFits* fits ///< the psFits object ); Index: /trunk/psLib/src/dataManip/psFunctions.c =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.c (revision 4314) +++ /trunk/psLib/src/dataManip/psFunctions.c (revision 4315) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.108 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-16 22:32:07 $ + * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1016,5 +1016,5 @@ evaluated Gaussian is: \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] *****************************************************************************/ -psF32 psGaussian(psF32 x, psF32 mean, psF32 sigma, psBool normal) +float psGaussian(float x, float mean, float sigma, bool normal) { psF32 tmp = 1.0; Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 4314) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 4315) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 19:26:48 $ + * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -41,9 +41,9 @@ * @return psF32 value on the gaussian curve given the input parameters */ -psF32 psGaussian( - psF32 x, ///< Value at which to evaluate - psF32 mean, ///< Mean for the Gaussian - psF32 stddev, ///< Standard deviation for the Gaussian - psBool normal ///< Indicates whether result should be normalized +float psGaussian( + float x, ///< Value at which to evaluate + float mean, ///< Mean for the Gaussian + float sigma, ///< Standard deviation for the Gaussian + bool normal ///< Indicates whether result should be normalized ); Index: /trunk/psLib/src/dataManip/psStats.c =================================================================== --- /trunk/psLib/src/dataManip/psStats.c (revision 4314) +++ /trunk/psLib/src/dataManip/psStats.c (revision 4315) @@ -14,6 +14,6 @@ * stats->binsize * - * @version $Revision: 1.133 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-13 20:18:18 $ + * @version $Revision: 1.134 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1798,5 +1798,5 @@ The histogram structure *****************************************************************************/ -psHistogram* psHistogramAlloc(psF32 lower, psF32 upper, psS32 n) +psHistogram* psHistogramAlloc(float lower, float upper, int n) { PS_ASSERT_INT_POSITIVE(n, NULL); Index: /trunk/psLib/src/dataManip/psStats.h =================================================================== --- /trunk/psLib/src/dataManip/psStats.h (revision 4314) +++ /trunk/psLib/src/dataManip/psStats.h (revision 4315) @@ -14,6 +14,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 00:11:05 $ + * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -136,7 +136,7 @@ */ psHistogram* psHistogramAlloc( - psF32 lower, ///< Lower limit for the bins - psF32 upper, ///< Upper limit for the bins - psS32 n ///< Number of bins + float lower, ///< Lower limit for the bins + float upper, ///< Upper limit for the bins + int n ///< Number of bins ); Index: /trunk/psLib/src/fits/psFits.c =================================================================== --- /trunk/psLib/src/fits/psFits.c (revision 4314) +++ /trunk/psLib/src/fits/psFits.c (revision 4315) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 23:44:21 $ + * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -357,5 +357,5 @@ } -bool psFitsSetExtName(const psFits* fits, const char* name) +bool psFitsSetExtName(psFits* fits, const char* name) { if (fits == NULL) { @@ -881,5 +881,5 @@ } -bool psFitsUpdateImage(const psFits* fits, +bool psFitsUpdateImage(psFits* fits, const psImage* input, psRegion region, @@ -1019,5 +1019,5 @@ } -bool psFitsWriteHeader(const psMetadata* header, +bool psFitsWriteHeader(const psMetadata* output, const psFits* fits) { @@ -1029,5 +1029,5 @@ } - if (header == NULL) { + if (output == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psFits_METADATA_NULL); @@ -1039,5 +1039,5 @@ //transverse the metadata list and add each key. - psListIterator* iter = psListIteratorAlloc(header->list,PS_LIST_HEAD,true); + psListIterator* iter = psListIteratorAlloc(output->list,PS_LIST_HEAD,true); psMetadataItem* item; while ( (item=psListGetAndIncrement(iter)) != NULL ) { @@ -1397,5 +1397,5 @@ -psArray* psFitsReadTable(const psFits* fits) +psArray* psFitsReadTable(psFits* fits) { int status = 0; Index: /trunk/psLib/src/fits/psFits.h =================================================================== --- /trunk/psLib/src/fits/psFits.h (revision 4314) +++ /trunk/psLib/src/fits/psFits.h (revision 4315) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 23:44:21 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -104,5 +104,5 @@ */ bool psFitsSetExtName( - const psFits* fits, ///< the psFits object + psFits* fits, ///< the psFits object const char* name ///< the extension name ); @@ -155,5 +155,5 @@ */ bool psFitsWriteHeader( - const psMetadata* header, ///< the psMetadata data in which to write + const psMetadata* output, ///< the psMetadata data in which to write const psFits* fits ///< the psFits object ); @@ -186,5 +186,5 @@ */ bool psFitsUpdateImage( - const psFits* fits, ///< the psFits object + psFits* fits, ///< the psFits object const psImage* input, ///< the image to output psRegion region, ///< the region in the FITS image to write @@ -234,5 +234,5 @@ */ psArray* psFitsReadTable( - const psFits* fits ///< the psFits object + psFits* fits ///< the psFits object ); Index: /trunk/psLib/src/image/psImage.c =================================================================== --- /trunk/psLib/src/image/psImage.c (revision 4314) +++ /trunk/psLib/src/image/psImage.c (revision 4315) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 02:29:44 $ + * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ psImage* psImageAlloc(psU32 numCols, psU32 numRows, - const psElemType type) + psElemType type) { psS32 area = 0; Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 4314) +++ /trunk/psLib/src/image/psImage.h (revision 4315) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 21:20:20 $ + * @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -105,5 +105,5 @@ psU32 numCols, ///< Number of rows in image. psU32 numRows, ///< Number of columns in image. - const psElemType type ///< Type of data for image. + psElemType type ///< Type of data for image. ); Index: /trunk/psLib/src/image/psImageConvolve.c =================================================================== --- /trunk/psLib/src/image/psImageConvolve.c (revision 4314) +++ /trunk/psLib/src/image/psImageConvolve.c (revision 4315) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 02:29:44 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -279,5 +279,5 @@ } -psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, psBool direct) +psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, bool direct) { if (in == NULL) { Index: /trunk/psLib/src/image/psImageConvolve.h =================================================================== --- /trunk/psLib/src/image/psImageConvolve.h (revision 4314) +++ /trunk/psLib/src/image/psImageConvolve.h (revision 4315) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-14 02:54:15 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -123,5 +123,5 @@ const psImage* in, ///< the psImage to convolve const psKernel* kernel, ///< kernel to colvolve with - psBool direct ///< specifies method, true=direct convolution, false=fourier + bool direct ///< specifies method, true=direct convolution, false=fourier ); Index: /trunk/psLib/src/image/psImagePixelManip.c =================================================================== --- /trunk/psLib/src/image/psImagePixelManip.c (revision 4314) +++ /trunk/psLib/src/image/psImagePixelManip.c (revision 4315) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 02:08:21 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -31,9 +31,9 @@ #include "psCoord.h" -psS32 psImageClip(psImage* input, - psF64 min, - psF64 vmin, - psF64 max, - psF64 vmax) +int psImageClip(psImage* input, + double min, + double vmin, + double max, + double vmax) { psS32 numClipped = 0; @@ -140,6 +140,6 @@ } -psS32 psImageClipNaN(psImage* input, - psF64 value) +int psImageClipNaN(psImage* input, + float value) { psS32 numClipped = 0; @@ -310,9 +310,9 @@ } -psS32 psImageClipComplexRegion(psImage* input, - psC64 min, - psC64 vmin, - psC64 max, - psC64 vmax) +int psImageClipComplexRegion(psImage* input, + psC64 min, + psC64 vmin, + psC64 max, + psC64 vmax) { psS32 numClipped = 0; Index: /trunk/psLib/src/image/psImagePixelManip.h =================================================================== --- /trunk/psLib/src/image/psImagePixelManip.h (revision 4314) +++ /trunk/psLib/src/image/psImagePixelManip.h (revision 4315) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -32,10 +32,10 @@ * @return psS32 The number of clipped pixels */ -psS32 psImageClip( +int psImageClip( psImage* input, ///< the image to clip - psF64 min, ///< the minimum image value allowed - psF64 vmin, ///< the value pixels < min are set to - psF64 max, ///< the maximum image value allowed - psF64 vmax ///< the value pixels > max are set to + double min, ///< the minimum image value allowed + double vmin, ///< the value pixels < min are set to + double max, ///< the maximum image value allowed + double vmax ///< the value pixels > max are set to ); @@ -49,5 +49,5 @@ * @return psS32 The number of clipped pixels */ -psS32 psImageClipComplexRegion( +int psImageClipComplexRegion( psImage* input, ///< the image to clip psC64 min, ///< the minimum image value allowed @@ -64,7 +64,7 @@ * @return psS32 The number of clipped pixels */ -psS32 psImageClipNaN( +int psImageClipNaN( psImage* input, ///< the image to clip - psF64 value ///< the value to set all NaN/Inf values to + float value ///< the value to set all NaN/Inf values to ); Index: /trunk/psLib/src/imageops/psImageConvolve.c =================================================================== --- /trunk/psLib/src/imageops/psImageConvolve.c (revision 4314) +++ /trunk/psLib/src/imageops/psImageConvolve.c (revision 4315) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 02:29:44 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -279,5 +279,5 @@ } -psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, psBool direct) +psImage* psImageConvolve(psImage* out, const psImage* in, const psKernel* kernel, bool direct) { if (in == NULL) { Index: /trunk/psLib/src/imageops/psImageConvolve.h =================================================================== --- /trunk/psLib/src/imageops/psImageConvolve.h (revision 4314) +++ /trunk/psLib/src/imageops/psImageConvolve.h (revision 4315) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-14 02:54:15 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -123,5 +123,5 @@ const psImage* in, ///< the psImage to convolve const psKernel* kernel, ///< kernel to colvolve with - psBool direct ///< specifies method, true=direct convolution, false=fourier + bool direct ///< specifies method, true=direct convolution, false=fourier ); Index: /trunk/psLib/src/imageops/psImagePixelManip.c =================================================================== --- /trunk/psLib/src/imageops/psImagePixelManip.c (revision 4314) +++ /trunk/psLib/src/imageops/psImagePixelManip.c (revision 4315) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-19 02:08:21 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -31,9 +31,9 @@ #include "psCoord.h" -psS32 psImageClip(psImage* input, - psF64 min, - psF64 vmin, - psF64 max, - psF64 vmax) +int psImageClip(psImage* input, + double min, + double vmin, + double max, + double vmax) { psS32 numClipped = 0; @@ -140,6 +140,6 @@ } -psS32 psImageClipNaN(psImage* input, - psF64 value) +int psImageClipNaN(psImage* input, + float value) { psS32 numClipped = 0; @@ -310,9 +310,9 @@ } -psS32 psImageClipComplexRegion(psImage* input, - psC64 min, - psC64 vmin, - psC64 max, - psC64 vmax) +int psImageClipComplexRegion(psImage* input, + psC64 min, + psC64 vmin, + psC64 max, + psC64 vmax) { psS32 numClipped = 0; Index: /trunk/psLib/src/imageops/psImagePixelManip.h =================================================================== --- /trunk/psLib/src/imageops/psImagePixelManip.h (revision 4314) +++ /trunk/psLib/src/imageops/psImagePixelManip.h (revision 4315) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -32,10 +32,10 @@ * @return psS32 The number of clipped pixels */ -psS32 psImageClip( +int psImageClip( psImage* input, ///< the image to clip - psF64 min, ///< the minimum image value allowed - psF64 vmin, ///< the value pixels < min are set to - psF64 max, ///< the maximum image value allowed - psF64 vmax ///< the value pixels > max are set to + double min, ///< the minimum image value allowed + double vmin, ///< the value pixels < min are set to + double max, ///< the maximum image value allowed + double vmax ///< the value pixels > max are set to ); @@ -49,5 +49,5 @@ * @return psS32 The number of clipped pixels */ -psS32 psImageClipComplexRegion( +int psImageClipComplexRegion( psImage* input, ///< the image to clip psC64 min, ///< the minimum image value allowed @@ -64,7 +64,7 @@ * @return psS32 The number of clipped pixels */ -psS32 psImageClipNaN( +int psImageClipNaN( psImage* input, ///< the image to clip - psF64 value ///< the value to set all NaN/Inf values to + float value ///< the value to set all NaN/Inf values to ); Index: /trunk/psLib/src/math/psPolynomial.c =================================================================== --- /trunk/psLib/src/math/psPolynomial.c (revision 4314) +++ /trunk/psLib/src/math/psPolynomial.c (revision 4315) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.108 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-16 22:32:07 $ + * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1016,5 +1016,5 @@ evaluated Gaussian is: \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] *****************************************************************************/ -psF32 psGaussian(psF32 x, psF32 mean, psF32 sigma, psBool normal) +float psGaussian(float x, float mean, float sigma, bool normal) { psF32 tmp = 1.0; Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 4314) +++ /trunk/psLib/src/math/psPolynomial.h (revision 4315) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 19:26:48 $ + * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -41,9 +41,9 @@ * @return psF32 value on the gaussian curve given the input parameters */ -psF32 psGaussian( - psF32 x, ///< Value at which to evaluate - psF32 mean, ///< Mean for the Gaussian - psF32 stddev, ///< Standard deviation for the Gaussian - psBool normal ///< Indicates whether result should be normalized +float psGaussian( + float x, ///< Value at which to evaluate + float mean, ///< Mean for the Gaussian + float sigma, ///< Standard deviation for the Gaussian + bool normal ///< Indicates whether result should be normalized ); Index: /trunk/psLib/src/math/psSpline.c =================================================================== --- /trunk/psLib/src/math/psSpline.c (revision 4314) +++ /trunk/psLib/src/math/psSpline.c (revision 4315) @@ -7,6 +7,6 @@ * polynomials. It also contains a Gaussian functions. * - * @version $Revision: 1.108 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-16 22:32:07 $ + * @version $Revision: 1.109 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -1016,5 +1016,5 @@ evaluated Gaussian is: \f[ exp(-\frac{(x-mean)^2}{2\sigma^2}) \f] *****************************************************************************/ -psF32 psGaussian(psF32 x, psF32 mean, psF32 sigma, psBool normal) +float psGaussian(float x, float mean, float sigma, bool normal) { psF32 tmp = 1.0; Index: /trunk/psLib/src/math/psSpline.h =================================================================== --- /trunk/psLib/src/math/psSpline.h (revision 4314) +++ /trunk/psLib/src/math/psSpline.h (revision 4315) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 19:26:48 $ + * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -41,9 +41,9 @@ * @return psF32 value on the gaussian curve given the input parameters */ -psF32 psGaussian( - psF32 x, ///< Value at which to evaluate - psF32 mean, ///< Mean for the Gaussian - psF32 stddev, ///< Standard deviation for the Gaussian - psBool normal ///< Indicates whether result should be normalized +float psGaussian( + float x, ///< Value at which to evaluate + float mean, ///< Mean for the Gaussian + float sigma, ///< Standard deviation for the Gaussian + bool normal ///< Indicates whether result should be normalized ); Index: /trunk/psLib/src/math/psStats.c =================================================================== --- /trunk/psLib/src/math/psStats.c (revision 4314) +++ /trunk/psLib/src/math/psStats.c (revision 4315) @@ -14,6 +14,6 @@ * stats->binsize * - * @version $Revision: 1.133 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-13 20:18:18 $ + * @version $Revision: 1.134 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1798,5 +1798,5 @@ The histogram structure *****************************************************************************/ -psHistogram* psHistogramAlloc(psF32 lower, psF32 upper, psS32 n) +psHistogram* psHistogramAlloc(float lower, float upper, int n) { PS_ASSERT_INT_POSITIVE(n, NULL); Index: /trunk/psLib/src/math/psStats.h =================================================================== --- /trunk/psLib/src/math/psStats.h (revision 4314) +++ /trunk/psLib/src/math/psStats.h (revision 4315) @@ -14,6 +14,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 00:11:05 $ + * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -136,7 +136,7 @@ */ psHistogram* psHistogramAlloc( - psF32 lower, ///< Lower limit for the bins - psF32 upper, ///< Upper limit for the bins - psS32 n ///< Number of bins + float lower, ///< Lower limit for the bins + float upper, ///< Upper limit for the bins + int n ///< Number of bins ); Index: /trunk/psLib/src/mathtypes/psImage.c =================================================================== --- /trunk/psLib/src/mathtypes/psImage.c (revision 4314) +++ /trunk/psLib/src/mathtypes/psImage.c (revision 4315) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-07 02:29:44 $ + * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -50,5 +50,5 @@ psImage* psImageAlloc(psU32 numCols, psU32 numRows, - const psElemType type) + psElemType type) { psS32 area = 0; Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 4314) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 4315) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 21:20:20 $ + * @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -105,5 +105,5 @@ psU32 numCols, ///< Number of rows in image. psU32 numRows, ///< Number of columns in image. - const psElemType type ///< Type of data for image. + psElemType type ///< Type of data for image. ); Index: /trunk/psLib/src/sys/psError.c =================================================================== --- /trunk/psLib/src/sys/psError.c (revision 4314) +++ /trunk/psLib/src/sys/psError.c (revision 4315) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-04-07 20:27:41 $ + * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:50 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -177,17 +177,17 @@ } -void psErrorStackPrint(FILE *fd, const char *fmt, ...) +void psErrorStackPrint(FILE *fd, const char *format, ...) { va_list argPtr; // variable list arguement pointer // Get the variable list parameters to pass to logging function - va_start(argPtr, fmt); - - psErrorStackPrintV(fd,fmt,argPtr); + va_start(argPtr, format); + + psErrorStackPrintV(fd,format,argPtr); va_end(argPtr); } -void psErrorStackPrintV(FILE *fd, const char *fmt, va_list va) +void psErrorStackPrintV(FILE *fd, const char *format, va_list va) { @@ -195,5 +195,5 @@ if (errorStackSize > 0) { - vfprintf(fd,fmt,va); + vfprintf(fd,format,va); for (psS32 lcv=0;lcv 0) { - vfprintf(fd,fmt,va); + vfprintf(fd,format,va); for (psS32 lcv=0;lcvnbucket; i++) { - if (table->buckets[i] != NULL) { + for (i = 0; i < hash->nbucket; i++) { + if (hash->buckets[i] != NULL) { // Since a bucket contains a linked list of keys/data, we must // step trough each key in that linked list: - ptr = table->buckets[i]; + ptr = hash->buckets[i]; while (ptr != NULL) { psListAdd(myLinkList, PS_LIST_HEAD, ptr->key); @@ -135,5 +135,5 @@ The new hash table. *****************************************************************************/ -psHash* psHashAlloc(psS32 nbucket) // initial number of buckets +psHash* psHashAlloc(long nalloc) // initial number of buckets { psS32 i = 0; // loop index variable @@ -145,11 +145,11 @@ // Allocate memory for the buckets. - table->buckets = psAlloc(nbucket * sizeof(psHashBucket* )); - table->nbucket = nbucket; - - psTrace("utils.hash", 1, "Creating %d-element hash table\n", nbucket); + table->buckets = psAlloc(nalloc * sizeof(psHashBucket* )); + table->nbucket = nalloc; + + psTrace("utils.hash", 1, "Creating %d-element hash table\n", nalloc); // Initialize all buckets to NULL. - for (i = 0; i < nbucket; i++) + for (i = 0; i < nalloc; i++) { table->buckets[i] = NULL; @@ -383,6 +383,6 @@ boolean value defining success or failure *****************************************************************************/ -psBool psHashRemove(psHash* table, - const char *key) +bool psHashRemove(psHash* table, + const char *key) { psPtr data = NULL; Index: /trunk/psLib/src/types/psHash.h =================================================================== --- /trunk/psLib/src/types/psHash.h (revision 4314) +++ /trunk/psLib/src/types/psHash.h (revision 4315) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 02:30:49 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -47,29 +47,29 @@ /// Allocate hash buckets in table. psHash* psHashAlloc( - psS32 nbucket ///< The number of buckets to allocate. + long nalloc ///< The number of buckets to allocate. ); /// Insert entry into table. psBool psHashAdd( - psHash* table, ///< The table to insert in. - const char *key, ///< The key to use. - psPtr data ///< The data to insert. + psHash* table, ///< The table to insert in. + const char *key, ///< The key to use. + psPtr data ///< The data to insert. ); /// Lookup key in table. psPtr psHashLookup( - psHash* table, ///< The table to lookup key in. - const char *key ///< The key to lookup. + psHash* table, ///< The table to lookup key in. + const char *key ///< The key to lookup. ); /// Remove key from table. -psBool psHashRemove( - psHash* table, ///< The table to lookup key in. - const char *key ///< The key to lookup. +bool psHashRemove( + psHash* table, ///< The table to lookup key in. + const char *key ///< The key to lookup. ); /// List all keys in table. psList* psHashKeyList( - psHash* table ///< The table to list keys from.. + const psHash* hash ///< The table to list keys from.. ); @@ -79,5 +79,5 @@ */ psArray* psHashToArray( - psHash* table ///< The table to convert to psArray. + psHash* table ///< The table to convert to psArray. );