Index: trunk/psLib/src/imageops/psImageConvolve.h
===================================================================
--- trunk/psLib/src/imageops/psImageConvolve.h	(revision 20830)
+++ trunk/psLib/src/imageops/psImageConvolve.h	(revision 21183)
@@ -5,6 +5,6 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-11-26 00:43:12 $
+ * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-01-27 06:39:37 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -148,6 +148,6 @@
 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,6 +160,6 @@
 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,6 +174,6 @@
 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,5 +201,5 @@
     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,5 +211,5 @@
                                     const psImage *image,
                                     const psImage *mask,
-                                    psMaskType maskVal,
+                                    psImageMaskType maskVal,
                                     float sigma,
                                     float numSigma,
@@ -219,5 +219,5 @@
     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