Changeset 21074 for branches/eam_branch_20081230/psLib/src/imageops/psImageConvolve.h

Timestamp:

Dec 30, 2008, 10:40:00 AM (18 years ago)

Author:

eugene

Message:

upgrades to the masking concepts: added psImageMaskType & psVectorMaskType and associated macros; replaced psMaskType where appropriate (see src/mask.notes.txt)

File:

• branches/eam_branch_20081230/psLib/src/imageops/psImageConvolve.h (modified) (7 diffs)

branches/eam_branch_20081230/psLib/src/imageops/psImageConvolve.h

@@ -5 +5 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-11-26 00:43:12 $
+ * @version $Revision: 1.38.6.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-12-30 20:39:59 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -148 +148 @@
 psImage *psImageConvolveMask(psImage *out, ///< Output image, or NULL
                              const psImage *mask, ///< Mask to convolve
-                             psMaskType maskVal, ///< Mask value to convolve
-                             psMaskType setVal, ///< Mask value to set; 0 to propagate maskVal
+                             psImageMaskType maskVal, ///< Mask value to convolve
+                             psImageMaskType setVal, ///< Mask value to set; 0 to propagate maskVal
                              int xMin, int xMax, int yMin, int yMax ///< Convolution bounds
     );
@@ -160 +160 @@
 psImage *psImageConvolveMaskDirect(psImage *out, ///< Output image, or NULL
                                    const psImage *mask, ///< Mask to convolve
-                                   psMaskType maskVal, ///< Mask value to convolve
-                                   psMaskType setVal, ///< Mask value to set; 0 to propagate maskVal
+                                   psImageMaskType maskVal, ///< Mask value to convolve
+                                   psImageMaskType setVal, ///< Mask value to set; 0 to propagate maskVal
                                    int xMin, int xMax, int yMin, int yMax ///< Convolution bounds
     );
@@ -174 +174 @@
 psImage *psImageConvolveMaskFFT(psImage *out, ///< Output image, or NULL
                                 const psImage *mask, ///< Mask to convolve
-                                psMaskType maskVal, ///< Mask value to convolve
-                                psMaskType setVal, ///< Mask value to set; 0 to use maskVal
+                                psImageMaskType maskVal, ///< Mask value to convolve
+                                psImageMaskType setVal, ///< Mask value to set; 0 to use maskVal
                                 int xMin, int xMax, int yMin, int yMax, ///< Convolution bounds
                                 float thresh ///< Threshold (0..1) for convolved floating-point image
@@ -201 +201 @@
     const psImage *image,               ///< Input image (F32 or F64)
     const psImage *mask,                ///< Mask image
-    psMaskType maskVal,                 ///< Mask value
+    psImageMaskType maskVal,            ///< Mask value
     float sigma,                        ///< Width of the smoothing kernel (pixels)
     float numSigma,                     ///< Size of the smoothing box (sigma)
@@ -211 +211 @@
                                     const psImage *image,
                                     const psImage *mask,
-                                    psMaskType maskVal,
+                                    psImageMaskType maskVal,
                                     float sigma,
                                     float numSigma,
@@ -219 +219 @@
     psImage *image,                    ///< the image to be smoothed
     psImage *mask,                     ///< optional mask
-    psMaskType maskVal,
+    psImageMaskType maskVal,            ///< masked bits
     double  sigma,                     ///< the width of the smoothing kernel in pixels
     double  Nsigma                     ///< the size of the smoothing box in sigmas