Changeset 14332

Timestamp:

Jul 20, 2007, 10:12:44 AM (19 years ago)

Author:

magnier

Message:

adding output target to psImageConvolveDirect API

Location:

trunk

Files:

• psLib/src/imageops/psImageConvolve.c (modified) (5 diffs)
• psLib/src/imageops/psImageConvolve.h (modified) (2 diffs)
• psLib/test/imageops/convolutionBench.c (modified) (1 diff)
• psLib/test/imageops/tap_psImageConvolve2.c (modified) (1 diff)
• psModules/src/detrend/pmShifts.c (modified) (2 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.52 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-05-11 16:48:31 $
+/// @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-07-20 20:12:31 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -200 +200 @@
 }
 
-psImage *psImageConvolveDirect(const psImage *in,
+psImage *psImageConvolveDirect(psImage *out, 
+                               const psImage *in,
                                const psKernel *kernel)
 {
@@ -222 +223 @@
     int numCols = in->numCols;          // Number of columns
 
-    psImage *out;                       // Image to be returned
-
 #if 1
 
@@ -231 +230 @@
     case PS_TYPE_##TYPE: { \
         ps##TYPE **inData = in->data.TYPE; /* Dereference input data */ \
-        out = psImageAlloc(numCols, numRows, PS_TYPE_##TYPE); \
+        out = psImageRecycle(out, numCols, numRows, PS_TYPE_##TYPE); \
         for (int row = 0; row < numRows; row++) { \
             ps##TYPE *outRow = out->data.TYPE[row]; \
@@ -253 +252 @@
     case PS_TYPE_##TYPE: { \
         ps##TYPE **inData = in->data.TYPE; /* Dereference input data */ \
-        out = psImageAlloc(numCols, numRows, PS_TYPE_##TYPE); \
+        out = psImageRecycle(out, numCols, numRows, PS_TYPE_##TYPE); \
         psImageInit(out, 0.0); \
         for (int ky = yMin; ky <= yMax; ky++) { \

trunk/psLib/src/imageops/psImageConvolve.h

@@ -5 +5 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-04-05 03:02:21 $
+ * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-07-20 20:12:31 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -112 +112 @@
 ///
 psImage *psImageConvolveDirect(
+    psImage *out,                       ///< return output to here
     const psImage *in,                  ///< the psImage to convolve
     const psKernel *kernel              ///< kernel to colvolve with

trunk/psLib/test/imageops/convolutionBench.c

@@ -35 +35 @@
             psKernel *kernel = generateKernel(kernelCols, kernelRows);
             psTimerStart("direct");
-            psImage *convolved = psImageConvolveDirect(image, kernel);
+            psImage *convolved = psImageConvolveDirect(NULL, image, kernel);
             direct += psTimerMark("direct");
             psFree(convolved);

trunk/psLib/test/imageops/tap_psImageConvolve2.c

@@ -71 +71 @@
         psKernel *kernel = generateKernel();
 
-        psImage *convolved = psImageConvolveDirect(image, kernel);
+        psImage *convolved = psImageConvolveDirect(NULL, image, kernel);
         ok(convolved, "convolution result");
         skip_start(!convolved, 3, "convolution failed");

trunk/psModules/src/detrend/pmShifts.c

@@ -441 +441 @@
 #if 1
         // Always do direct convolution (no fuss with edge effects)
-        psImage *convolved = psImageConvolveDirect(detrend->image, kernel);
+        psImage *convolved = psImageConvolveDirect(NULL, detrend->image, kernel);
 #else
         // Kernel size-dependent convolution --- if it's big, use the FFT
@@ -448 +448 @@
         psImage *convolved;
         if (xSize * ySize < FFT_SIZE * FFT_SIZE) {
-            convolved = psImageConvolveDirect(detrend->image, kernel);
+            convolved = psImageConvolveDirect(NULL, detrend->image, kernel);
         } else {
             // This is a little dodgy --- making choices about parameters without the user's input