Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 4384) +++ /trunk/psLib/pslib.kdevses (revision 4385) @@ -2,8 +2,19 @@ - + + + + + + + + - + + + + + Index: /trunk/psLib/src/dataManip/psMatrix.c =================================================================== --- /trunk/psLib/src/dataManip/psMatrix.c (revision 4384) +++ /trunk/psLib/src/dataManip/psMatrix.c (revision 4385) @@ -21,6 +21,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:29 $ + * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -298,5 +298,5 @@ } -psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, float *det) +psImage* psMatrixInvert(psImage* out, const psImage* in, float *determinant) { psS32 signum = 0; @@ -307,20 +307,20 @@ gsl_permutation *perm = NULL; - #define INVERT_CLEANUP { psFree(outImage); return NULL; } - // Error checks - PS_ASSERT_GENERAL_PTR_NON_NULL(det, INVERT_CLEANUP); - PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, INVERT_CLEANUP); - PS_CHECK_POINTERS(inImage, outImage, INVERT_CLEANUP); - PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, INVERT_CLEANUP); - PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, INVERT_CLEANUP); - - outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type); - - PS_CHECK_SQUARE(inImage, INVERT_CLEANUP); - PS_CHECK_SQUARE(outImage, INVERT_CLEANUP); + #define INVERT_CLEANUP { psFree(out); return NULL; } + // Error checks + PS_ASSERT_GENERAL_PTR_NON_NULL(determinant, INVERT_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, INVERT_CLEANUP); + PS_CHECK_POINTERS(in, out, INVERT_CLEANUP); + PS_CHECK_DIMEN_AND_TYPE(in, PS_DIMEN_IMAGE, INVERT_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(in, INVERT_CLEANUP); + + out = psImageRecycle(out, in->numCols, in->numRows, in->type.type); + + PS_CHECK_SQUARE(in, INVERT_CLEANUP); + PS_CHECK_SQUARE(out, INVERT_CLEANUP); // Initialize data - numRows = inImage->numRows; - numCols = inImage->numCols; + numRows = in->numRows; + numCols = in->numCols; // Initialize GSL data @@ -328,13 +328,13 @@ lu = gsl_matrix_alloc(numRows, numCols); inv = gsl_matrix_alloc(numRows, numCols); - psImageToGslMatrix(lu, inImage); + psImageToGslMatrix(lu, in); // Invert data and calculate determinant gsl_linalg_LU_decomp(lu, perm, &signum); gsl_linalg_LU_invert(lu, perm, inv); - *det = (float)gsl_linalg_LU_det(lu, signum); + *determinant = (float)gsl_linalg_LU_det(lu, signum); // Copy GSL matrix data to psImage data - gslMatrixToPsImage(outImage, inv); + gslMatrixToPsImage(out, inv); // Free GSL structs @@ -343,5 +343,5 @@ gsl_matrix_free(inv); - return outImage; + return out; } Index: /trunk/psLib/src/dataManip/psMatrix.h =================================================================== --- /trunk/psLib/src/dataManip/psMatrix.h (revision 4384) +++ /trunk/psLib/src/dataManip/psMatrix.h (revision 4385) @@ -21,6 +21,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:29 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -74,6 +74,6 @@ */ psImage* psMatrixInvert( - psImage* outImage, ///< Image to return, or NULL for in-place substitution. - const psImage* inImage, ///< Image to be inverted + psImage* out, ///< Image to return, or NULL for in-place substitution. + const psImage* in, ///< Image to be inverted float *det ///< Determinant to return, or NULL ); Index: /trunk/psLib/src/image/psImageGeomManip.c =================================================================== --- /trunk/psLib/src/image/psImageGeomManip.c (revision 4384) +++ /trunk/psLib/src/image/psImageGeomManip.c (revision 4385) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -305,5 +305,5 @@ const psImage* input, float angle, - _Complex exposed, + complex exposed, psImageInterpolateMode mode) { @@ -597,5 +597,5 @@ float dx, float dy, - _Complex exposed, + complex exposed, psImageInterpolateMode mode) { @@ -692,5 +692,5 @@ const psImage *input, const psImage *inputMask, - int inputMaskVal, + psMaskType inputMaskVal, const psPlaneTransform *outToIn, psRegion region, Index: /trunk/psLib/src/image/psImageGeomManip.h =================================================================== --- /trunk/psLib/src/image/psImageGeomManip.h (revision 4384) +++ /trunk/psLib/src/image/psImageGeomManip.h (revision 4385) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -77,5 +77,5 @@ const psImage* input, ///< input image float angle, ///< the rotation angle in radians. - _Complex exposed, ///< the output image pixel values for non-imagery areas + complex exposed, ///< the output image pixel values for non-imagery areas psImageInterpolateMode mode ///< the interpolation mode used ); @@ -97,5 +97,5 @@ float dx, ///< the shift in x direction. float dy, ///< the shift in y direction. - _Complex exposed, ///< the output image pixel values for non-imagery areas + complex exposed, ///< the output image pixel values for non-imagery areas psImageInterpolateMode mode ///< the interpolation mode to use ); @@ -147,9 +147,9 @@ const psImage *input, ///< psImage to apply transform to const psImage *inputMask, ///< if not NULL, mask of input psImage - int inputMaskVal, ///< masking value for inputMask + psMaskType inputMaskVal, ///< masking value for inputMask const psPlaneTransform *outToIn, ///< the transform to apply 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 double exposedValue ///< Exposed value to which non-corresponding pixels are set Index: /trunk/psLib/src/image/psImagePixelExtract.c =================================================================== --- /trunk/psLib/src/image/psImagePixelExtract.c (revision 4384) +++ /trunk/psLib/src/image/psImagePixelExtract.c (revision 4385) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ const psImage* restrict input, const psImage* restrict mask, - psU32 maskVal, + psMaskType maskVal, psRegion region, psImageCutDirection direction, @@ -273,5 +273,5 @@ const psImage* input, const psImage* mask, - psU32 maskVal, + psMaskType maskVal, psRegion region, unsigned int nSamples, @@ -407,5 +407,5 @@ const psImage* input, const psImage* restrict mask, - psU32 maskVal, + psMaskType maskVal, float x, float y, Index: /trunk/psLib/src/image/psImagePixelExtract.h =================================================================== --- /trunk/psLib/src/image/psImagePixelExtract.h (revision 4384) +++ /trunk/psLib/src/image/psImagePixelExtract.h (revision 4385) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-23 03:50:29 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -64,5 +64,5 @@ const psImage* input, ///< the input image in which to perform the slice const psImage* mask, ///< the mask for the input image. - psU32 maskVal, ///< the mask value to apply to the mask + psMaskType maskVal, ///< the mask value to apply to the mask psRegion region, ///< the slice region psImageCutDirection direction, ///< the slice dimension and direction @@ -84,5 +84,5 @@ * psF64. * - * @return psVector resulting vector + * @return psVector* resulting vector */ psVector* psImageCut( @@ -92,5 +92,5 @@ const psImage* input, ///< the input image in which to perform the cut const psImage* mask, ///< the mask for the input image. - psU32 maskVal, ///< the mask value to apply to the mask + psMaskType maskVal, ///< the mask value to apply to the mask psRegion region, ///< the start and end points to cut along unsigned int nSamples, ///< the number of samples along the cut @@ -115,5 +115,5 @@ const psImage* input, ///< the input image in which to perform the cut const psImage* mask, ///< the mask for the input image. - psU32 maskVal, ///< the mask value to apply to the mask + psMaskType maskVal, ///< the mask value to apply to the mask float x, ///< the column of the center of the cut circle float y, ///< the row of the center of the cut circle Index: /trunk/psLib/src/image/psImagePixelManip.c =================================================================== --- /trunk/psLib/src/image/psImagePixelManip.c (revision 4384) +++ /trunk/psLib/src/image/psImagePixelManip.c (revision 4385) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -311,8 +311,8 @@ int psImageClipComplexRegion(psImage* input, - _Complex min, - _Complex vmin, - _Complex max, - _Complex vmax) + complex min, + complex vmin, + complex max, + complex vmax) { psS32 numClipped = 0; Index: /trunk/psLib/src/image/psImagePixelManip.h =================================================================== --- /trunk/psLib/src/image/psImagePixelManip.h (revision 4384) +++ /trunk/psLib/src/image/psImagePixelManip.h (revision 4385) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -51,8 +51,8 @@ int psImageClipComplexRegion( psImage* input, ///< the image to clip - _Complex min, ///< the minimum image value allowed - _Complex vmin, ///< the value pixels < min are set to - _Complex max, ///< the maximum image value allowed - _Complex vmax ///< the value pixels > max are set to + complex min, ///< the minimum image value allowed + complex vmin, ///< the value pixels < min are set to + complex max, ///< the maximum image value allowed + complex vmax ///< the value pixels > max are set to ); Index: /trunk/psLib/src/image/psImageStats.c =================================================================== --- /trunk/psLib/src/image/psImageStats.c (revision 4384) +++ /trunk/psLib/src/image/psImageStats.c (revision 4385) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.74 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 20:26:55 $ + * @version $Revision: 1.75 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -47,5 +47,5 @@ const psImage* in, const psImage* mask, - psS32 maskVal) + psMaskType maskVal) { psVector *junkData = NULL; @@ -122,5 +122,5 @@ const psImage* in, const psImage* mask, - psU32 maskVal) + psMaskType maskVal) { PS_ASSERT_PTR_NON_NULL(out, NULL); Index: /trunk/psLib/src/image/psImageStats.h =================================================================== --- /trunk/psLib/src/image/psImageStats.h (revision 4384) +++ /trunk/psLib/src/image/psImageStats.h (revision 4385) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-14 02:54:15 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -40,5 +40,5 @@ const psImage* in, ///< image (or subimage) to calculate stats const psImage* mask, ///< mask data for image (NULL ok) - psS32 maskVal ///< mask Mask for mask + psMaskType maskVal ///< mask value for mask ); @@ -55,5 +55,5 @@ const psImage* in, ///< Image data to be histogramed. const psImage* mask, ///< mask data for image (NULL ok) - psU32 maskVal ///< mask Mask for mask + psMaskType maskVal ///< mask Mask for mask ); Index: /trunk/psLib/src/imageops/psImageGeomManip.c =================================================================== --- /trunk/psLib/src/imageops/psImageGeomManip.c (revision 4384) +++ /trunk/psLib/src/imageops/psImageGeomManip.c (revision 4385) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -305,5 +305,5 @@ const psImage* input, float angle, - _Complex exposed, + complex exposed, psImageInterpolateMode mode) { @@ -597,5 +597,5 @@ float dx, float dy, - _Complex exposed, + complex exposed, psImageInterpolateMode mode) { @@ -692,5 +692,5 @@ const psImage *input, const psImage *inputMask, - int inputMaskVal, + psMaskType inputMaskVal, const psPlaneTransform *outToIn, psRegion region, Index: /trunk/psLib/src/imageops/psImageGeomManip.h =================================================================== --- /trunk/psLib/src/imageops/psImageGeomManip.h (revision 4384) +++ /trunk/psLib/src/imageops/psImageGeomManip.h (revision 4385) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -77,5 +77,5 @@ const psImage* input, ///< input image float angle, ///< the rotation angle in radians. - _Complex exposed, ///< the output image pixel values for non-imagery areas + complex exposed, ///< the output image pixel values for non-imagery areas psImageInterpolateMode mode ///< the interpolation mode used ); @@ -97,5 +97,5 @@ float dx, ///< the shift in x direction. float dy, ///< the shift in y direction. - _Complex exposed, ///< the output image pixel values for non-imagery areas + complex exposed, ///< the output image pixel values for non-imagery areas psImageInterpolateMode mode ///< the interpolation mode to use ); @@ -147,9 +147,9 @@ const psImage *input, ///< psImage to apply transform to const psImage *inputMask, ///< if not NULL, mask of input psImage - int inputMaskVal, ///< masking value for inputMask + psMaskType inputMaskVal, ///< masking value for inputMask const psPlaneTransform *outToIn, ///< the transform to apply 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 double exposedValue ///< Exposed value to which non-corresponding pixels are set Index: /trunk/psLib/src/imageops/psImagePixelExtract.c =================================================================== --- /trunk/psLib/src/imageops/psImagePixelExtract.c (revision 4384) +++ /trunk/psLib/src/imageops/psImagePixelExtract.c (revision 4385) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -27,5 +27,5 @@ const psImage* restrict input, const psImage* restrict mask, - psU32 maskVal, + psMaskType maskVal, psRegion region, psImageCutDirection direction, @@ -273,5 +273,5 @@ const psImage* input, const psImage* mask, - psU32 maskVal, + psMaskType maskVal, psRegion region, unsigned int nSamples, @@ -407,5 +407,5 @@ const psImage* input, const psImage* restrict mask, - psU32 maskVal, + psMaskType maskVal, float x, float y, Index: /trunk/psLib/src/imageops/psImagePixelExtract.h =================================================================== --- /trunk/psLib/src/imageops/psImagePixelExtract.h (revision 4384) +++ /trunk/psLib/src/imageops/psImagePixelExtract.h (revision 4385) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-23 03:50:29 $ +* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -64,5 +64,5 @@ const psImage* input, ///< the input image in which to perform the slice const psImage* mask, ///< the mask for the input image. - psU32 maskVal, ///< the mask value to apply to the mask + psMaskType maskVal, ///< the mask value to apply to the mask psRegion region, ///< the slice region psImageCutDirection direction, ///< the slice dimension and direction @@ -84,5 +84,5 @@ * psF64. * - * @return psVector resulting vector + * @return psVector* resulting vector */ psVector* psImageCut( @@ -92,5 +92,5 @@ const psImage* input, ///< the input image in which to perform the cut const psImage* mask, ///< the mask for the input image. - psU32 maskVal, ///< the mask value to apply to the mask + psMaskType maskVal, ///< the mask value to apply to the mask psRegion region, ///< the start and end points to cut along unsigned int nSamples, ///< the number of samples along the cut @@ -115,5 +115,5 @@ const psImage* input, ///< the input image in which to perform the cut const psImage* mask, ///< the mask for the input image. - psU32 maskVal, ///< the mask value to apply to the mask + psMaskType maskVal, ///< the mask value to apply to the mask float x, ///< the column of the center of the cut circle float y, ///< the row of the center of the cut circle Index: /trunk/psLib/src/imageops/psImagePixelManip.c =================================================================== --- /trunk/psLib/src/imageops/psImagePixelManip.c (revision 4384) +++ /trunk/psLib/src/imageops/psImagePixelManip.c (revision 4385) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -311,8 +311,8 @@ int psImageClipComplexRegion(psImage* input, - _Complex min, - _Complex vmin, - _Complex max, - _Complex vmax) + complex min, + complex vmin, + complex max, + complex vmax) { psS32 numClipped = 0; Index: /trunk/psLib/src/imageops/psImagePixelManip.h =================================================================== --- /trunk/psLib/src/imageops/psImagePixelManip.h (revision 4384) +++ /trunk/psLib/src/imageops/psImagePixelManip.h (revision 4385) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-23 03:50:29 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -51,8 +51,8 @@ int psImageClipComplexRegion( psImage* input, ///< the image to clip - _Complex min, ///< the minimum image value allowed - _Complex vmin, ///< the value pixels < min are set to - _Complex max, ///< the maximum image value allowed - _Complex vmax ///< the value pixels > max are set to + complex min, ///< the minimum image value allowed + complex vmin, ///< the value pixels < min are set to + complex max, ///< the maximum image value allowed + complex vmax ///< the value pixels > max are set to ); Index: /trunk/psLib/src/imageops/psImageStats.c =================================================================== --- /trunk/psLib/src/imageops/psImageStats.c (revision 4384) +++ /trunk/psLib/src/imageops/psImageStats.c (revision 4385) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.74 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-05-25 20:26:55 $ + * @version $Revision: 1.75 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -47,5 +47,5 @@ const psImage* in, const psImage* mask, - psS32 maskVal) + psMaskType maskVal) { psVector *junkData = NULL; @@ -122,5 +122,5 @@ const psImage* in, const psImage* mask, - psU32 maskVal) + psMaskType maskVal) { PS_ASSERT_PTR_NON_NULL(out, NULL); Index: /trunk/psLib/src/imageops/psImageStats.h =================================================================== --- /trunk/psLib/src/imageops/psImageStats.h (revision 4384) +++ /trunk/psLib/src/imageops/psImageStats.h (revision 4385) @@ -9,6 +9,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.23 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-06-14 02:54:15 $ +* @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -40,5 +40,5 @@ const psImage* in, ///< image (or subimage) to calculate stats const psImage* mask, ///< mask data for image (NULL ok) - psS32 maskVal ///< mask Mask for mask + psMaskType maskVal ///< mask value for mask ); @@ -55,5 +55,5 @@ const psImage* in, ///< Image data to be histogramed. const psImage* mask, ///< mask data for image (NULL ok) - psU32 maskVal ///< mask Mask for mask + psMaskType maskVal ///< mask Mask for mask ); Index: /trunk/psLib/src/math/psMatrix.c =================================================================== --- /trunk/psLib/src/math/psMatrix.c (revision 4384) +++ /trunk/psLib/src/math/psMatrix.c (revision 4385) @@ -21,6 +21,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:29 $ + * @version $Revision: 1.33 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -298,5 +298,5 @@ } -psImage* psMatrixInvert(psImage* outImage, const psImage* inImage, float *det) +psImage* psMatrixInvert(psImage* out, const psImage* in, float *determinant) { psS32 signum = 0; @@ -307,20 +307,20 @@ gsl_permutation *perm = NULL; - #define INVERT_CLEANUP { psFree(outImage); return NULL; } - // Error checks - PS_ASSERT_GENERAL_PTR_NON_NULL(det, INVERT_CLEANUP); - PS_ASSERT_GENERAL_IMAGE_NON_NULL(inImage, INVERT_CLEANUP); - PS_CHECK_POINTERS(inImage, outImage, INVERT_CLEANUP); - PS_CHECK_DIMEN_AND_TYPE(inImage, PS_DIMEN_IMAGE, INVERT_CLEANUP); - PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(inImage, INVERT_CLEANUP); - - outImage = psImageRecycle(outImage, inImage->numCols, inImage->numRows, inImage->type.type); - - PS_CHECK_SQUARE(inImage, INVERT_CLEANUP); - PS_CHECK_SQUARE(outImage, INVERT_CLEANUP); + #define INVERT_CLEANUP { psFree(out); return NULL; } + // Error checks + PS_ASSERT_GENERAL_PTR_NON_NULL(determinant, INVERT_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_NULL(in, INVERT_CLEANUP); + PS_CHECK_POINTERS(in, out, INVERT_CLEANUP); + PS_CHECK_DIMEN_AND_TYPE(in, PS_DIMEN_IMAGE, INVERT_CLEANUP); + PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(in, INVERT_CLEANUP); + + out = psImageRecycle(out, in->numCols, in->numRows, in->type.type); + + PS_CHECK_SQUARE(in, INVERT_CLEANUP); + PS_CHECK_SQUARE(out, INVERT_CLEANUP); // Initialize data - numRows = inImage->numRows; - numCols = inImage->numCols; + numRows = in->numRows; + numCols = in->numCols; // Initialize GSL data @@ -328,13 +328,13 @@ lu = gsl_matrix_alloc(numRows, numCols); inv = gsl_matrix_alloc(numRows, numCols); - psImageToGslMatrix(lu, inImage); + psImageToGslMatrix(lu, in); // Invert data and calculate determinant gsl_linalg_LU_decomp(lu, perm, &signum); gsl_linalg_LU_invert(lu, perm, inv); - *det = (float)gsl_linalg_LU_det(lu, signum); + *determinant = (float)gsl_linalg_LU_det(lu, signum); // Copy GSL matrix data to psImage data - gslMatrixToPsImage(outImage, inv); + gslMatrixToPsImage(out, inv); // Free GSL structs @@ -343,5 +343,5 @@ gsl_matrix_free(inv); - return outImage; + return out; } Index: /trunk/psLib/src/math/psMatrix.h =================================================================== --- /trunk/psLib/src/math/psMatrix.h (revision 4384) +++ /trunk/psLib/src/math/psMatrix.h (revision 4385) @@ -21,6 +21,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-20 22:42:29 $ + * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-25 00:51:28 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -74,6 +74,6 @@ */ psImage* psMatrixInvert( - psImage* outImage, ///< Image to return, or NULL for in-place substitution. - const psImage* inImage, ///< Image to be inverted + psImage* out, ///< Image to return, or NULL for in-place substitution. + const psImage* in, ///< Image to be inverted float *det ///< Determinant to return, or NULL ); Index: /trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr =================================================================== --- /trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr (revision 4384) +++ /trunk/psLib/test/dataManip/verified/tst_psMatrix04.stderr (revision 4385) @@ -1,4 +1,4 @@