Index: trunk/psLib/src/image/psImageErrors.dat =================================================================== --- trunk/psLib/src/image/psImageErrors.dat (revision 1863) +++ trunk/psLib/src/image/psImageErrors.dat (revision 1864) @@ -11,5 +11,5 @@ psImage_NOT_AN_IMAGE The input psImage must have a PS_DIMEN_IMAGE dimension type. psImage_IMAGE_NULL Can not operate on a NULL psImage. -psImage_IMAGE_TYPE_UNSUPPORTED Specified psImage type (%s) is not supported. +psImage_IMAGE_TYPE_UNSUPPORTED Specified psImage type, %s, is not supported. psImage_INTERPOLATE_METHOD_INVALID Specified interpolation method (%d) is not supported. psImage_SUBSET_RANGE_INVALID Specified subset range, [%d:%d,%d:%d], lies outside psImage's boundaries, [0:%d,0:%d]. @@ -62,4 +62,8 @@ psImageManip_SCALE_NOT_POSITIVE Specified scale value, %d, must be a positive value. psImageManip_INTERPOLATION_MODE_UNSUPPORTED Specified interpolation mode, %d, is unsupported. -psImageConvolve_SHIFT_NULL Specified shift vectors can not be NULL. -psImageConvolve_SHIFT_TYPE_MISMATCH The X-shift vector type, %s, does not match the Y-shift vector type, %s. Types must match. +psImageConvolve_SHIFT_NULL Specified shift vectors can not be NULL. +psImageConvolve_KERNEL_NULL Specified psKernel can not be NULL. +psImageConvolve_SHIFT_TYPE_MISMATCH Input t-, x-, and y-shift vector types (%s/%s/%s) must match. +psImageConvolve_FFT_FAILED Failed to perform a fourier transform of input image. +psImageConvolve_KERNEL_FFT_FAILED Failed to perform a fourier transform of kernel. +psImageConvolve_KERNEL_TOO_LARGE Specified psKernel size, %dx%d, can not be larger than input psImage size, %dx%d. Index: trunk/psLib/src/image/psImageErrors.h =================================================================== --- trunk/psLib/src/image/psImageErrors.h (revision 1863) +++ trunk/psLib/src/image/psImageErrors.h (revision 1864) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-21 22:30:19 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-09-23 18:31:49 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,5 +33,5 @@ #define PS_ERRORTEXT_psImage_NOT_AN_IMAGE "The input psImage must have a PS_DIMEN_IMAGE dimension type." #define PS_ERRORTEXT_psImage_IMAGE_NULL "Can not operate on a NULL psImage." -#define PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED "Specified psImage type (%s) is not supported." +#define PS_ERRORTEXT_psImage_IMAGE_TYPE_UNSUPPORTED "Specified psImage type, %s, is not supported." #define PS_ERRORTEXT_psImage_INTERPOLATE_METHOD_INVALID "Specified interpolation method (%d) is not supported." #define PS_ERRORTEXT_psImage_SUBSET_RANGE_INVALID "Specified subset range, [%d:%d,%d:%d], lies outside psImage's boundaries, [0:%d,0:%d]." @@ -82,5 +82,9 @@ #define PS_ERRORTEXT_psImageManip_INTERPOLATION_MODE_UNSUPPORTED "Specified interpolation mode, %d, is unsupported." #define PS_ERRORTEXT_psImageConvolve_SHIFT_NULL "Specified shift vectors can not be NULL." -#define PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH "The X-shift vector type, %s, does not match the Y-shift vector type, %s. Types must match." +#define PS_ERRORTEXT_psImageConvolve_KERNEL_NULL "Specified psKernel can not be NULL." +#define PS_ERRORTEXT_psImageConvolve_SHIFT_TYPE_MISMATCH "Input t-, x-, and y-shift vector types (%s/%s/%s) must match." +#define PS_ERRORTEXT_psImageConvolve_FFT_FAILED "Failed to perform a fourier transform of input image." +#define PS_ERRORTEXT_psImageConvolve_KERNEL_FFT_FAILED "Failed to perform a fourier transform of kernel." +#define PS_ERRORTEXT_psImageConvolve_KERNEL_TOO_LARGE "Specified psKernel size, %dx%d, can not be larger than input psImage size, %dx%d. " //~End Index: trunk/psLib/src/image/psImageExtraction.c =================================================================== --- trunk/psLib/src/image/psImageExtraction.c (revision 1863) +++ trunk/psLib/src/image/psImageExtraction.c (revision 1864) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-09-21 22:30:19 $ +* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-09-23 18:31:49 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -100,5 +100,6 @@ } -psImage* psImageSubsection(psImage* image, const char* section) +psImage* psImageSubsection(psImage* image, + const char* section) { int x1; @@ -606,2 +607,31 @@ return out; } + +psVector* psImageCut(psVector* out, + psVector* coords, + const psImage* input, + const psImage* restrict mask, + unsigned int maskVal, + float startCol, + float startRow, + float endCol, + float endRow, + float nSamples, + psImageInterpolateMode mode) +{ + + return NULL; +} + +psVector* psImageRadialCut(psVector* out, + const psImage* input, + const psImage* restrict mask, + unsigned int maskVal, + float centerCol, + float centerRow, + const psVector* radii, + const psStats* stats) +{ + + return NULL; +} Index: trunk/psLib/src/image/psImageExtraction.h =================================================================== --- trunk/psLib/src/image/psImageExtraction.h (revision 1863) +++ trunk/psLib/src/image/psImageExtraction.h (revision 1864) @@ -10,6 +10,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-25 00:04:01 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-09-23 18:31:49 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -145,4 +145,5 @@ psVector* psImageCut( psVector* out, ///< psVector to recycle, or NULL. + psVector* coords, ///< if not NULL, the calculated coordinates along the slice (output) const psImage* input, ///< the input image in which to perform the cut const psImage* restrict mask, ///< the mask for the input image. @@ -152,6 +153,6 @@ float endCol, ///< the column of the end of the cut line float endRow, ///< the row of the end of the cut line - float width, ///< the distance about the line to perform the statistics - const psStats* stats ///< the statistic to perform in operation + float nSamples, ///< the number of samples along the cut + psImageInterpolateMode mode ///< the interpolation method to use ); Index: trunk/psLib/src/image/psImageFFT.c =================================================================== --- trunk/psLib/src/image/psImageFFT.c (revision 1863) +++ trunk/psLib/src/image/psImageFFT.c (revision 1864) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-09-21 22:30:19 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-09-23 18:31:49 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -24,5 +24,5 @@ #include "psImageErrors.h" -#define P_FFTW_PLAN_RIGOR FFTW_ESTIMATE +#define PS_FFTW_PLAN_RIGOR FFTW_ESTIMATE static bool p_fftwWisdomImported = false; @@ -90,5 +90,5 @@ plan = fftwf_plan_dft_2d(numCols, numRows, (fftwf_complex *) out->data.C32[0], - (fftwf_complex *) out->data.C32[0], direction, P_FFTW_PLAN_RIGOR); + (fftwf_complex *) out->data.C32[0], direction, PS_FFTW_PLAN_RIGOR); /* check if a plan exists now -- if not, it is a real problem */ @@ -422,6 +422,6 @@ for (unsigned int col = 0; col < numCols; col++) { - real = crealf(inRow[col]); - imag = cimagf(inRow[col]); + real = creal(inRow[col]); + imag = cimag(inRow[col]); outRow[col] = real * real + imag * imag / numElementsSquared; }