Index: trunk/psLib/src/imageops/psImageInterpolate.c
===================================================================
--- trunk/psLib/src/imageops/psImageInterpolate.c	(revision 20758)
+++ trunk/psLib/src/imageops/psImageInterpolate.c	(revision 21183)
@@ -7,6 +7,6 @@
  *  @author Paul Price, IfA
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-11-15 03:09:34 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 06:39:37 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -205,7 +205,7 @@
 psImageInterpolation *psImageInterpolationAlloc(psImageInterpolateMode mode,
                                                 const psImage *image, const psImage *variance,
-                                                const psImage *mask, psMaskType maskVal,
+                                                const psImage *mask, psImageMaskType maskVal,
                                                 double badImage, double badVariance,
-                                                psMaskType badMask, psMaskType poorMask,
+                                                psImageMaskType badMask, psImageMaskType poorMask,
                                                 float poorFrac, int numKernels)
 {
@@ -274,5 +274,5 @@
 // Interpolation engine for flat mode (nearest pixel)
 static inline psImageInterpolateStatus interpolateFlat(double *imageValue, double *varianceValue,
-                                                       psMaskType *maskValue, float x, float y,
+                                                       psImageMaskType *maskValue, float x, float y,
                                                        const psImageInterpolation *interp)
 {
@@ -331,5 +331,5 @@
         if (maskValue) {
             if (interp->mask) {
-                *maskValue = interp->mask->data.PS_TYPE_MASK_DATA[yInt][xInt];
+                *maskValue = interp->mask->data.PS_TYPE_IMAGE_MASK_DATA[yInt][xInt];
             } else {
                 *maskValue = 0;
@@ -456,5 +456,5 @@
 // Interpolation engine for separable interpolation kernels
 static psImageInterpolateStatus interpolateSeparable(double *imageValue, double *varianceValue,
-                                                     psMaskType *maskValue, float x, float y,
+                                                     psImageMaskType *maskValue, float x, float y,
                                                      const psImageInterpolation *interp)
 {
@@ -465,5 +465,5 @@
     const psImage *mask = interp->mask; // Image mask
     const psImage *variance = interp->variance; // Image variance
-    psMaskType maskVal = interp->maskVal; // Value to mask
+    psImageMaskType maskVal = interp->maskVal; // Value to mask
     bool wantVariance = variance && varianceValue; // Does the user want the variance value?
     bool haveMask = mask && maskVal; // Does the user want the variance value?
@@ -582,5 +582,5 @@
                   const ps##TYPE *imageData = &image->data.TYPE[yPix][xMin]; \
                   const ps##TYPE *varianceData = &variance->data.TYPE[yPix][xMin]; \
-                  const psMaskType *maskData = &mask->data.PS_TYPE_MASK_DATA[yPix][xMin]; \
+                  const psImageMaskType *maskData = &mask->data.PS_TYPE_IMAGE_MASK_DATA[yPix][xMin]; \
                   const psF32 *xKernelData = xKernel; \
                   const psF32 *xKernel2Data = xKernel2; \
@@ -642,5 +642,5 @@
               /* Dereferenced versions of inputs */ \
               const ps##TYPE *imageData = &image->data.TYPE[yPix][xMin]; \
-              const psMaskType *maskData = &mask->data.PS_TYPE_MASK_DATA[yPix][xMin]; \
+              const psImageMaskType *maskData = &mask->data.PS_TYPE_IMAGE_MASK_DATA[yPix][xMin]; \
               const psF32 *xKernelData = xKernel; \
               const psF32 *xKernel2Data = xKernel2; \
@@ -713,5 +713,5 @@
 // Interpolation engine for (separable) interpolation kernels
 static psImageInterpolateStatus interpolateKernel(double *imageValue, double *varianceValue,
-                                                  psMaskType *maskValue, float x, float y,
+                                                  psImageMaskType *maskValue, float x, float y,
                                                   const psImageInterpolation *interp)
 {
@@ -722,5 +722,5 @@
     const psImage *mask = interp->mask; // Image mask
     const psImage *variance = interp->variance; // Image variance
-    psMaskType maskVal = interp->maskVal; // Value to mask
+    psImageMaskType maskVal = interp->maskVal; // Value to mask
     bool wantVariance = variance && varianceValue; // Does the user want the variance value?
     bool haveMask = mask && maskVal; // Does the user want the variance value?
@@ -790,5 +790,5 @@
                       float kernelValue = kernel[j][i]; /* Value of kernel */ \
                       float kernelValue2 = PS_SQR(kernelValue); /* Square of kernel */ \
-                      if (mask->data.PS_TYPE_MASK_DATA[yPix][xPix] & maskVal) { \
+                      if (mask->data.PS_TYPE_IMAGE_MASK_DATA[yPix][xPix] & maskVal) { \
                           sumBad += kernelValue2; \
                       } else { \
@@ -820,5 +820,5 @@
                   float kernelValue = kernel[j][i]; /* Value of kernel */ \
                   float kernelValue2 = PS_SQR(kernelValue); /* Square of kernel */ \
-                  if (mask->data.PS_TYPE_MASK_DATA[yPix][xPix] & maskVal) { \
+                  if (mask->data.PS_TYPE_IMAGE_MASK_DATA[yPix][xPix] & maskVal) { \
                       sumBad += kernelValue2; \
                   } else { \
@@ -866,5 +866,5 @@
 
 
-psImageInterpolateStatus psImageInterpolate(double *imageValue, double *varianceValue, psMaskType *maskValue,
+psImageInterpolateStatus psImageInterpolate(double *imageValue, double *varianceValue, psImageMaskType *maskValue,
                                             float x, float y, const psImageInterpolation *interp)
 {
@@ -885,5 +885,5 @@
     if (maskValue && mask) {
         PS_ASSERT_IMAGE_NON_NULL(mask, PS_INTERPOLATE_STATUS_ERROR);
-        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_MASK, PS_INTERPOLATE_STATUS_ERROR);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_IMAGE_MASK, PS_INTERPOLATE_STATUS_ERROR);
         psAssert(image->numCols == mask->numCols && image->numRows == mask->numRows, "Image and mask sizes");
     }