Index: trunk/psLib/src/fits/psFitsImage.c
===================================================================
--- trunk/psLib/src/fits/psFitsImage.c	(revision 21117)
+++ trunk/psLib/src/fits/psFitsImage.c	(revision 21183)
@@ -7,6 +7,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.40 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-09-05 08:08:33 $
+ *  @version $Revision: 1.41 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 06:39:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -251,5 +251,5 @@
                                           const psImage *image, // Image to convert
                                           const psImage *mask, // Mask image, or NULL
-                                          psMaskType maskVal, // Value to mask
+                                          psImageMaskType maskVal, // Value to mask
                                           psRandom *rng, // Random number generator
                                           bool newScaleZero // Determine a new BSCALE and BZERO?
@@ -506,5 +506,5 @@
 
 bool psFitsWriteImageWithMask(psFits *fits, psMetadata *header, const psImage *input,
-                              const psImage *mask, psMaskType maskVal, int numZPlanes,
+                              const psImage *mask, psImageMaskType maskVal, int numZPlanes,
                               const char *extname)
 {
@@ -525,5 +525,5 @@
 
 bool psFitsInsertImageWithMask(psFits *fits, psMetadata *header, const psImage *image,
-                               const psImage *mask, psMaskType maskVal, int numZPlanes,
+                               const psImage *mask, psImageMaskType maskVal, int numZPlanes,
                                const char *extname, bool after)
 {
@@ -532,5 +532,5 @@
     PS_ASSERT_IMAGE_NON_NULL(image, false);
     if (mask) {
-        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_MASK, false);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_IMAGE_MASK, false);
         PS_ASSERT_IMAGES_SIZE_EQUAL(mask, image, false);
     }
@@ -706,5 +706,5 @@
 }
 
-bool psFitsUpdateImageWithMask(psFits *fits, const psImage *input, const psImage *mask, psMaskType maskVal,
+bool psFitsUpdateImageWithMask(psFits *fits, const psImage *input, const psImage *mask, psImageMaskType maskVal,
                                int x0, int y0, int z)
 {
@@ -713,5 +713,5 @@
     PS_ASSERT_IMAGE_NON_NULL(input, false);
     if (mask) {
-        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_MASK, false);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_IMAGE_MASK, false);
         PS_ASSERT_IMAGES_SIZE_EQUAL(mask, input, false);
     }
@@ -896,5 +896,5 @@
 
 bool psFitsWriteImageCubeWithMask(psFits *fits, psMetadata *header, const psArray *input,
-                                  const psArray *masks, psMaskType maskVal, const char *extname)
+                                  const psArray *masks, psImageMaskType maskVal, const char *extname)
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
@@ -976,5 +976,5 @@
 
 bool psFitsUpdateImageCubeWithMask(psFits *fits, const psArray *input,
-                                   const psArray *masks, psMaskType maskVal, int x0, int y0)
+                                   const psArray *masks, psImageMaskType maskVal, int x0, int y0)
 {
     PS_ASSERT_FITS_NON_NULL(fits, false);
Index: trunk/psLib/src/fits/psFitsImage.h
===================================================================
--- trunk/psLib/src/fits/psFitsImage.h	(revision 21117)
+++ trunk/psLib/src/fits/psFitsImage.h	(revision 21183)
@@ -4,6 +4,6 @@
  * @author Robert DeSonia, MHPCC
  *
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-09-05 08:08:33 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-01-27 06:39:37 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -74,5 +74,5 @@
     const psImage *input,               ///< the image to output
     const psImage *mask,                ///< the mask image
-    psMaskType maskVal,                 ///< value to mask
+    psImageMaskType maskVal,		///< value to mask
     int depth,                          ///< the number of z-planes of the FITS image data cube
     const char *extname                 ///< FITS extension name
@@ -101,5 +101,5 @@
     const psImage *input,               ///< the image to output
     const psImage *mask,                ///< the mask image
-    psMaskType maskVal,                 ///< value to mask
+    psImageMaskType maskVal,		///< value to mask
     int depth,                          ///< the number of z-planes of the FITS image data cube
     const char *extname,                ///< FITS extension name
@@ -128,5 +128,5 @@
     const psImage *input,               ///< the image to output
     const psImage *mask,                ///< the mask image
-    psMaskType maskVal,                 ///< value to mask
+    psImageMaskType maskVal,		///< value to mask
     int x0,                             ///< psImage's x-axis origin in FITS image coordinates
     int y0,                             ///< psImage's y-axis origin in FITS image coordinates
@@ -157,5 +157,5 @@
     const psArray *input,               ///< Array of images
     const psArray *masks,               ///< Array of masks
-    psMaskType maskVal,                 ///< Value to mask
+    psImageMaskType maskVal,		///< Value to mask
     const char *extname                 ///< Name of extension
     );
@@ -175,5 +175,5 @@
     const psArray *input,               ///< Array of images
     const psArray *masks,               ///< Array of masks
-    psMaskType maskVal,                 ///< Value to mask
+    psImageMaskType maskVal,		///< Value to mask
     int x0,                             ///< x origin of images in FITS image coordinates
     int y0                              ///< y origin of images in FITS image coordinates
Index: trunk/psLib/src/fits/psFitsScale.c
===================================================================
--- trunk/psLib/src/fits/psFitsScale.c	(revision 21117)
+++ trunk/psLib/src/fits/psFitsScale.c	(revision 21183)
@@ -100,5 +100,5 @@
                        const psImage *image, // Image to scale
                        const psImage *mask, // Mask image
-                       psMaskType maskVal, // Value to mask
+                       psImageMaskType maskVal, // Value to mask
                        const psFitsOptions *options // FITS options
     )
@@ -167,5 +167,5 @@
 
 bool psFitsScaleDetermine(double *bscale, double *bzero, long *blank, const psImage *image,
-                          const psImage *mask, psMaskType maskVal, const psFits *fits)
+                          const psImage *mask, psImageMaskType maskVal, const psFits *fits)
 {
     PS_ASSERT_PTR_NON_NULL(bscale, false);
@@ -174,5 +174,5 @@
     PS_ASSERT_IMAGE_NON_NULL(image, false);
     if (mask) {
-        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_MASK, false);
+        PS_ASSERT_IMAGE_TYPE(mask, PS_TYPE_IMAGE_MASK, false);
         PS_ASSERT_IMAGES_SIZE_EQUAL(mask, image, false);
     }
Index: trunk/psLib/src/fits/psFitsScale.h
===================================================================
--- trunk/psLib/src/fits/psFitsScale.h	(revision 21117)
+++ trunk/psLib/src/fits/psFitsScale.h	(revision 21183)
@@ -13,5 +13,5 @@
                           const psImage *image, ///< Image to scale
                           const psImage *mask, ///< Mask image
-                          psMaskType maskVal, ///< Value to mask
+                          psImageMaskType maskVal, ///< Value to mask
                           const psFits *fits ///< FITS options
     );