Changeset 14866 for trunk/psLib/src/imageops/psImageConvolve.h

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.

File:

• trunk/psLib/src/imageops/psImageConvolve.h (modified) (4 diffs)

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
+    );