Index: trunk/psLib/src/imageops/psImageInterpolate.h
===================================================================
--- trunk/psLib/src/imageops/psImageInterpolate.h	(revision 20327)
+++ trunk/psLib/src/imageops/psImageInterpolate.h	(revision 21183)
@@ -7,6 +7,6 @@
  * @author Paul Price, Institute for Astronomy
  *
- * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-10-22 19:21:06 $
+ * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-01-27 06:39:37 $
  * Copyright 2004-2007 Institute for Astronomy, University of Hawaii
  */
@@ -50,9 +50,9 @@
     const psImage *variance;            ///< Variance image for interpolation
     const psImage *mask;                ///< Mask image for interpolation
-    psMaskType maskVal;                 ///< Value to mask
+    psImageMaskType maskVal;		///< Value to mask
     double badImage;                    ///< Image value if x,y location is not good
     double badVariance;                 ///< Variance value if x,y location is not good
-    psMaskType badMask;                 ///< Mask value to give bad pixels
-    psMaskType poorMask;                ///< Mask value to give poor pixels
+    psImageMaskType badMask;		///< Mask value to give bad pixels
+    psImageMaskType poorMask;		///< Mask value to give poor pixels
     float poorFrac;                     ///< Fraction of flux in bad pixels before output is marked bad
     bool shifting;                      ///< Shifting images? Don't interpolate if the shift is exact.
@@ -69,9 +69,9 @@
     const psImage *variance,            // Variance image
     const psImage *mask,                // Mask image
-    psMaskType maskVal,                 // Value to mask
+    psImageMaskType maskVal,                 // Value to mask
     double badImage,                    // Value for image if bad
     double badVariance,                 // Value for variance if bad
-    psMaskType badMask,                 // Mask value for bad pixels
-    psMaskType poorMask,                // Mask value for poor pixels
+    psImageMaskType badMask,                 // Mask value for bad pixels
+    psImageMaskType poorMask,                // Mask value for poor pixels
     float poorFrac,                     // Fraction of flux for question
     int numKernels                      // Number of interpolation kernels to pre-calculate
@@ -83,5 +83,5 @@
     double *imageValue,                 ///< Return value for image
     double *varianceValue,              ///< Return value for variance
-    psMaskType *maskValue,              ///< Return value for mask
+    psImageMaskType *maskValue,              ///< Return value for mask
     float x, float y,                   ///< Location to which to interpolate
     const psImageInterpolation *options ///< Options