Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 4400) +++ /trunk/psLib/pslib.kdevses (revision 4401) @@ -2,12 +2,5 @@ - - - - - - - - + Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 4400) +++ /trunk/psLib/src/astro/psCoord.c (revision 4401) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.77 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:04 $ +* @version $Revision: 1.78 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -288,12 +288,12 @@ *****************************************************************************/ psPlane* psPlaneDistortApply(psPlane* out, - const psPlaneDistort* transform, + const psPlaneDistort* distort, const psPlane* coords, float mag, float color) { - PS_ASSERT_PTR_NON_NULL(transform, NULL); - PS_ASSERT_PTR_NON_NULL(transform->x, NULL); - PS_ASSERT_PTR_NON_NULL(transform->y, NULL); + PS_ASSERT_PTR_NON_NULL(distort, NULL); + PS_ASSERT_PTR_NON_NULL(distort->x, NULL); + PS_ASSERT_PTR_NON_NULL(distort->y, NULL); PS_ASSERT_PTR_NON_NULL(coords, NULL); @@ -302,5 +302,5 @@ } out->x = psDPolynomial4DEval( - transform->x, + distort->x, coords->x, coords->y, @@ -309,5 +309,5 @@ ); out->y = psDPolynomial4DEval( - transform->y, + distort->y, coords->x, coords->y, Index: /trunk/psLib/src/astro/psCoord.h =================================================================== --- /trunk/psLib/src/astro/psCoord.h (revision 4400) +++ /trunk/psLib/src/astro/psCoord.h (revision 4401) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-21 03:01:37 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -221,5 +221,5 @@ psPlane* psPlaneDistortApply( psPlane* out, ///< a psPlane to recycle. If NULL, a new one is generated. - const psPlaneDistort* transform, ///< the transform to apply + const psPlaneDistort* distort, ///< the transform to apply const psPlane* coords, ///< the coordinate to apply the transform above. float mag, ///< third term -- maybe magnitude Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 4400) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 4401) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.77 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:04 $ +* @version $Revision: 1.78 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -288,12 +288,12 @@ *****************************************************************************/ psPlane* psPlaneDistortApply(psPlane* out, - const psPlaneDistort* transform, + const psPlaneDistort* distort, const psPlane* coords, float mag, float color) { - PS_ASSERT_PTR_NON_NULL(transform, NULL); - PS_ASSERT_PTR_NON_NULL(transform->x, NULL); - PS_ASSERT_PTR_NON_NULL(transform->y, NULL); + PS_ASSERT_PTR_NON_NULL(distort, NULL); + PS_ASSERT_PTR_NON_NULL(distort->x, NULL); + PS_ASSERT_PTR_NON_NULL(distort->y, NULL); PS_ASSERT_PTR_NON_NULL(coords, NULL); @@ -302,5 +302,5 @@ } out->x = psDPolynomial4DEval( - transform->x, + distort->x, coords->x, coords->y, @@ -309,5 +309,5 @@ ); out->y = psDPolynomial4DEval( - transform->y, + distort->y, coords->x, coords->y, Index: /trunk/psLib/src/astronomy/psCoord.h =================================================================== --- /trunk/psLib/src/astronomy/psCoord.h (revision 4400) +++ /trunk/psLib/src/astronomy/psCoord.h (revision 4401) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-21 03:01:37 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -221,5 +221,5 @@ psPlane* psPlaneDistortApply( psPlane* out, ///< a psPlane to recycle. If NULL, a new one is generated. - const psPlaneDistort* transform, ///< the transform to apply + const psPlaneDistort* distort, ///< the transform to apply const psPlane* coords, ///< the coordinate to apply the transform above. float mag, ///< third term -- maybe magnitude Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 4400) +++ /trunk/psLib/src/collections/psMetadata.c (revision 4401) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:05 $ +* @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -268,5 +268,5 @@ } -bool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags) +bool psMetadataAddItem(psMetadata *md, const psMetadataItem *item, psS32 location, psS32 flags) { char * key = NULL; @@ -278,15 +278,15 @@ PS_ASSERT_PTR_NON_NULL(md->table,NULL); PS_ASSERT_PTR_NON_NULL(md->list,NULL); - PS_ASSERT_PTR_NON_NULL(metadataItem,NULL); - PS_ASSERT_PTR_NON_NULL(metadataItem->name,NULL); + PS_ASSERT_PTR_NON_NULL(item,NULL); + PS_ASSERT_PTR_NON_NULL(item->name,NULL); mdTable = md->table; mdList = md->list; - key = metadataItem->name; + key = item->name; // See if key is already in table existingEntry = (psMetadataItem*)psHashLookup(mdTable, key); - if (metadataItem->type == PS_META_MULTI) { + if (item->type == PS_META_MULTI) { // the incoming entry is PS_META_MULTI @@ -295,5 +295,5 @@ // add all the items in the incoming entry to metadata - psList* list = metadataItem->data.list; + psList* list = item->data.list; if (list != NULL) { psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true); @@ -317,5 +317,5 @@ // add to the hash's list of duplicate entries - if (! psListAdd(existingEntry->data.list, PS_LIST_TAIL, metadataItem) ) { + if (! psListAdd(existingEntry->data.list, PS_LIST_TAIL, (psPtr)item) ) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); return false; @@ -328,5 +328,5 @@ // treat as if new (added to list below) - if(!psHashAdd(mdTable, key, metadataItem)) { + if(!psHashAdd(mdTable, key, (psPtr)item)) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); return false; @@ -346,5 +346,5 @@ // Node doesn't exist - Add new metadata item to metadata collection's hash - if(!psHashAdd(mdTable, key, metadataItem)) { + if(!psHashAdd(mdTable, key, (psPtr)item)) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); return false; @@ -352,5 +352,5 @@ } - if(!psListAdd(mdList, location, metadataItem)) { + if(!psListAdd(mdList, location, (psPtr)item)) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); return false; @@ -580,5 +580,5 @@ psMetadataLookupNumTYPE(Bool) -psMetadataItem* psMetadataGet(psMetadata *md, psS32 where) +psMetadataItem* psMetadataGet(const psMetadata *md, int location) { psMetadataItem* entry = NULL; @@ -587,7 +587,7 @@ PS_ASSERT_PTR_NON_NULL(md->list,NULL); - entry = (psMetadataItem*) psListGet(md->list, where); + entry = (psMetadataItem*) psListGet(md->list, location); if (entry == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_FIND_INDEX_FAILED, where); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_FIND_INDEX_FAILED, location); return NULL; } Index: /trunk/psLib/src/collections/psMetadata.h =================================================================== --- /trunk/psLib/src/collections/psMetadata.h (revision 4400) +++ /trunk/psLib/src/collections/psMetadata.h (revision 4401) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-24 01:44:18 $ +* @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -215,5 +215,5 @@ const char* name, ///< Name of metadata item. const char* comment, ///< Comment for metadata item. - bool value ///< the value of the metadata item. + bool value ///< the value of the metadata item. ); @@ -260,5 +260,5 @@ bool psMetadataAddItem( psMetadata* md, ///< Metadata collection to insert metadat item. - psMetadataItem* item, ///< Metadata item to be added. + const psMetadataItem* item, ///< Metadata item to be added. psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL psS32 flags ///< Options flag mask, see psMetadataFlags enum @@ -334,5 +334,5 @@ /** Add a psList to metadata collection. - * + * * @return psBool: True for success, False for failure. */ @@ -466,5 +466,5 @@ */ psMetadataItem* psMetadataLookup( - const psMetadata * md, ///< Metadata collection to lookup metadata item. + const psMetadata * md, ///< Metadata collection to lookup metadata item. const char * key ///< Name of metadata key. ); @@ -479,6 +479,6 @@ */ psF64 psMetadataLookupF64( - bool *status, ///< Status of lookup. - const 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. ); @@ -493,6 +493,6 @@ */ psF32 psMetadataLookupF32( - bool *status, ///< Status of lookup. - const 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. ); @@ -507,6 +507,6 @@ */ psS32 psMetadataLookupS32( - bool *status, ///< Status of lookup. - const 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. ); @@ -521,6 +521,6 @@ */ bool psMetadataLookupBool( - bool *status, ///< Status of lookup. - const 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. ); @@ -535,6 +535,6 @@ */ psPtr psMetadataLookupPtr( - bool *status, ///< Status of lookup. - const 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. ); @@ -548,6 +548,6 @@ */ psMetadataItem* psMetadataGet( - psMetadata* md, ///< Metadata collection to retrieve metadata item. - psS32 location ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + const psMetadata* md, ///< Metadata collection to retrieve metadata item. + int location ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL ); @@ -585,5 +585,5 @@ */ psMetadataItem* psMetadataGetAndIncrement( - psMetadataIterator* iterator ///< iterator to move + psMetadataIterator* iterator ///< iterator to move ); @@ -596,5 +596,5 @@ */ psMetadataItem* psMetadataGetAndDecrement( - psMetadataIterator* iterator ///< iterator to move + psMetadataIterator* iterator ///< iterator to move ); Index: /trunk/psLib/src/collections/psMetadataIO.c =================================================================== --- /trunk/psLib/src/collections/psMetadataIO.c (revision 4400) +++ /trunk/psLib/src/collections/psMetadataIO.c (revision 4401) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:05 $ +* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -363,5 +363,5 @@ } -bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* metadataItem) +bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* item) { psMetadataType type; @@ -370,7 +370,7 @@ PS_ASSERT_PTR_NON_NULL(fd, success); PS_ASSERT_PTR_NON_NULL(format, success); - PS_ASSERT_PTR_NON_NULL(metadataItem, success); - - type = metadataItem->type; + PS_ASSERT_PTR_NON_NULL(item, success); + + type = item->type; // determining the format type @@ -391,14 +391,14 @@ switch(type) { \ case PS_META_BOOL: \ - fprintf(fd, format, (FORMAT_TYPE) metadataItem->data.B); \ + fprintf(fd, format, (FORMAT_TYPE) item->data.B); \ break; \ case PS_META_S32: \ - fprintf(fd,format,(FORMAT_TYPE) metadataItem->data.S32); \ + fprintf(fd,format,(FORMAT_TYPE) item->data.S32); \ break; \ case PS_META_F32: \ - fprintf(fd, format,(FORMAT_TYPE) metadataItem->data.F32); \ + fprintf(fd, format,(FORMAT_TYPE) item->data.F32); \ break; \ case PS_META_F64: \ - fprintf(fd, format,(FORMAT_TYPE) metadataItem->data.F64); \ + fprintf(fd, format,(FORMAT_TYPE) item->data.F64); \ break; \ default: \ @@ -433,5 +433,5 @@ case 's': if (type == PS_META_STR) { - fprintf(fd,format,(char*)metadataItem->data.V); + fprintf(fd,format,(char*)item->data.V); } else { psError(PS_ERR_BAD_PARAMETER_TYPE,true, @@ -441,5 +441,5 @@ break; case 'p': - fprintf(fd,format,metadataItem->data.V); + fprintf(fd,format,item->data.V); break; default: @@ -1075,5 +1075,5 @@ } -psMetadata* psMetadataConfigParse(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite) +psMetadata* psMetadataConfigParse(psMetadata* md, int *nFail, const char *fileName, bool overwrite) { FILE* fp = NULL; Index: /trunk/psLib/src/collections/psMetadataIO.h =================================================================== --- /trunk/psLib/src/collections/psMetadataIO.h (revision 4400) +++ /trunk/psLib/src/collections/psMetadataIO.h (revision 4401) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-14 02:54:07 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -56,5 +56,5 @@ FILE * fd, ///< Pointer to file to write metadata item. const char *format, ///< Format to print metadata item. - const psMetadataItem* metadataItem ///< Metadata item to print. + const psMetadataItem* item ///< Metadata item to print. ); @@ -81,7 +81,7 @@ psMetadata* psMetadataConfigParse( psMetadata* md, ///< Resulting metadata from read. - psU32 *nFail, ///< Number of failed lines. + int *nFail, ///< Number of failed lines. const char *fileName, ///< Name of file to read. - psBool overwrite ///< Allow overwrite of duplicate specifications. + bool overwrite ///< Allow overwrite of duplicate specifications. ); Index: /trunk/psLib/src/collections/psPixels.c =================================================================== --- /trunk/psLib/src/collections/psPixels.c (revision 4400) +++ /trunk/psLib/src/collections/psPixels.c (revision 4401) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -55,15 +55,15 @@ } -psPixels* psPixelsAlloc(int size) +psPixels* psPixelsAlloc(psU32 nalloc) { psPixels* out = psAlloc(sizeof(psPixels)); - if (size > 0) { - out->data = psAlloc(sizeof(psPixelCoord)*size); + if (nalloc > 0) { + out->data = psAlloc(sizeof(psPixelCoord)*nalloc); } else { out->data = NULL; } - out->n = size; - out->nalloc = size; + out->n = nalloc; + out->nalloc = nalloc; psMemSetDeallocator(out, (psFreeFunc)pixelsFree); @@ -72,12 +72,12 @@ } -psPixels* psPixelsRealloc(psPixels* pixels, int size) -{ - if (pixels == NULL) { - return psPixelsAlloc(size); - } - - if (size > 0) { - pixels->data = psRealloc(pixels->data, sizeof(psPixelCoord)*size); +psPixels* psPixelsRealloc(psPixels* pixels, psU32 nalloc) +{ + if (pixels == NULL) { + return psPixelsAlloc(nalloc); + } + + if (nalloc > 0) { + pixels->data = psRealloc(pixels->data, sizeof(psPixelCoord)*nalloc); } else { psFree(pixels->data); @@ -85,5 +85,5 @@ } - pixels->nalloc = size; + pixels->nalloc = nalloc; if (pixels->n > pixels->nalloc) { @@ -130,5 +130,5 @@ } -psImage *psPixelsToMask(psImage *out, const psPixels *pixels, const psRegion region, unsigned int maskVal) +psImage *psPixelsToMask(psImage *out, const psPixels *pixels, psRegion region, psMaskType maskVal) { // check that the input pixel vector is valid @@ -197,5 +197,5 @@ } -psPixels* psPixelsFromMask(psPixels* out, const psImage* mask, unsigned int maskVal) +psPixels* psPixelsFromMask(psPixels* out, const psImage* mask, psMaskType maskVal) { if (mask == NULL) { Index: /trunk/psLib/src/collections/psPixels.h =================================================================== --- /trunk/psLib/src/collections/psPixels.h (revision 4400) +++ /trunk/psLib/src/collections/psPixels.h (revision 4401) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:29 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -53,5 +53,5 @@ */ psPixels* psPixelsAlloc( - int size ///< the size of the coordinate vectors + psU32 nalloc ///< the size of the coordinate vectors ); @@ -62,5 +62,5 @@ psPixels* psPixelsRealloc( psPixels* pixels, ///< psPixels to resize, or NULL to create new psPixels - int size ///< the size of the coordinate vectors + psU32 nalloc ///< the size of the coordinate vectors ); @@ -103,6 +103,6 @@ psImage* out, ///< psImage to recycle, or NULL const psPixels* pixels, ///< list of pixels to use - const psRegion region, ///< region to define the output mask image - unsigned int maskVal ///< the mask bit-values to act upon + psRegion region, ///< region to define the output mask image + psMaskType maskVal ///< the mask bit-values to act upon ); @@ -119,5 +119,5 @@ psPixels *out, ///< psPixels to recycle, or NULL const psImage *mask, ///< the input mask psImage - unsigned int maskVal ///< the mask bit-values to act upon + psMaskType maskVal ///< the mask bit-values to act upon ); Index: /trunk/psLib/src/sys/psMemory.c =================================================================== --- /trunk/psLib/src/sys/psMemory.c (revision 4400) +++ /trunk/psLib/src/sys/psMemory.c (revision 4401) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 03:32:42 $ +* @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -342,5 +342,5 @@ ptr->file = file; - ptr->freeFcn = NULL; + ptr->freeFunc = NULL; ptr->persistent = false; *(psU32 *)&ptr->lineno = lineno; @@ -576,6 +576,6 @@ pthread_mutex_unlock(&ptr->refCounterMutex); - if (ptr->freeFcn != NULL) { - ptr->freeFcn(vptr); + if (ptr->freeFunc != NULL) { + ptr->freeFunc(vptr); } @@ -640,5 +640,50 @@ } -void psMemSetDeallocator(psPtr vptr, psFreeFunc freeFcn) +void psMemSetDeallocator(psPtr ptr, psFreeFunc freeFunc) +{ + if (ptr == NULL) { + return; + } + + psMemBlock* PTR = ((psMemBlock* ) ptr) - 1; + + if (checkMemBlock(PTR, __func__) != 0) { + memProblemCallback(PTR, __func__, __LINE__); + } + + PTR->freeFunc = freeFunc; + +} +psFreeFunc psMemGetDeallocator(psPtr ptr) +{ + if (ptr == NULL) { + return NULL; + } + + psMemBlock* PTR = ((psMemBlock* ) ptr) - 1; + + if (checkMemBlock(PTR, __func__) != 0) { + memProblemCallback(PTR, __func__, __LINE__); + } + + return PTR->freeFunc; +} + +bool p_psMemGetPersistent(psPtr vptr) +{ + if (vptr == NULL) { + return NULL; + } + + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; + + if (checkMemBlock(ptr, __func__) != 0) { + memProblemCallback(ptr, __func__, __LINE__); + } + + return ptr->persistent; +} + +void p_psMemSetPersistent(psPtr vptr, bool value) { if (vptr == NULL) { @@ -652,49 +697,4 @@ } - ptr->freeFcn = freeFcn; - -} -psFreeFunc psMemGetDeallocator(psPtr vptr) -{ - if (vptr == NULL) { - return NULL; - } - - psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; - - if (checkMemBlock(ptr, __func__) != 0) { - memProblemCallback(ptr, __func__, __LINE__); - } - - return ptr->freeFcn; -} - -bool p_psMemGetPersistent(psPtr vptr) -{ - if (vptr == NULL) { - return NULL; - } - - psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; - - if (checkMemBlock(ptr, __func__) != 0) { - memProblemCallback(ptr, __func__, __LINE__); - } - - return ptr->persistent; -} - -void p_psMemSetPersistent(psPtr vptr, bool value) -{ - if (vptr == NULL) { - return; - } - - psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; - - if (checkMemBlock(ptr, __func__) != 0) { - memProblemCallback(ptr, __func__, __LINE__); - } - ptr->persistent = value; } Index: /trunk/psLib/src/sys/psMemory.h =================================================================== --- /trunk/psLib/src/sys/psMemory.h (revision 4400) +++ /trunk/psLib/src/sys/psMemory.h (revision 4401) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 03:32:42 $ + * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,12 +67,12 @@ struct psMemBlock* previousBlock; ///< previous block in allocation list struct psMemBlock* nextBlock; ///< next block allocation list - psFreeFunc freeFcn; ///< deallocator. If NULL, use generic deallocation. + psFreeFunc freeFunc; ///< deallocator. If NULL, use generic deallocation. size_t userMemorySize; ///< the size of the user-portion of the memory block - const psMemId id; ///< a unique ID for this allocation + const psMemId id; ///< a unique ID for this allocation const char *file; ///< set from __FILE__ in e.g. p_psAlloc - const psS32 lineno; ///< set from __LINE__ in e.g. p_psAlloc + const psS32 lineno; ///< set from __LINE__ in e.g. p_psAlloc pthread_mutex_t refCounterMutex; ///< mutex to ensure exclusive access to reference counter psReferenceCount refCounter; ///< how many times pointer is referenced - psBool persistent; ///< marks if this non-user persistent data like error stack, etc. + psBool persistent; ///< marks if this non-user persistent data like error stack, etc. const psPtr endblock; ///< initialised to p_psMEMMAGIC } @@ -152,5 +152,5 @@ void psMemSetDeallocator( psPtr ptr, ///< the memory block to operate on - psFreeFunc freeFcn ///< the function to be executed at deallocation + psFreeFunc freeFunc ///< the function to be executed at deallocation ); Index: /trunk/psLib/src/sysUtils/psMemory.c =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.c (revision 4400) +++ /trunk/psLib/src/sysUtils/psMemory.c (revision 4401) @@ -8,6 +8,6 @@ * @author Robert Lupton, Princeton University * -* @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 03:32:42 $ +* @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -342,5 +342,5 @@ ptr->file = file; - ptr->freeFcn = NULL; + ptr->freeFunc = NULL; ptr->persistent = false; *(psU32 *)&ptr->lineno = lineno; @@ -576,6 +576,6 @@ pthread_mutex_unlock(&ptr->refCounterMutex); - if (ptr->freeFcn != NULL) { - ptr->freeFcn(vptr); + if (ptr->freeFunc != NULL) { + ptr->freeFunc(vptr); } @@ -640,5 +640,50 @@ } -void psMemSetDeallocator(psPtr vptr, psFreeFunc freeFcn) +void psMemSetDeallocator(psPtr ptr, psFreeFunc freeFunc) +{ + if (ptr == NULL) { + return; + } + + psMemBlock* PTR = ((psMemBlock* ) ptr) - 1; + + if (checkMemBlock(PTR, __func__) != 0) { + memProblemCallback(PTR, __func__, __LINE__); + } + + PTR->freeFunc = freeFunc; + +} +psFreeFunc psMemGetDeallocator(psPtr ptr) +{ + if (ptr == NULL) { + return NULL; + } + + psMemBlock* PTR = ((psMemBlock* ) ptr) - 1; + + if (checkMemBlock(PTR, __func__) != 0) { + memProblemCallback(PTR, __func__, __LINE__); + } + + return PTR->freeFunc; +} + +bool p_psMemGetPersistent(psPtr vptr) +{ + if (vptr == NULL) { + return NULL; + } + + psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; + + if (checkMemBlock(ptr, __func__) != 0) { + memProblemCallback(ptr, __func__, __LINE__); + } + + return ptr->persistent; +} + +void p_psMemSetPersistent(psPtr vptr, bool value) { if (vptr == NULL) { @@ -652,49 +697,4 @@ } - ptr->freeFcn = freeFcn; - -} -psFreeFunc psMemGetDeallocator(psPtr vptr) -{ - if (vptr == NULL) { - return NULL; - } - - psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; - - if (checkMemBlock(ptr, __func__) != 0) { - memProblemCallback(ptr, __func__, __LINE__); - } - - return ptr->freeFcn; -} - -bool p_psMemGetPersistent(psPtr vptr) -{ - if (vptr == NULL) { - return NULL; - } - - psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; - - if (checkMemBlock(ptr, __func__) != 0) { - memProblemCallback(ptr, __func__, __LINE__); - } - - return ptr->persistent; -} - -void p_psMemSetPersistent(psPtr vptr, bool value) -{ - if (vptr == NULL) { - return; - } - - psMemBlock* ptr = ((psMemBlock* ) vptr) - 1; - - if (checkMemBlock(ptr, __func__) != 0) { - memProblemCallback(ptr, __func__, __LINE__); - } - ptr->persistent = value; } Index: /trunk/psLib/src/sysUtils/psMemory.h =================================================================== --- /trunk/psLib/src/sysUtils/psMemory.h (revision 4400) +++ /trunk/psLib/src/sysUtils/psMemory.h (revision 4401) @@ -12,6 +12,6 @@ * @ingroup MemoryManagement * - * @version $Revision: 1.43 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 03:32:42 $ + * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,12 +67,12 @@ struct psMemBlock* previousBlock; ///< previous block in allocation list struct psMemBlock* nextBlock; ///< next block allocation list - psFreeFunc freeFcn; ///< deallocator. If NULL, use generic deallocation. + psFreeFunc freeFunc; ///< deallocator. If NULL, use generic deallocation. size_t userMemorySize; ///< the size of the user-portion of the memory block - const psMemId id; ///< a unique ID for this allocation + const psMemId id; ///< a unique ID for this allocation const char *file; ///< set from __FILE__ in e.g. p_psAlloc - const psS32 lineno; ///< set from __LINE__ in e.g. p_psAlloc + const psS32 lineno; ///< set from __LINE__ in e.g. p_psAlloc pthread_mutex_t refCounterMutex; ///< mutex to ensure exclusive access to reference counter psReferenceCount refCounter; ///< how many times pointer is referenced - psBool persistent; ///< marks if this non-user persistent data like error stack, etc. + psBool persistent; ///< marks if this non-user persistent data like error stack, etc. const psPtr endblock; ///< initialised to p_psMEMMAGIC } @@ -152,5 +152,5 @@ void psMemSetDeallocator( psPtr ptr, ///< the memory block to operate on - psFreeFunc freeFcn ///< the function to be executed at deallocation + psFreeFunc freeFunc ///< the function to be executed at deallocation ); Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 4400) +++ /trunk/psLib/src/types/psMetadata.c (revision 4401) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:05 $ +* @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -268,5 +268,5 @@ } -bool psMetadataAddItem(psMetadata *md, psMetadataItem *metadataItem, psS32 location, psS32 flags) +bool psMetadataAddItem(psMetadata *md, const psMetadataItem *item, psS32 location, psS32 flags) { char * key = NULL; @@ -278,15 +278,15 @@ PS_ASSERT_PTR_NON_NULL(md->table,NULL); PS_ASSERT_PTR_NON_NULL(md->list,NULL); - PS_ASSERT_PTR_NON_NULL(metadataItem,NULL); - PS_ASSERT_PTR_NON_NULL(metadataItem->name,NULL); + PS_ASSERT_PTR_NON_NULL(item,NULL); + PS_ASSERT_PTR_NON_NULL(item->name,NULL); mdTable = md->table; mdList = md->list; - key = metadataItem->name; + key = item->name; // See if key is already in table existingEntry = (psMetadataItem*)psHashLookup(mdTable, key); - if (metadataItem->type == PS_META_MULTI) { + if (item->type == PS_META_MULTI) { // the incoming entry is PS_META_MULTI @@ -295,5 +295,5 @@ // add all the items in the incoming entry to metadata - psList* list = metadataItem->data.list; + psList* list = item->data.list; if (list != NULL) { psListIterator* iter = psListIteratorAlloc(list,PS_LIST_HEAD,true); @@ -317,5 +317,5 @@ // add to the hash's list of duplicate entries - if (! psListAdd(existingEntry->data.list, PS_LIST_TAIL, metadataItem) ) { + if (! psListAdd(existingEntry->data.list, PS_LIST_TAIL, (psPtr)item) ) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); return false; @@ -328,5 +328,5 @@ // treat as if new (added to list below) - if(!psHashAdd(mdTable, key, metadataItem)) { + if(!psHashAdd(mdTable, key, (psPtr)item)) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); return false; @@ -346,5 +346,5 @@ // Node doesn't exist - Add new metadata item to metadata collection's hash - if(!psHashAdd(mdTable, key, metadataItem)) { + if(!psHashAdd(mdTable, key, (psPtr)item)) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_TABLE_FAILED,key); return false; @@ -352,5 +352,5 @@ } - if(!psListAdd(mdList, location, metadataItem)) { + if(!psListAdd(mdList, location, (psPtr)item)) { psError(PS_ERR_UNKNOWN,false,PS_ERRORTEXT_psMetadata_ADD_COLLECTION_FAILED,key); return false; @@ -580,5 +580,5 @@ psMetadataLookupNumTYPE(Bool) -psMetadataItem* psMetadataGet(psMetadata *md, psS32 where) +psMetadataItem* psMetadataGet(const psMetadata *md, int location) { psMetadataItem* entry = NULL; @@ -587,7 +587,7 @@ PS_ASSERT_PTR_NON_NULL(md->list,NULL); - entry = (psMetadataItem*) psListGet(md->list, where); + entry = (psMetadataItem*) psListGet(md->list, location); if (entry == NULL) { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_FIND_INDEX_FAILED, where); + psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psMetadata_FIND_INDEX_FAILED, location); return NULL; } Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 4400) +++ /trunk/psLib/src/types/psMetadata.h (revision 4401) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-24 01:44:18 $ +* @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -215,5 +215,5 @@ const char* name, ///< Name of metadata item. const char* comment, ///< Comment for metadata item. - bool value ///< the value of the metadata item. + bool value ///< the value of the metadata item. ); @@ -260,5 +260,5 @@ bool psMetadataAddItem( psMetadata* md, ///< Metadata collection to insert metadat item. - psMetadataItem* item, ///< Metadata item to be added. + const psMetadataItem* item, ///< Metadata item to be added. psS32 location, ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL psS32 flags ///< Options flag mask, see psMetadataFlags enum @@ -334,5 +334,5 @@ /** Add a psList to metadata collection. - * + * * @return psBool: True for success, False for failure. */ @@ -466,5 +466,5 @@ */ psMetadataItem* psMetadataLookup( - const psMetadata * md, ///< Metadata collection to lookup metadata item. + const psMetadata * md, ///< Metadata collection to lookup metadata item. const char * key ///< Name of metadata key. ); @@ -479,6 +479,6 @@ */ psF64 psMetadataLookupF64( - bool *status, ///< Status of lookup. - const 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. ); @@ -493,6 +493,6 @@ */ psF32 psMetadataLookupF32( - bool *status, ///< Status of lookup. - const 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. ); @@ -507,6 +507,6 @@ */ psS32 psMetadataLookupS32( - bool *status, ///< Status of lookup. - const 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. ); @@ -521,6 +521,6 @@ */ bool psMetadataLookupBool( - bool *status, ///< Status of lookup. - const 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. ); @@ -535,6 +535,6 @@ */ psPtr psMetadataLookupPtr( - bool *status, ///< Status of lookup. - const 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. ); @@ -548,6 +548,6 @@ */ psMetadataItem* psMetadataGet( - psMetadata* md, ///< Metadata collection to retrieve metadata item. - psS32 location ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL + const psMetadata* md, ///< Metadata collection to retrieve metadata item. + int location ///< Index number, PS_LIST_HEAD, or PS_LIST_TAIL ); @@ -585,5 +585,5 @@ */ psMetadataItem* psMetadataGetAndIncrement( - psMetadataIterator* iterator ///< iterator to move + psMetadataIterator* iterator ///< iterator to move ); @@ -596,5 +596,5 @@ */ psMetadataItem* psMetadataGetAndDecrement( - psMetadataIterator* iterator ///< iterator to move + psMetadataIterator* iterator ///< iterator to move ); Index: /trunk/psLib/src/types/psMetadataConfig.c =================================================================== --- /trunk/psLib/src/types/psMetadataConfig.c (revision 4400) +++ /trunk/psLib/src/types/psMetadataConfig.c (revision 4401) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:05 $ +* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -363,5 +363,5 @@ } -bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* metadataItem) +bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* item) { psMetadataType type; @@ -370,7 +370,7 @@ PS_ASSERT_PTR_NON_NULL(fd, success); PS_ASSERT_PTR_NON_NULL(format, success); - PS_ASSERT_PTR_NON_NULL(metadataItem, success); - - type = metadataItem->type; + PS_ASSERT_PTR_NON_NULL(item, success); + + type = item->type; // determining the format type @@ -391,14 +391,14 @@ switch(type) { \ case PS_META_BOOL: \ - fprintf(fd, format, (FORMAT_TYPE) metadataItem->data.B); \ + fprintf(fd, format, (FORMAT_TYPE) item->data.B); \ break; \ case PS_META_S32: \ - fprintf(fd,format,(FORMAT_TYPE) metadataItem->data.S32); \ + fprintf(fd,format,(FORMAT_TYPE) item->data.S32); \ break; \ case PS_META_F32: \ - fprintf(fd, format,(FORMAT_TYPE) metadataItem->data.F32); \ + fprintf(fd, format,(FORMAT_TYPE) item->data.F32); \ break; \ case PS_META_F64: \ - fprintf(fd, format,(FORMAT_TYPE) metadataItem->data.F64); \ + fprintf(fd, format,(FORMAT_TYPE) item->data.F64); \ break; \ default: \ @@ -433,5 +433,5 @@ case 's': if (type == PS_META_STR) { - fprintf(fd,format,(char*)metadataItem->data.V); + fprintf(fd,format,(char*)item->data.V); } else { psError(PS_ERR_BAD_PARAMETER_TYPE,true, @@ -441,5 +441,5 @@ break; case 'p': - fprintf(fd,format,metadataItem->data.V); + fprintf(fd,format,item->data.V); break; default: @@ -1075,5 +1075,5 @@ } -psMetadata* psMetadataConfigParse(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite) +psMetadata* psMetadataConfigParse(psMetadata* md, int *nFail, const char *fileName, bool overwrite) { FILE* fp = NULL; Index: /trunk/psLib/src/types/psMetadataConfig.h =================================================================== --- /trunk/psLib/src/types/psMetadataConfig.h (revision 4400) +++ /trunk/psLib/src/types/psMetadataConfig.h (revision 4401) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-14 02:54:07 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -56,5 +56,5 @@ FILE * fd, ///< Pointer to file to write metadata item. const char *format, ///< Format to print metadata item. - const psMetadataItem* metadataItem ///< Metadata item to print. + const psMetadataItem* item ///< Metadata item to print. ); @@ -81,7 +81,7 @@ psMetadata* psMetadataConfigParse( psMetadata* md, ///< Resulting metadata from read. - psU32 *nFail, ///< Number of failed lines. + int *nFail, ///< Number of failed lines. const char *fileName, ///< Name of file to read. - psBool overwrite ///< Allow overwrite of duplicate specifications. + bool overwrite ///< Allow overwrite of duplicate specifications. ); Index: /trunk/psLib/src/types/psPixels.c =================================================================== --- /trunk/psLib/src/types/psPixels.c (revision 4400) +++ /trunk/psLib/src/types/psPixels.c (revision 4401) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-25 02:02:05 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -55,15 +55,15 @@ } -psPixels* psPixelsAlloc(int size) +psPixels* psPixelsAlloc(psU32 nalloc) { psPixels* out = psAlloc(sizeof(psPixels)); - if (size > 0) { - out->data = psAlloc(sizeof(psPixelCoord)*size); + if (nalloc > 0) { + out->data = psAlloc(sizeof(psPixelCoord)*nalloc); } else { out->data = NULL; } - out->n = size; - out->nalloc = size; + out->n = nalloc; + out->nalloc = nalloc; psMemSetDeallocator(out, (psFreeFunc)pixelsFree); @@ -72,12 +72,12 @@ } -psPixels* psPixelsRealloc(psPixels* pixels, int size) -{ - if (pixels == NULL) { - return psPixelsAlloc(size); - } - - if (size > 0) { - pixels->data = psRealloc(pixels->data, sizeof(psPixelCoord)*size); +psPixels* psPixelsRealloc(psPixels* pixels, psU32 nalloc) +{ + if (pixels == NULL) { + return psPixelsAlloc(nalloc); + } + + if (nalloc > 0) { + pixels->data = psRealloc(pixels->data, sizeof(psPixelCoord)*nalloc); } else { psFree(pixels->data); @@ -85,5 +85,5 @@ } - pixels->nalloc = size; + pixels->nalloc = nalloc; if (pixels->n > pixels->nalloc) { @@ -130,5 +130,5 @@ } -psImage *psPixelsToMask(psImage *out, const psPixels *pixels, const psRegion region, unsigned int maskVal) +psImage *psPixelsToMask(psImage *out, const psPixels *pixels, psRegion region, psMaskType maskVal) { // check that the input pixel vector is valid @@ -197,5 +197,5 @@ } -psPixels* psPixelsFromMask(psPixels* out, const psImage* mask, unsigned int maskVal) +psPixels* psPixelsFromMask(psPixels* out, const psImage* mask, psMaskType maskVal) { if (mask == NULL) { Index: /trunk/psLib/src/types/psPixels.h =================================================================== --- /trunk/psLib/src/types/psPixels.h (revision 4400) +++ /trunk/psLib/src/types/psPixels.h (revision 4401) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:29 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -53,5 +53,5 @@ */ psPixels* psPixelsAlloc( - int size ///< the size of the coordinate vectors + psU32 nalloc ///< the size of the coordinate vectors ); @@ -62,5 +62,5 @@ psPixels* psPixelsRealloc( psPixels* pixels, ///< psPixels to resize, or NULL to create new psPixels - int size ///< the size of the coordinate vectors + psU32 nalloc ///< the size of the coordinate vectors ); @@ -103,6 +103,6 @@ psImage* out, ///< psImage to recycle, or NULL const psPixels* pixels, ///< list of pixels to use - const psRegion region, ///< region to define the output mask image - unsigned int maskVal ///< the mask bit-values to act upon + psRegion region, ///< region to define the output mask image + psMaskType maskVal ///< the mask bit-values to act upon ); @@ -119,5 +119,5 @@ psPixels *out, ///< psPixels to recycle, or NULL const psImage *mask, ///< the input mask psImage - unsigned int maskVal ///< the mask bit-values to act upon + psMaskType maskVal ///< the mask bit-values to act upon ); Index: /trunk/psLib/src/xml/psXML.c =================================================================== --- /trunk/psLib/src/xml/psXML.c (revision 4400) +++ /trunk/psLib/src/xml/psXML.c (revision 4401) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * -* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-25 02:02:05 $ +* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -363,5 +363,5 @@ } -bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* metadataItem) +bool psMetadataItemPrint(FILE * fd, const char *format, const psMetadataItem* item) { psMetadataType type; @@ -370,7 +370,7 @@ PS_ASSERT_PTR_NON_NULL(fd, success); PS_ASSERT_PTR_NON_NULL(format, success); - PS_ASSERT_PTR_NON_NULL(metadataItem, success); - - type = metadataItem->type; + PS_ASSERT_PTR_NON_NULL(item, success); + + type = item->type; // determining the format type @@ -391,14 +391,14 @@ switch(type) { \ case PS_META_BOOL: \ - fprintf(fd, format, (FORMAT_TYPE) metadataItem->data.B); \ + fprintf(fd, format, (FORMAT_TYPE) item->data.B); \ break; \ case PS_META_S32: \ - fprintf(fd,format,(FORMAT_TYPE) metadataItem->data.S32); \ + fprintf(fd,format,(FORMAT_TYPE) item->data.S32); \ break; \ case PS_META_F32: \ - fprintf(fd, format,(FORMAT_TYPE) metadataItem->data.F32); \ + fprintf(fd, format,(FORMAT_TYPE) item->data.F32); \ break; \ case PS_META_F64: \ - fprintf(fd, format,(FORMAT_TYPE) metadataItem->data.F64); \ + fprintf(fd, format,(FORMAT_TYPE) item->data.F64); \ break; \ default: \ @@ -433,5 +433,5 @@ case 's': if (type == PS_META_STR) { - fprintf(fd,format,(char*)metadataItem->data.V); + fprintf(fd,format,(char*)item->data.V); } else { psError(PS_ERR_BAD_PARAMETER_TYPE,true, @@ -441,5 +441,5 @@ break; case 'p': - fprintf(fd,format,metadataItem->data.V); + fprintf(fd,format,item->data.V); break; default: @@ -1075,5 +1075,5 @@ } -psMetadata* psMetadataConfigParse(psMetadata* md, psU32 *nFail, const char *fileName, psBool overwrite) +psMetadata* psMetadataConfigParse(psMetadata* md, int *nFail, const char *fileName, bool overwrite) { FILE* fp = NULL; Index: /trunk/psLib/src/xml/psXML.h =================================================================== --- /trunk/psLib/src/xml/psXML.h (revision 4400) +++ /trunk/psLib/src/xml/psXML.h (revision 4401) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-14 02:54:07 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-27 20:38:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -56,5 +56,5 @@ FILE * fd, ///< Pointer to file to write metadata item. const char *format, ///< Format to print metadata item. - const psMetadataItem* metadataItem ///< Metadata item to print. + const psMetadataItem* item ///< Metadata item to print. ); @@ -81,7 +81,7 @@ psMetadata* psMetadataConfigParse( psMetadata* md, ///< Resulting metadata from read. - psU32 *nFail, ///< Number of failed lines. + int *nFail, ///< Number of failed lines. const char *fileName, ///< Name of file to read. - psBool overwrite ///< Allow overwrite of duplicate specifications. + bool overwrite ///< Allow overwrite of duplicate specifications. ); Index: /trunk/psLib/test/astronomy/verified/tst_psCoord.stderr =================================================================== --- /trunk/psLib/test/astronomy/verified/tst_psCoord.stderr (revision 4400) +++ /trunk/psLib/test/astronomy/verified/tst_psCoord.stderr (revision 4401) @@ -84,13 +84,13 @@ Following should generate an error message for null psPlaneDistort