Changeset 32725 for trunk/psLib/src/imageops/psImageConvolve.c

Timestamp:

Nov 20, 2011, 3:55:38 PM (14 years ago)

Author:

eugene

Message:

create a pre-alloc version of image smooth to avoid excessive allocs

File:

• trunk/psLib/src/imageops/psImageConvolve.c (modified) (10 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -569 +569 @@
 // 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 +587 @@
     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 +603 @@
 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 +613 @@
   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 +767 @@
 }
 
-// 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 +917 @@
         }
     }
-       
-    psFree(resultX);
-    psFree(resultY);
-    psFree(gaussnorm);
-
     return true;
 }
@@ -973 +1004 @@
 
     // Generate normalized gaussian
+    psVector *gaussNorm = NULL;
     IMAGE_SMOOTH_GAUSS(gaussNorm, size, sigma, F32);
 
@@ -1098 +1130 @@
 
     // Generate normalized gaussian
+    psVector *gaussNorm = NULL;
     IMAGE_SMOOTH_GAUSS(gaussNorm, size, sigma, F32);
     const psF32 *gauss = &gaussNorm->data.F32[size]; // Gaussian convolution kernel
@@ -1309 +1342 @@
 
     // Generate normalized gaussian
+    psVector *gaussNorm = NULL;
     IMAGE_SMOOTH_GAUSS(gaussNorm, size, sigma, F32);
 
@@ -1445 +1479 @@
 
     /* generate normalized gaussian */
+    psVector *gaussnorm = NULL;
     IMAGE_SMOOTH_GAUSS(gaussnorm, Nrange, sigma, F32);
     psF32 *gauss = &gaussnorm->data.F32[Nrange];