Changeset 14866

Timestamp:

Sep 17, 2007, 10:49:51 AM (19 years ago)

Author:

Paul Price

Message:

Adding mask to psImageConvolveFFT, so that masked pixels may be set to the nominated value. This is especially important in removing NaNs in the image being convolved.

Location:

trunk/psLib

Files:

• src/imageops/psImageConvolve.c (modified) (3 diffs)
• src/imageops/psImageConvolve.h (modified) (4 diffs)
• test/imageops/convolutionBench.c (modified) (1 diff)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2007-08-30 20:15:23 $
+/// @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2007-09-17 20:49:51 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -363 +363 @@
 
 psImage *psImageConvolveFFT(const psImage *in,
+                            const psImage *mask,
+                            psMaskType maskVal,
                             const psKernel *kernel,
                             float pad)
@@ -393 +395 @@
     // Generate padded image
     psImage *paddedImage = psImageAlloc(paddedCols,paddedRows,in->type.type); // Padded input image
-    psImageOverlaySection(paddedImage, in, 0, 0, "=");
+    if (mask && maskVal) {
+        for (int y = 0; y < numRows; y++) {
+            for (int x = 0; x < numCols; x++) {
+                paddedImage->data.F32[y][x] = (mask->data.PS_TYPE_MASK_DATA[y][x] & maskVal) ? pad :
+                    in->data.F32[y][x];
+            }
+        }
+    } else {
+        psImageOverlaySection(paddedImage, in, 0, 0, "=");
+    }
     for (int y = 0; y < numRows; y++) {
         for (int x = numCols; x < paddedCols; x++) {

trunk/psLib/src/imageops/psImageConvolve.h

@@ -5 +5 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-09-05 23:52:11 $
+ * @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-09-17 20:49:51 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -136 +136 @@
 ///
 psImage *psImageConvolveDirect(
-    psImage *out,                       ///< return output to here
-    const psImage *in,                  ///< the psImage to convolve
+    psImage *out,                       ///< Output image, or NULL
+    const psImage *in,                  ///< Image to convolve
     const psKernel *kernel              ///< kernel to colvolve with
 );
@@ -146 +146 @@
 /// are suitably padded to avoid wrap-around effects.
 psImage *psImageConvolveFFT(
-    const psImage *in,                  ///< the psImage to convolve
+    const psImage *in,                  ///< Image to convolve
+    const psImage *mask,                ///< Corresponding mask
+    psMaskType maskVal,                 ///< Value to mask
     const psKernel *kernel,             ///< kernel to colvolve with
     float pad                           ///< Value to use to pad the input image
@@ -155 +157 @@
 /// Returns a mask, grown by the supplied kernel.  Only those pixels specified by the maskVal are grown; the
 /// rest are simply propagated.
-psImage *psImageConvolveMask(const psImage *mask, psMaskType maskVal, const psKernel *kernel);
+psImage *psImageConvolveMask(const psImage *mask, ///< Mask to convolve
+                             psMaskType maskVal, ///< Mask value to convolve
+                             const psKernel *kernel ///< Kernel by which to convolve
+    );
 
 

trunk/psLib/test/imageops/convolutionBench.c

@@ -47 +47 @@
             psKernel *kernel = generateKernel(kernelCols, kernelRows);
             psTimerStart("fft");
-            psImage *convolved = psImageConvolveFFT(image, kernel, 0.0);
+            psImage *convolved = psImageConvolveFFT(image, NULL, 0, kernel, 0.0);
             fft += psTimerMark("fft");
             psFree(convolved);