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