Index: trunk/psLib/src/collections/psMetadata.c =================================================================== --- trunk/psLib/src/collections/psMetadata.c (revision 4316) +++ trunk/psLib/src/collections/psMetadata.c (revision 4321) @@ -12,6 +12,6 @@ * @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,5 +267,5 @@ } -psBool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags) +bool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags) { char * key = NULL; @@ -359,11 +359,11 @@ } -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,12 +371,12 @@ } -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,5 +475,5 @@ } -psMetadataItem* psMetadataLookup(psMetadata *md, const char *key) +psMetadataItem* psMetadataLookup(const psMetadata *md, const char *key) { psHash* mdTable = NULL; @@ -491,5 +491,5 @@ } -void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key) +void* psMetadataLookupPtr(bool *status, const psMetadata *md, const char *key) { psMetadataItem *metadataItem = NULL; @@ -525,5 +525,5 @@ #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,6 +630,6 @@ } -psBool psMetadataIteratorSet(psMetadataIterator* iterator, - int location) +bool psMetadataIteratorSet(psMetadataIterator* iterator, + int location) { int match; Index: trunk/psLib/src/collections/psMetadata.h =================================================================== --- trunk/psLib/src/collections/psMetadata.h (revision 4316) +++ trunk/psLib/src/collections/psMetadata.h (revision 4321) @@ -11,6 +11,6 @@ * @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,5 +214,5 @@ 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,5 +257,5 @@ * @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,9 +270,9 @@ * @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,9 +286,9 @@ * @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,5 +300,5 @@ * @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,5 +312,5 @@ * @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,5 +324,5 @@ * @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,5 +348,5 @@ * @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,8 +438,8 @@ * @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,5 +453,5 @@ */ 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,6 +466,6 @@ */ 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,6 +480,6 @@ */ 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,6 +494,6 @@ */ 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,6 +508,6 @@ */ 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,6 +522,6 @@ */ 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,5 +560,5 @@ * @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 Index: trunk/psLib/src/collections/psPixels.c =================================================================== --- trunk/psLib/src/collections/psPixels.c (revision 4316) +++ trunk/psLib/src/collections/psPixels.c (revision 4321) @@ -7,6 +7,6 @@ * @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,7 +114,7 @@ } -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,8 +122,8 @@ } - 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; Index: trunk/psLib/src/collections/psPixels.h =================================================================== --- trunk/psLib/src/collections/psPixels.h (revision 4316) +++ trunk/psLib/src/collections/psPixels.h (revision 4321) @@ -7,6 +7,6 @@ * @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,5 +85,5 @@ psPixels* psPixelsCopy( psPixels* out, ///< psPixels struct to recycle, or NULL - const psPixels* in ///< psPixels struct to copy + const psPixels* pixels ///< psPixels struct to copy );