Index: trunk/psLib/src/imageops/psImageGeomManip.h
===================================================================
--- trunk/psLib/src/imageops/psImageGeomManip.h	(revision 16910)
+++ trunk/psLib/src/imageops/psImageGeomManip.h	(revision 21183)
@@ -6,6 +6,6 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-03-11 00:41:30 $
+ * @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-01-27 06:39:37 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -36,5 +36,5 @@
     const psImage* in,                 ///< input image
     const psImage* mask,               ///< mask for input image.  If NULL, no masking is done.
-    psMaskType maskVal,                ///< the bits to check in mask.
+    psImageMaskType maskVal,		///< the bits to check in mask.
     int scale,                         ///< the scale to rebin for each dimension
     const psStats* stats
@@ -106,8 +106,8 @@
     const psImage* in,                  ///< Input image
     const psImage *inMask,              ///< Input mask, or NULL
-    psMaskType maskVal,                 ///< Value to mask
+    psImageMaskType maskVal,		///< Value to mask
     float dx, float dy,                 ///< Shift to apply
     double exposed,                     ///< Value to give exposed pixels
-    psMaskType blank,                   ///< Mask value for exposed pixels
+    psImageMaskType blank,		///< Mask value for exposed pixels
     psImageInterpolateMode mode         ///< Interpolation mode
     );
@@ -159,5 +159,5 @@
     const psImage *input,              ///< psImage to apply transform to
     const psImage *inputMask,          ///< if not NULL, mask of input psImage
-    psMaskType inputMaskVal,           ///< masking value for inputMask
+    psImageMaskType inputMaskVal,	///< masking value for inputMask
     const psPlaneTransform *outToIn,   ///< the transform to apply
     psRegion region,                   ///< the size of the transformed image