Index: trunk/psLib/src/imageops/psImageConvolve.c =================================================================== --- trunk/psLib/src/imageops/psImageConvolve.c (revision 4898) +++ trunk/psLib/src/imageops/psImageConvolve.c (revision 4920) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.24 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-30 01:14:13 $ + * @version $Revision: 1.25 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-31 02:07:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -488,10 +488,10 @@ void psImageSmooth (psImage *image, - float sigma, - float Nsigma) + double sigma, + double Nsigma) { int Nx, Ny, Npixel, Nrange; - float factor, g, s; + double factor, g, s; psVector *temp; @@ -505,15 +505,15 @@ // generate gaussian - psVector *gaussnorm = psVectorAlloc (Npixel, PS_TYPE_F32); + psVector *gaussnorm = psVectorAlloc (Npixel, PS_TYPE_F64); for (int i = -Nrange; i < Nrange + 1; i++) { - gaussnorm->data.F32[i+Nrange] = exp (factor*i*i); - } - psF32 *gauss = &gaussnorm->data.F32[Nrange]; + gaussnorm->data.F64[i+Nrange] = exp (factor*i*i); + } + psF64 *gauss = &gaussnorm->data.F64[Nrange]; // smooth in X direction - temp = psVectorAlloc (Nx, PS_TYPE_F32); + temp = psVectorAlloc (Nx, PS_TYPE_F64); for (int j = 0; j < Ny; j++) { - psF32 *vi = image->data.F32[j]; - psF32 *vo = temp->data.F32; + psF64 *vi = image->data.F64[j]; + psF64 *vo = temp->data.F64; for (int i = 0; i < Nx; i++) { g = s = 0; @@ -528,13 +528,13 @@ vo[i] = s / g; } - memcpy (image->data.F32[j], temp->data.F32, Nx*sizeof(psF32)); + memcpy (image->data.F64[j], temp->data.F64, Nx*sizeof(psF64)); } psFree (temp); // smooth in Y direction - temp = psVectorAlloc (image->numRows, PS_TYPE_F32); + temp = psVectorAlloc (image->numRows, PS_TYPE_F64); for (int i = 0; i < Nx; i++) { - psF32 *vo = temp->data.F32; - psF32 **vi = image->data.F32; + psF64 *vo = temp->data.F64; + psF64 **vi = image->data.F64; for (int j = 0; j < Ny; j++) { g = s = 0; Index: trunk/psLib/src/imageops/psImageConvolve.h =================================================================== --- trunk/psLib/src/imageops/psImageConvolve.h (revision 4898) +++ trunk/psLib/src/imageops/psImageConvolve.h (revision 4920) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-30 01:14:13 $ + * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-31 02:07:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -144,6 +144,6 @@ void psImageSmooth( psImage *image, ///< the image to be smoothed - float sigma, ///< the width of the smoothing kernel in pixels - float Nsigma ///< the size of the smoothing box in sigmas + double sigma, ///< the width of the smoothing kernel in pixels + double Nsigma ///< the size of the smoothing box in sigmas ); Index: trunk/psLib/src/imageops/psImageGeomManip.c =================================================================== --- trunk/psLib/src/imageops/psImageGeomManip.c (revision 4898) +++ trunk/psLib/src/imageops/psImageGeomManip.c (revision 4920) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-25 20:49:04 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-31 02:07:11 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -305,5 +305,5 @@ const psImage* input, float angle, - complex exposed, + complex double exposed, psImageInterpolateMode mode) { @@ -597,5 +597,5 @@ float dx, float dy, - complex exposed, + complex double exposed, psImageInterpolateMode mode) { Index: trunk/psLib/src/imageops/psImageGeomManip.h =================================================================== --- trunk/psLib/src/imageops/psImageGeomManip.h (revision 4898) +++ trunk/psLib/src/imageops/psImageGeomManip.h (revision 4920) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-07-25 20:49:04 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-31 02:07:11 $ * * 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 double 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 double exposed, ///< the output image pixel values for non-imagery areas psImageInterpolateMode mode ///< the interpolation mode to use ); @@ -151,5 +151,5 @@ 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/psImagePixelManip.c =================================================================== --- trunk/psLib/src/imageops/psImagePixelManip.c (revision 4898) +++ trunk/psLib/src/imageops/psImagePixelManip.c (revision 4920) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-18 21:44:40 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-31 02:07:11 $ * * 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 double min, + complex double vmin, + complex double max, + complex double vmax) { psS32 numClipped = 0; @@ -401,5 +401,5 @@ psRegion *region, bool logical_and, - int maskValue) + psMaskType maskValue) { @@ -428,5 +428,5 @@ psRegion *region, bool logical_and, - int maskValue) + psMaskType maskValue) { @@ -459,5 +459,5 @@ double radius, bool logical_and, - int maskValue) + psMaskType maskValue) { @@ -489,5 +489,5 @@ double radius, bool logical_and, - int maskValue) + psMaskType maskValue) { Index: trunk/psLib/src/imageops/psImagePixelManip.h =================================================================== --- trunk/psLib/src/imageops/psImagePixelManip.h (revision 4898) +++ trunk/psLib/src/imageops/psImagePixelManip.h (revision 4920) @@ -8,6 +8,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-08-18 21:44:40 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-08-31 02:07:11 $ * * 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 double min, ///< the minimum image value allowed + complex double vmin, ///< the value pixels < min are set to + complex double max, ///< the maximum image value allowed + complex double vmax ///< the value pixels > max are set to ); @@ -96,5 +96,5 @@ psRegion *region, ///< the specified region bool logical_and, ///< the logical operation - int maskValue ///< the specified bits + psMaskType maskValue ///< the specified bits ); @@ -108,5 +108,5 @@ psRegion *region, ///< the specified region bool logical_and, ///< the logical operation - int maskValue ///< the specified bits + psMaskType maskValue ///< the specified bits ); @@ -122,5 +122,5 @@ double radius, ///< the radius of the specified circle bool logical_and, ///< the logical operation - int maskValue ///< the specified bits + psMaskType maskValue ///< the specified bits ); @@ -136,5 +136,5 @@ double radius, ///< the radius of the specified circle bool logical_and, ///< the logical operation - int maskValue ///< the specified bits + psMaskType maskValue ///< the specified bits );