Index: /trunk/psLib/src/astro/psTime.h =================================================================== --- /trunk/psLib/src/astro/psTime.h (revision 4589) +++ /trunk/psLib/src/astro/psTime.h (revision 4590) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-28 20:17:52 $ + * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -64,5 +64,5 @@ psS64 sec; ///< Seconds since epoch, Jan 1, 1970. psU32 nsec; ///< Nanoseconds since last second. - psBool leapsecond; ///< if time falls on UTC leapsecond + bool leapsecond; ///< if time falls on UTC leapsecond psTimeType type; ///< Type of time. } Index: /trunk/psLib/src/imageops/psImagePixelExtract.h =================================================================== --- /trunk/psLib/src/imageops/psImagePixelExtract.h (revision 4589) +++ /trunk/psLib/src/imageops/psImagePixelExtract.h (revision 4590) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 00:51:28 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +30,5 @@ PS_CUT_X_NEG, ///< Cut in the x dimension from rigth to left PS_CUT_Y_POS, ///< Cut in the y dimension from bottom up - PS_CUT_Y_NEG, ///< Cut in the y dimension from top down. + PS_CUT_Y_NEG ///< Cut in the y dimension from top down. } psImageCutDirection; Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 4589) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 4590) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.60 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-12 19:12:01 $ + * @version $Revision: 1.61 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,5 +39,5 @@ PS_INTERPOLATE_LANCZOS2_VARIANCE, ///< Variance version of PS_INTERPOLATE_LANCZOS2 PS_INTERPOLATE_LANCZOS3_VARIANCE, ///< Variance version of PS_INTERPOLATE_LANCZOS3 - PS_INTERPOLATE_LANCZOS4_VARIANCE, ///< Variance version of PS_INTERPOLATE_LANCZOS4 + PS_INTERPOLATE_LANCZOS4_VARIANCE ///< Variance version of PS_INTERPOLATE_LANCZOS4 // PS_INTERPOLATE_NUM_MODES ///< enum end-marker; does not coorespond to a interpolation mode } psImageInterpolateMode; Index: /trunk/psLib/src/sys/psMemory.h =================================================================== --- /trunk/psLib/src/sys/psMemory.h (revision 4589) +++ /trunk/psLib/src/sys/psMemory.h (revision 4590) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-21 01:40:10 $ + * @version $Revision: 1.48 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -118,5 +118,5 @@ * @ingroup memCallback */ -typedef void* (*psMemExhaustedCallback) ( +typedef psPtr (*psMemExhaustedCallback) ( size_t size ///< the size of buffer required ); Index: /trunk/psLib/src/sys/psType.h =================================================================== --- /trunk/psLib/src/sys/psType.h (revision 4589) +++ /trunk/psLib/src/sys/psType.h (revision 4590) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-12 19:12:01 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -131,5 +131,5 @@ PS_DATA_SCALAR, ///< psScalar PS_DATA_SPHERE, ///< psSphere - PS_DATA_SPHERETRANSFORM, ///< psSphereTransform + PS_DATA_SPHEREROT, ///< psSphereTransform PS_DATA_SPLINE1D, ///< psSpline1D PS_DATA_STATS, ///< psStats Index: /trunk/psLib/src/types/psList.h =================================================================== --- /trunk/psLib/src/types/psList.h (revision 4589) +++ /trunk/psLib/src/types/psList.h (revision 4590) @@ -7,6 +7,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-15 02:33:54 $ + * @version $Revision: 1.30 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -77,6 +77,6 @@ psList* list; ///< List iterator to works on psListElem* cursor; ///< current cursor position -int index; ///< the index number in the list bool offEnd; ///< Iterator off the end? +long index; ///< the index number in the list bool mutable; ///< Is it permissible to modify the list? } Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 4589) +++ /trunk/psLib/src/types/psMetadata.c (revision 4590) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.72 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-21 01:40:10 $ +* @version $Revision: 1.73 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -135,5 +135,5 @@ } psFree(metadata->list); - psFree(metadata->table); + psFree(metadata->hash); } @@ -256,5 +256,5 @@ { psList* list = NULL; - psHash* table = NULL; + psHash* hash = NULL; psMetadata* metadata = NULL; @@ -266,8 +266,8 @@ // Allocate metadata's internal containers list = (psList*) psListAlloc(NULL); - table = (psHash*) psHashAlloc(10); + hash = (psHash*) psHashAlloc(10); metadata->list = list; - metadata->table = table; + metadata->hash = hash; return metadata; @@ -285,10 +285,10 @@ PS_ASSERT_PTR_NON_NULL(md,NULL); - PS_ASSERT_PTR_NON_NULL(md->table,NULL); + PS_ASSERT_PTR_NON_NULL(md->hash,NULL); PS_ASSERT_PTR_NON_NULL(md->list,NULL); PS_ASSERT_PTR_NON_NULL(item,NULL); PS_ASSERT_PTR_NON_NULL(item->name,NULL); - mdTable = md->table; + mdTable = md->hash; mdList = md->list; key = item->name; @@ -435,6 +435,6 @@ psList* mdList = md->list; - PS_ASSERT_PTR_NON_NULL(md->table,NULL); - psHash* mdTable = md->table; + PS_ASSERT_PTR_NON_NULL(md->hash,NULL); + psHash* mdTable = md->hash; // Select removal by key or index @@ -504,8 +504,8 @@ PS_ASSERT_PTR_NON_NULL(md,NULL); - PS_ASSERT_PTR_NON_NULL(md->table,NULL); + PS_ASSERT_PTR_NON_NULL(md->hash,NULL); PS_ASSERT_PTR_NON_NULL(key,NULL); - mdTable = md->table; + mdTable = md->hash; entry = (psMetadataItem*)psHashLookup(mdTable, key); Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 4589) +++ /trunk/psLib/src/types/psMetadata.h (revision 4590) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-21 01:40:10 $ +* @version $Revision: 1.55 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -93,5 +93,5 @@ { psList* list; ///< Metadata in linked-list - psHash* table; ///< Metadata in a hash table + psHash* hash; ///< Metadata in a hash table void *lock; ///< Optional lock for thread safety } Index: /trunk/psLib/test/types/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_01.c (revision 4589) +++ /trunk/psLib/test/types/tst_psMetadata_01.c (revision 4590) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-13 02:47:01 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -39,5 +39,5 @@ printMetadataList(metadata->list, " "); printf("\nContents of metadata table:\n"); - printMetadataTable(metadata->table); + printMetadataTable(metadata->hash); } Index: /trunk/psLib/test/types/tst_psMetadata_03.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_03.c (revision 4589) +++ /trunk/psLib/test/types/tst_psMetadata_03.c (revision 4590) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-13 02:47:01 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -164,6 +164,6 @@ "Couldn't add item to invalid metadata structure.",0); errMetadata = psMetadataAlloc(); - mdTable = errMetadata->table; - errMetadata->table = NULL; + mdTable = errMetadata->hash; + errMetadata->hash = NULL; if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD, PS_META_DEFAULT) ) { psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); @@ -174,5 +174,5 @@ return 31; } - errMetadata->table = mdTable; + errMetadata->hash = mdTable; printFooter(stdout,"psMetadata","Test G - Attempt to add item to invalid metadata w/o hash table", true); @@ -208,11 +208,11 @@ printNegativeTestHeader(stdout,"psMetadata","Test J - Attempt to add item to metadata w/o hash table", "Couldn't add item to invalid metadata structure.",0); - mdTable = errMetadata->table; - errMetadata->table = NULL; + mdTable = errMetadata->hash; + errMetadata->hash = NULL; if (psMetadataAdd(errMetadata, PS_LIST_HEAD, "errItem", PS_META_S32, "Integer",22) ) { psError(PS_ERR_UNKNOWN, true,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); return 24; } - errMetadata->table = mdTable; + errMetadata->hash = mdTable; printFooter(stdout,"psMetadata","Test J - Attempt to add item to invalid metadata w/o hash table", true); Index: /trunk/psLib/test/types/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/types/tst_psMetadata_04.c (revision 4589) +++ /trunk/psLib/test/types/tst_psMetadata_04.c (revision 4590) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-13 02:47:01 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-21 02:39:57 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -219,11 +219,11 @@ printNegativeTestHeader(stdout,"psMetadata","Test L - Attemp to look up with an invalid metadata", "Lookup item with invalid metadata object.", 0 ); - tmpTable = metadata->table; - metadata->table = NULL; + tmpTable = metadata->hash; + metadata->hash = NULL; if ( psMetadataLookup(metadata,"myItem2") != NULL ) { psError(PS_ERR_UNKNOWN, true,"psMetadataLookup did not return null for invalid metadata object"); return 20; } - metadata->table = tmpTable; + metadata->hash = tmpTable; printFooter(stdout, "psMetadata","Test L - Attempt to lookup an invalid metadata object.",true); Index: /trunk/psLib/test/types/verified/tst_psMetadata_03.stderr =================================================================== --- /trunk/psLib/test/types/verified/tst_psMetadata_03.stderr (revision 4589) +++ /trunk/psLib/test/types/verified/tst_psMetadata_03.stderr (revision 4590) @@ -6,7 +6,7 @@ Could not find metadata item at index 22.