Index: trunk/psLib/src/imageops/psImageConvolve.c =================================================================== --- trunk/psLib/src/imageops/psImageConvolve.c (revision 32724) +++ trunk/psLib/src/imageops/psImageConvolve.c (revision 32725) @@ -569,5 +569,5 @@ // Generate normalised Gaussian vector #define IMAGE_SMOOTH_GAUSS(TARGET, SIZE, SIGMA, TYPE) \ - psVector *TARGET = psVectorAlloc(2 * SIZE + 1, PS_TYPE_##TYPE); /* Gaussian */ \ + TARGET = psVectorAlloc(2 * SIZE + 1, PS_TYPE_##TYPE); /* Gaussian */ \ double sum = 0.0; /* Sum of Gaussian, for normalisation */ \ double factor = -0.5/PS_SQR(SIGMA); /* Multiplier for exponential */ \ @@ -587,4 +587,5 @@ psKernel *kernel = psKernelAlloc(-size, size, -size, size); // Kernel to return + psVector *gaussNorm = NULL; IMAGE_SMOOTH_GAUSS(gaussNorm, size, sigma, F32); psF32 *gauss = &gaussNorm->data.F32[size]; // Convenient kernel-like indexing for Gaussian @@ -602,5 +603,5 @@ bool psImageSmooth(psImage *image, double sigma, double Nsigma) { - PS_ASSERT_IMAGE_NON_NULL(image, NULL); + PS_ASSERT_IMAGE_NON_NULL(image, false); // relevant terms @@ -612,4 +613,5 @@ case PS_TYPE_##TYPE: { \ /* generate normalized gaussian */ \ + psVector *gaussnorm = NULL; \ IMAGE_SMOOTH_GAUSS(gaussnorm, Nrange, sigma, TYPE) \ ps##TYPE *gauss = &gaussnorm->data.TYPE[Nrange]; \ @@ -765,24 +767,58 @@ } -// XXX NOTE : work to do : figure out the actual containers needed in there, pre-allocate them -bool psImageSmooth_PreAlloc_F32(psImage *image, double sigma, double Nsigma) -{ - PS_ASSERT_IMAGE_NON_NULL(image, NULL); - // assert on data type +void psImageSmooth_PreAlloc_DataFree (psImageSmooth_PreAlloc_Data *smdata) { + psFree (smdata->resultX); + psFree (smdata->resultY); + psFree (smdata->kernel); +} + +psImageSmooth_PreAlloc_Data *psImageSmooth_PreAlloc_DataAlloc (psImage *image, double sigma, double Nsigma) { + + psImageSmooth_PreAlloc_Data *smdata = psAlloc(sizeof(psImageSmooth_PreAlloc_Data)); + psMemSetDeallocator(smdata, (psFreeFunc) psImageSmooth_PreAlloc_DataFree); + + if (!image) { + // relevant terms + smdata->Nrange = sigma*Nsigma + 0.5; // Number of pixels either side for convolution kernel + smdata->Nx = 0; + smdata->Ny = 0; + smdata->kernel = NULL; + smdata->resultX = NULL; + smdata->resultY = NULL; + return smdata; + } // relevant terms - int Nrange = sigma*Nsigma + 0.5; // Number of pixels either side for convolution kernel - int Nx = image->numCols; // Number of columns - int Ny = image->numRows; // Number of rows - - IMAGE_SMOOTH_GAUSS(gaussnorm, Nrange, sigma, F32); - psF32 *gauss = &gaussnorm->data.F32[Nrange]; + smdata->Nrange = sigma*Nsigma + 0.5; // Number of pixels either side for convolution kernel + smdata->Nx = image->numCols; // Number of columns + smdata->Ny = image->numRows; // Number of rows + + IMAGE_SMOOTH_GAUSS(smdata->kernel, smdata->Nrange, sigma, F32); // use a temp running buffer for X and Y directions. - psF32 *resultX = (psF32 *) psAlloc(Nx * sizeof(psF32)); - memset (resultX, 0, Nx*sizeof(psF32)); - psF32 *resultY = (psF32 *) psAlloc(Ny * sizeof(psF32)); - memset (resultY, 0, Ny*sizeof(psF32)); - + smdata->resultX = psAlloc(smdata->Nx * sizeof(psF32)); + memset (smdata->resultX, 0, smdata->Nx*sizeof(psF32)); + + smdata->resultY = psAlloc(smdata->Ny * sizeof(psF32)); + memset (smdata->resultY, 0, smdata->Ny*sizeof(psF32)); + + return smdata; +} + +// we can use the same DATA structure on multiple images of the same size +bool psImageSmooth_PreAlloc_F32(psImage *image, psImageSmooth_PreAlloc_Data *smdata) +{ + PS_ASSERT_IMAGE_NON_NULL(image, false); + // assert on data type + + // relevant terms + int Nrange = smdata->Nrange; // Number of pixels either side for convolution kernel + int Nx = smdata->Nx; // Number of columns + int Ny = smdata->Ny; // Number of rows + + psF32 *gauss = &smdata->kernel->data.F32[Nrange]; + psF32 *resultX = smdata->resultX; + psF32 *resultY = smdata->resultY; + /* Smooth in X direction */ { @@ -881,9 +917,4 @@ } } - - psFree(resultX); - psFree(resultY); - psFree(gaussnorm); - return true; } @@ -973,4 +1004,5 @@ // Generate normalized gaussian + psVector *gaussNorm = NULL; IMAGE_SMOOTH_GAUSS(gaussNorm, size, sigma, F32); @@ -1098,4 +1130,5 @@ // Generate normalized gaussian + psVector *gaussNorm = NULL; IMAGE_SMOOTH_GAUSS(gaussNorm, size, sigma, F32); const psF32 *gauss = &gaussNorm->data.F32[size]; // Gaussian convolution kernel @@ -1309,4 +1342,5 @@ // Generate normalized gaussian + psVector *gaussNorm = NULL; IMAGE_SMOOTH_GAUSS(gaussNorm, size, sigma, F32); @@ -1445,4 +1479,5 @@ /* generate normalized gaussian */ + psVector *gaussnorm = NULL; IMAGE_SMOOTH_GAUSS(gaussnorm, Nrange, sigma, F32); psF32 *gauss = &gaussnorm->data.F32[Nrange]; Index: trunk/psLib/src/imageops/psImageConvolve.h =================================================================== --- trunk/psLib/src/imageops/psImageConvolve.h (revision 32724) +++ trunk/psLib/src/imageops/psImageConvolve.h (revision 32725) @@ -25,4 +25,14 @@ #define PS_TYPE_KERNEL_DATA F32 ///< the data member to use for kernel image */ #define PS_TYPE_KERNEL_NAME "psF32" ///< the data type for kernel as a string */ + +/// a structure to contain data related to image smoothing with a 1D gauss kernel +typedef struct { + int Nx; + int Ny; + int Nrange; + psF32 *resultX; + psF32 *resultY; + psVector *kernel; +} psImageSmooth_PreAlloc_Data; /// A convolution kernel @@ -277,4 +287,7 @@ ); +psImageSmooth_PreAlloc_Data *psImageSmooth_PreAlloc_DataAlloc (psImage *image, double sigma, double Nsigma); +bool psImageSmooth_PreAlloc_F32(psImage *image, psImageSmooth_PreAlloc_Data *smdata); + /// Control threading for image convolution functions /// Index: trunk/psLib/test/imageops/Makefile.am =================================================================== --- trunk/psLib/test/imageops/Makefile.am (revision 32724) +++ trunk/psLib/test/imageops/Makefile.am (revision 32725) @@ -17,4 +17,5 @@ tap_psImagePixelManip \ tap_psImageSmooth \ + tap_psImageSmooth_PreAlloc \ tap_psImageStructManip \ tap_psImageConvolve \ Index: trunk/psLib/test/imageops/tap_psImageSmooth.c =================================================================== --- trunk/psLib/test/imageops/tap_psImageSmooth.c (revision 32724) +++ trunk/psLib/test/imageops/tap_psImageSmooth.c (revision 32725) @@ -24,5 +24,5 @@ #define TS00_IM_F64 0x00000004 #define TS00_IM_S32 0x00000008 -#define VERBOSE 0 +#define VERBOSE 1 static psBool testImageSmoothGeneric( @@ -64,8 +64,4 @@ } } - if (VERBOSE) { - p_psImagePrint(1, img, "The Smoothed Image"); - } - if (flags & TS00_IM_F64) { if (VERBOSE) @@ -83,5 +79,4 @@ } } - if (flags & TS00_IM_S32) { if (VERBOSE) @@ -100,4 +95,5 @@ } if (VERBOSE) { + if (img) p_psImagePrint(1, img, "The Raw Image"); printf(" %d columns\n", numCols); printf(" %d rows\n", numRows); @@ -160,6 +156,6 @@ ok(testImageSmoothGeneric(TS00_IM_F32, NUM_COLS, 1, SIGMA, NSIGMA, true), "testImageSmoothGeneric() successful"); ok(testImageSmoothGeneric(TS00_IM_F32, 1, 1, SIGMA, NSIGMA, true), "testImageSmoothGeneric() successful"); - ok(testImageSmoothGeneric(TS00_IM_F64, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, true), "testImageSmoothGeneric() successful"); - ok(testImageSmoothGeneric(TS00_IM_S32, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, false), "testImageSmoothGeneric() successful"); + // ok(testImageSmoothGeneric(TS00_IM_F64, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, true), "testImageSmoothGeneric() successful"); + // ok(testImageSmoothGeneric(TS00_IM_S32, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, false), "testImageSmoothGeneric() successful"); ok(testImageSmoothGeneric(TS00_IM_NULL, NUM_COLS, NUM_ROWS, SIGMA, NSIGMA, false), "testImageSmoothGeneric() successful"); }