Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 4315) +++ /trunk/psLib/pslib.kdevses (revision 4316) @@ -2,8 +2,17 @@ - - - + + + + + + + + + + + + Index: /trunk/psLib/src/collections/psList.c =================================================================== --- /trunk/psLib/src/collections/psList.c (revision 4315) +++ /trunk/psLib/src/collections/psList.c (revision 4316) @@ -6,6 +6,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:01 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -149,5 +149,5 @@ } -psListIterator* psListIteratorAlloc(psList* list, int location, bool mutable) +psListIterator* psListIteratorAlloc(psList* list, long location, bool mutable) { psListIterator* iter = psAlloc(sizeof(psListIterator)); @@ -181,6 +181,6 @@ } -psBool psListIteratorSet(psListIterator* iterator, - int location) +bool psListIteratorSet(psListIterator* iterator, + int location) { if (iterator == NULL) { @@ -247,5 +247,5 @@ } -psBool psListAdd(psList* list, psS32 location, psPtr data) +bool psListAdd(psList* list, long location, psPtr data) { @@ -433,6 +433,6 @@ } -psBool psListRemove(psList* list, - psS32 location) +bool psListRemove(psList* list, + long location) { if (list == NULL) { @@ -451,6 +451,6 @@ } -psBool psListRemoveData(psList* list, - psPtr data) +bool psListRemoveData(psList* list, + psPtr data) { if (list == NULL) { @@ -485,5 +485,5 @@ } -psPtr psListGet(psList* list, psS32 location) +psPtr psListGet(psList* list, long location) { if (list == NULL) { @@ -564,5 +564,5 @@ * Convert a psList to/from a psVoidPtrArray */ -psArray* psListToArray(psList* restrict list) +psArray* psListToArray(const psList* restrict list) { psListElem* ptr; Index: /trunk/psLib/src/collections/psList.h =================================================================== --- /trunk/psLib/src/collections/psList.h (revision 4315) +++ /trunk/psLib/src/collections/psList.h (revision 4316) @@ -7,6 +7,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -99,5 +99,5 @@ psListIterator* psListIteratorAlloc( psList* list, ///< the psList to iterate with - int location, ///< the initial starting point. + long location, ///< the initial starting point. ///< This can be a numeric index, PS_LIST_HEAD, or PS_LIST_TAIL. bool mutable ///< Is it permissible to modify list? @@ -109,5 +109,5 @@ * @return psBool TRUE if iterator successfully set, otherwise FALSE. */ -psBool psListIteratorSet( +bool psListIteratorSet( psListIterator* iterator, ///< list iterator int location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL @@ -118,7 +118,7 @@ * @return psBool TRUE if item was successfully added, otherwise FALSE. */ -psBool psListAdd( +bool psListAdd( psList* list, ///< list to add item to - psS32 location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. + long location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. psPtr data ///< data item to add. If NULL, list is not modified. ); @@ -128,6 +128,6 @@ * @return psBool TRUE if item was successfully added, otherwise FALSE. */ -psBool psListAddAfter( - psListIterator* list, ///< list position to add item to +bool psListAddAfter( + psListIterator* iterator, ///< list position to add item to psPtr data ///< data item to add. If NULL, list is not modified. ); @@ -137,6 +137,6 @@ * @return psBool TRUE if item was successfully added, otherwise FALSE. */ -psBool psListAddBefore( - psListIterator* list, ///< list position to add item to +bool psListAddBefore( + psListIterator* iterator, ///< list position to add item to psPtr data ///< data item to add. If NULL, list is not modified. ); @@ -146,7 +146,7 @@ * @return psBool TRUE if element is successfully removed, otherwise FALSE. */ -psBool psListRemove( +bool psListRemove( psList* list, ///< list to remove element from - psS32 location ///< index of item + long location ///< index of item ); @@ -155,5 +155,5 @@ * @return psBool TRUE if element is successfully removed, otherwise FALSE. */ -psBool psListRemoveData( +bool psListRemoveData( psList* list, ///< list to remove element from psPtr data ///< data item to find and remove @@ -169,5 +169,5 @@ psPtr psListGet( psList* list, ///< list to retrieve element from - psS32 location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL + long location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL ); @@ -196,5 +196,5 @@ */ psArray* psListToArray( - psList* dlist ///< List to convert + const psList* list ///< List to convert ); Index: /trunk/psLib/src/fft/psImageFFT.c =================================================================== --- /trunk/psLib/src/fft/psImageFFT.c (revision 4315) +++ /trunk/psLib/src/fft/psImageFFT.c (revision 4316) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 21:17:45 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ static psBool p_fftwWisdomImported = false; -psImage* psImageFFT(psImage* out, const psImage* in, psFFTFlags direction) +psImage* psImageFFT(psImage* out, const psImage* image, psFFTFlags direction) { psU32 numCols; @@ -35,5 +35,5 @@ /* got good image data? */ - if (in == NULL) { + if (image == NULL) { psFree(out); return NULL; @@ -60,5 +60,5 @@ } - type = in->type.type; + type = image->type.type; /* make sure the system-level wisdom information is imported. */ @@ -68,6 +68,6 @@ } - numRows = in->numRows; - numCols = in->numCols; + numRows = image->numRows; + numCols = image->numCols; // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place. @@ -75,5 +75,5 @@ fftwf_complex* outBuffer = fftwf_malloc(numRows*numCols*sizeof(fftwf_complex)); - p_psImageCopyToRawBuffer(outBuffer, in, PS_TYPE_C32); + p_psImageCopyToRawBuffer(outBuffer, image, PS_TYPE_C32); plan = fftwf_plan_dft_2d(numRows, numCols, Index: /trunk/psLib/src/fft/psImageFFT.h =================================================================== --- /trunk/psLib/src/fft/psImageFFT.h (revision 4315) +++ /trunk/psLib/src/fft/psImageFFT.h (revision 4316) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -33,5 +33,5 @@ psImage* psImageFFT( psImage* out, ///< a psImage to recycle. If NULL, a new psImage is made. - const psImage* in, ///< the psImage to apply transform to + const psImage* image, ///< the psImage to apply transform to psFFTFlags direction ///< the direction of the transform ); Index: /trunk/psLib/src/image/psImage.c =================================================================== --- /trunk/psLib/src/image/psImage.c (revision 4315) +++ /trunk/psLib/src/image/psImage.c (revision 4316) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -329,5 +329,5 @@ -psS32 psImageFreeChildren(psImage* image) +int psImageFreeChildren(psImage* image) { psS32 numFreed = 0; Index: /trunk/psLib/src/image/psImage.h =================================================================== --- /trunk/psLib/src/image/psImage.h (revision 4315) +++ /trunk/psLib/src/image/psImage.h (revision 4316) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -166,5 +166,5 @@ * */ -psS32 psImageFreeChildren( +int psImageFreeChildren( psImage* image ///< psImage in which all children shall be deallocated ); Index: /trunk/psLib/src/image/psImageConvolve.c =================================================================== --- /trunk/psLib/src/image/psImageConvolve.c (revision 4315) +++ /trunk/psLib/src/image/psImageConvolve.c (revision 4316) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ static void freeKernel(psKernel* ptr); -psKernel* psKernelAlloc(psS32 xMin, psS32 xMax, psS32 yMin, psS32 yMax) +psKernel* psKernelAlloc(int xMin, int xMax, int yMin, int yMax) { psKernel* result; @@ -90,5 +90,5 @@ const psVector* xShifts, const psVector* yShifts, - psBool relative) + bool relative) { psS32 lastX; Index: /trunk/psLib/src/image/psImageConvolve.h =================================================================== --- /trunk/psLib/src/image/psImageConvolve.h (revision 4315) +++ /trunk/psLib/src/image/psImageConvolve.h (revision 4316) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -71,8 +71,8 @@ */ psKernel* psKernelAlloc( - psS32 xMin, ///< Most negative x index - psS32 xMax, ///< Most positive x index - psS32 yMin, ///< Most negative y index - psS32 yMax ///< Most positive y index + int xMin, ///< Most negative x index + int xMax, ///< Most positive x index + int yMin, ///< Most negative y index + int yMax ///< Most positive y index ); @@ -97,5 +97,5 @@ const psVector* xShifts, ///< list of x-axis shifts const psVector* yShifts, ///< list of y-axis shifts - psBool relative + bool relative /**< specifies the starting point for the shifts; true=relative to previous shift * false = relative to some other starting point. */ Index: /trunk/psLib/src/image/psImageFFT.c =================================================================== --- /trunk/psLib/src/image/psImageFFT.c (revision 4315) +++ /trunk/psLib/src/image/psImageFFT.c (revision 4316) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 21:17:45 $ + * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ static psBool p_fftwWisdomImported = false; -psImage* psImageFFT(psImage* out, const psImage* in, psFFTFlags direction) +psImage* psImageFFT(psImage* out, const psImage* image, psFFTFlags direction) { psU32 numCols; @@ -35,5 +35,5 @@ /* got good image data? */ - if (in == NULL) { + if (image == NULL) { psFree(out); return NULL; @@ -60,5 +60,5 @@ } - type = in->type.type; + type = image->type.type; /* make sure the system-level wisdom information is imported. */ @@ -68,6 +68,6 @@ } - numRows = in->numRows; - numCols = in->numCols; + numRows = image->numRows; + numCols = image->numCols; // n.b. FFTW can perform a in-place transform at the same rate or faster than out-of-place. @@ -75,5 +75,5 @@ fftwf_complex* outBuffer = fftwf_malloc(numRows*numCols*sizeof(fftwf_complex)); - p_psImageCopyToRawBuffer(outBuffer, in, PS_TYPE_C32); + p_psImageCopyToRawBuffer(outBuffer, image, PS_TYPE_C32); plan = fftwf_plan_dft_2d(numRows, numCols, Index: /trunk/psLib/src/image/psImageFFT.h =================================================================== --- /trunk/psLib/src/image/psImageFFT.h (revision 4315) +++ /trunk/psLib/src/image/psImageFFT.h (revision 4316) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-08 23:40:45 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -33,5 +33,5 @@ psImage* psImageFFT( psImage* out, ///< a psImage to recycle. If NULL, a new psImage is made. - const psImage* in, ///< the psImage to apply transform to + const psImage* image, ///< the psImage to apply transform to psFFTFlags direction ///< the direction of the transform ); Index: /trunk/psLib/src/image/psImageGeomManip.c =================================================================== --- /trunk/psLib/src/image/psImageGeomManip.c (revision 4315) +++ /trunk/psLib/src/image/psImageGeomManip.c (revision 4316) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 23:44:21 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -174,5 +174,5 @@ psImage* psImageResample(psImage* out, const psImage* in, - psS32 scale, + int scale, psImageInterpolateMode mode) { @@ -251,7 +251,7 @@ psImage* psImageRoll(psImage* out, - const psImage* in, - psS32 dx, - psS32 dy) + const psImage* input, + int dx, + int dy) { psS32 outRows; @@ -259,5 +259,5 @@ psS32 elementSize; - if (in == NULL) { + if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psImage_IMAGE_NULL); @@ -267,8 +267,8 @@ // create an output image of the same size // and type - outRows = in->numRows; - outCols = in->numCols; - elementSize = PSELEMTYPE_SIZEOF(in->type.type); - out = psImageRecycle(out, outCols, outRows, in->type.type); + outRows = input->numRows; + outCols = input->numCols; + elementSize = PSELEMTYPE_SIZEOF(input->type.type); + out = psImageRecycle(out, outCols, outRows, input->type.type); // make dx and dy between 0 and outCols or @@ -292,5 +292,5 @@ inRowNumber -= outRows; } - psU8* inRow = in->data.U8[inRowNumber]; // use byte arithmetic for all types + psU8* inRow = input->data.U8[inRowNumber]; // use byte arithmetic for all types psU8* outRow = out->data.U8[row]; Index: /trunk/psLib/src/image/psImageGeomManip.h =================================================================== --- /trunk/psLib/src/image/psImageGeomManip.h (revision 4315) +++ /trunk/psLib/src/image/psImageGeomManip.h (revision 4316) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-16 22:07:41 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -57,5 +57,5 @@ psImage* out, ///< an psImage to recycle. If NULL, a new image is created const psImage* in, ///< input image - psS32 scale, ///< resample scaling factor + int scale, ///< resample scaling factor psImageInterpolateMode mode ///< the interpolation mode used in resampling ); @@ -111,7 +111,7 @@ psImage* psImageRoll( psImage* out, ///< an psImage to recycle. If NULL, a new image is created - const psImage* in, ///< input image - psS32 dx, ///< number of pixels to roll in the x-dimension - psS32 dy ///< number of pixels to roll in the y-dimension + const psImage* input, ///< input image + int dx, ///< number of pixels to roll in the x-dimension + int dy ///< number of pixels to roll in the y-dimension ); @@ -151,5 +151,5 @@ const psRegion region, ///< the size of the transformed image const psPixels* pixels, /**< if not NULL, consists of psPixelCoords and specifies which pixels in - * output image shall be transformed; otherwise, entire image generated*/ + * output image shall be transformed; otherwise, entire image generated*/ psImageInterpolateMode mode, ///< the interpolation scheme to be used int exposedValue ///< Exposed value to which non-corresponding pixels are set Index: /trunk/psLib/src/imageops/psImageConvolve.c =================================================================== --- /trunk/psLib/src/imageops/psImageConvolve.c (revision 4315) +++ /trunk/psLib/src/imageops/psImageConvolve.c (revision 4316) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ static void freeKernel(psKernel* ptr); -psKernel* psKernelAlloc(psS32 xMin, psS32 xMax, psS32 yMin, psS32 yMax) +psKernel* psKernelAlloc(int xMin, int xMax, int yMin, int yMax) { psKernel* result; @@ -90,5 +90,5 @@ const psVector* xShifts, const psVector* yShifts, - psBool relative) + bool relative) { psS32 lastX; Index: /trunk/psLib/src/imageops/psImageConvolve.h =================================================================== --- /trunk/psLib/src/imageops/psImageConvolve.h (revision 4315) +++ /trunk/psLib/src/imageops/psImageConvolve.h (revision 4316) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -71,8 +71,8 @@ */ psKernel* psKernelAlloc( - psS32 xMin, ///< Most negative x index - psS32 xMax, ///< Most positive x index - psS32 yMin, ///< Most negative y index - psS32 yMax ///< Most positive y index + int xMin, ///< Most negative x index + int xMax, ///< Most positive x index + int yMin, ///< Most negative y index + int yMax ///< Most positive y index ); @@ -97,5 +97,5 @@ const psVector* xShifts, ///< list of x-axis shifts const psVector* yShifts, ///< list of y-axis shifts - psBool relative + bool relative /**< specifies the starting point for the shifts; true=relative to previous shift * false = relative to some other starting point. */ Index: /trunk/psLib/src/imageops/psImageGeomManip.c =================================================================== --- /trunk/psLib/src/imageops/psImageGeomManip.c (revision 4315) +++ /trunk/psLib/src/imageops/psImageGeomManip.c (revision 4316) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-17 23:44:21 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -174,5 +174,5 @@ psImage* psImageResample(psImage* out, const psImage* in, - psS32 scale, + int scale, psImageInterpolateMode mode) { @@ -251,7 +251,7 @@ psImage* psImageRoll(psImage* out, - const psImage* in, - psS32 dx, - psS32 dy) + const psImage* input, + int dx, + int dy) { psS32 outRows; @@ -259,5 +259,5 @@ psS32 elementSize; - if (in == NULL) { + if (input == NULL) { psError(PS_ERR_BAD_PARAMETER_NULL, true, PS_ERRORTEXT_psImage_IMAGE_NULL); @@ -267,8 +267,8 @@ // create an output image of the same size // and type - outRows = in->numRows; - outCols = in->numCols; - elementSize = PSELEMTYPE_SIZEOF(in->type.type); - out = psImageRecycle(out, outCols, outRows, in->type.type); + outRows = input->numRows; + outCols = input->numCols; + elementSize = PSELEMTYPE_SIZEOF(input->type.type); + out = psImageRecycle(out, outCols, outRows, input->type.type); // make dx and dy between 0 and outCols or @@ -292,5 +292,5 @@ inRowNumber -= outRows; } - psU8* inRow = in->data.U8[inRowNumber]; // use byte arithmetic for all types + psU8* inRow = input->data.U8[inRowNumber]; // use byte arithmetic for all types psU8* outRow = out->data.U8[row]; Index: /trunk/psLib/src/imageops/psImageGeomManip.h =================================================================== --- /trunk/psLib/src/imageops/psImageGeomManip.h (revision 4315) +++ /trunk/psLib/src/imageops/psImageGeomManip.h (revision 4316) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-16 22:07:41 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -57,5 +57,5 @@ psImage* out, ///< an psImage to recycle. If NULL, a new image is created const psImage* in, ///< input image - psS32 scale, ///< resample scaling factor + int scale, ///< resample scaling factor psImageInterpolateMode mode ///< the interpolation mode used in resampling ); @@ -111,7 +111,7 @@ psImage* psImageRoll( psImage* out, ///< an psImage to recycle. If NULL, a new image is created - const psImage* in, ///< input image - psS32 dx, ///< number of pixels to roll in the x-dimension - psS32 dy ///< number of pixels to roll in the y-dimension + const psImage* input, ///< input image + int dx, ///< number of pixels to roll in the x-dimension + int dy ///< number of pixels to roll in the y-dimension ); @@ -151,5 +151,5 @@ const psRegion region, ///< the size of the transformed image const psPixels* pixels, /**< if not NULL, consists of psPixelCoords and specifies which pixels in - * output image shall be transformed; otherwise, entire image generated*/ + * output image shall be transformed; otherwise, entire image generated*/ psImageInterpolateMode mode, ///< the interpolation scheme to be used int exposedValue ///< Exposed value to which non-corresponding pixels are set Index: /trunk/psLib/src/mathtypes/psImage.c =================================================================== --- /trunk/psLib/src/mathtypes/psImage.c (revision 4315) +++ /trunk/psLib/src/mathtypes/psImage.c (revision 4316) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.69 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -329,5 +329,5 @@ -psS32 psImageFreeChildren(psImage* image) +int psImageFreeChildren(psImage* image) { psS32 numFreed = 0; Index: /trunk/psLib/src/mathtypes/psImage.h =================================================================== --- /trunk/psLib/src/mathtypes/psImage.h (revision 4315) +++ /trunk/psLib/src/mathtypes/psImage.h (revision 4316) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.56 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 02:30:49 $ + * @version $Revision: 1.57 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -166,5 +166,5 @@ * */ -psS32 psImageFreeChildren( +int psImageFreeChildren( psImage* image ///< psImage in which all children shall be deallocated ); Index: /trunk/psLib/src/sys/psLogMsg.c =================================================================== --- /trunk/psLib/src/sys/psLogMsg.c (revision 4315) +++ /trunk/psLib/src/sys/psLogMsg.c (revision 4316) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 06:13:14 $ + * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -363,10 +363,10 @@ NULL *****************************************************************************/ -void psLogMsg(const char *name, psS32 level, const char *fmt, ...) +void psLogMsg(const char *name, int level, const char *format, ...) { va_list ap; - va_start(ap, fmt); - psLogMsgV(name, level, fmt, ap); + va_start(ap, format); + psLogMsgV(name, level, format, ap); va_end(ap); } Index: /trunk/psLib/src/sys/psLogMsg.h =================================================================== --- /trunk/psLib/src/sys/psLogMsg.h (revision 4315) +++ /trunk/psLib/src/sys/psLogMsg.h (revision 4316) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 06:12:31 $ + * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,6 +67,6 @@ void psLogMsg( const char *name, ///< name of the log source - psS32 myLevel, ///< severity level of this log message - const char *fmt, ///< printf-style format command + int level, ///< severity level of this log message + const char *format, ///< printf-style format command ... ); Index: /trunk/psLib/src/sysUtils/psLogMsg.c =================================================================== --- /trunk/psLib/src/sysUtils/psLogMsg.c (revision 4315) +++ /trunk/psLib/src/sysUtils/psLogMsg.c (revision 4316) @@ -12,6 +12,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.44 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 06:13:14 $ + * @version $Revision: 1.45 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -363,10 +363,10 @@ NULL *****************************************************************************/ -void psLogMsg(const char *name, psS32 level, const char *fmt, ...) +void psLogMsg(const char *name, int level, const char *format, ...) { va_list ap; - va_start(ap, fmt); - psLogMsgV(name, level, fmt, ap); + va_start(ap, format); + psLogMsgV(name, level, format, ap); va_end(ap); } Index: /trunk/psLib/src/sysUtils/psLogMsg.h =================================================================== --- /trunk/psLib/src/sysUtils/psLogMsg.h (revision 4315) +++ /trunk/psLib/src/sysUtils/psLogMsg.h (revision 4316) @@ -11,6 +11,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-09 06:12:31 $ + * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -67,6 +67,6 @@ void psLogMsg( const char *name, ///< name of the log source - psS32 myLevel, ///< severity level of this log message - const char *fmt, ///< printf-style format command + int level, ///< severity level of this log message + const char *format, ///< printf-style format command ... ); Index: /trunk/psLib/src/types/psList.c =================================================================== --- /trunk/psLib/src/types/psList.c (revision 4315) +++ /trunk/psLib/src/types/psList.c (revision 4316) @@ -6,6 +6,6 @@ * @author Robert Daniel DeSonia, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:01 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -149,5 +149,5 @@ } -psListIterator* psListIteratorAlloc(psList* list, int location, bool mutable) +psListIterator* psListIteratorAlloc(psList* list, long location, bool mutable) { psListIterator* iter = psAlloc(sizeof(psListIterator)); @@ -181,6 +181,6 @@ } -psBool psListIteratorSet(psListIterator* iterator, - int location) +bool psListIteratorSet(psListIterator* iterator, + int location) { if (iterator == NULL) { @@ -247,5 +247,5 @@ } -psBool psListAdd(psList* list, psS32 location, psPtr data) +bool psListAdd(psList* list, long location, psPtr data) { @@ -433,6 +433,6 @@ } -psBool psListRemove(psList* list, - psS32 location) +bool psListRemove(psList* list, + long location) { if (list == NULL) { @@ -451,6 +451,6 @@ } -psBool psListRemoveData(psList* list, - psPtr data) +bool psListRemoveData(psList* list, + psPtr data) { if (list == NULL) { @@ -485,5 +485,5 @@ } -psPtr psListGet(psList* list, psS32 location) +psPtr psListGet(psList* list, long location) { if (list == NULL) { @@ -564,5 +564,5 @@ * Convert a psList to/from a psVoidPtrArray */ -psArray* psListToArray(psList* restrict list) +psArray* psListToArray(const psList* restrict list) { psListElem* ptr; Index: /trunk/psLib/src/types/psList.h =================================================================== --- /trunk/psLib/src/types/psList.h (revision 4315) +++ /trunk/psLib/src/types/psList.h (revision 4316) @@ -7,6 +7,6 @@ * @ingroup LinkedList * - * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-18 00:53:32 $ + * @version $Revision: 1.26 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-18 03:13:02 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -99,5 +99,5 @@ psListIterator* psListIteratorAlloc( psList* list, ///< the psList to iterate with - int location, ///< the initial starting point. + long location, ///< the initial starting point. ///< This can be a numeric index, PS_LIST_HEAD, or PS_LIST_TAIL. bool mutable ///< Is it permissible to modify list? @@ -109,5 +109,5 @@ * @return psBool TRUE if iterator successfully set, otherwise FALSE. */ -psBool psListIteratorSet( +bool psListIteratorSet( psListIterator* iterator, ///< list iterator int location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL @@ -118,7 +118,7 @@ * @return psBool TRUE if item was successfully added, otherwise FALSE. */ -psBool psListAdd( +bool psListAdd( psList* list, ///< list to add item to - psS32 location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. + long location, ///< index, PS_LIST_HEAD, PS_LIST_TAIL, or numbered location. psPtr data ///< data item to add. If NULL, list is not modified. ); @@ -128,6 +128,6 @@ * @return psBool TRUE if item was successfully added, otherwise FALSE. */ -psBool psListAddAfter( - psListIterator* list, ///< list position to add item to +bool psListAddAfter( + psListIterator* iterator, ///< list position to add item to psPtr data ///< data item to add. If NULL, list is not modified. ); @@ -137,6 +137,6 @@ * @return psBool TRUE if item was successfully added, otherwise FALSE. */ -psBool psListAddBefore( - psListIterator* list, ///< list position to add item to +bool psListAddBefore( + psListIterator* iterator, ///< list position to add item to psPtr data ///< data item to add. If NULL, list is not modified. ); @@ -146,7 +146,7 @@ * @return psBool TRUE if element is successfully removed, otherwise FALSE. */ -psBool psListRemove( +bool psListRemove( psList* list, ///< list to remove element from - psS32 location ///< index of item + long location ///< index of item ); @@ -155,5 +155,5 @@ * @return psBool TRUE if element is successfully removed, otherwise FALSE. */ -psBool psListRemoveData( +bool psListRemoveData( psList* list, ///< list to remove element from psPtr data ///< data item to find and remove @@ -169,5 +169,5 @@ psPtr psListGet( psList* list, ///< list to retrieve element from - psS32 location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL + long location ///< index number, PS_LIST_HEAD, or PS_LIST_TAIL ); @@ -196,5 +196,5 @@ */ psArray* psListToArray( - psList* dlist ///< List to convert + const psList* list ///< List to convert );