Index: trunk/psLib/src/imageops/psImageMaskOps.c
===================================================================
--- trunk/psLib/src/imageops/psImageMaskOps.c	(revision 18494)
+++ trunk/psLib/src/imageops/psImageMaskOps.c	(revision 21183)
@@ -8,6 +8,6 @@
  *  @author David Robbins, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-07-12 21:08:33 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 06:39:37 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37,5 +37,5 @@
                        psRegion region,
                        const char *op,
-                       psMaskType maskValue)
+                       psImageMaskType maskValue)
 {
     if (image == NULL) {
@@ -53,5 +53,5 @@
 	  if ((i + image->col0) < region.x0) continue; \
 	  if ((i + image->col0) > region.x1) continue; /* is this correct (not >= ?) */ \
-	  image->data.PS_TYPE_MASK_DATA[j][i] OP maskValue; \
+	  image->data.PS_TYPE_IMAGE_MASK_DATA[j][i] OP maskValue; \
 	} \
       }
@@ -84,5 +84,5 @@
                        psRegion region,
                        const char *op,
-                       psMaskType maskValue)
+                       psImageMaskType maskValue)
 {
     if (image == NULL) {
@@ -100,5 +100,5 @@
 	    (i + image->col0) < region.x0 || \
 	    (i + image->col0) > region.x1 ) { \
-	  image->data.PS_TYPE_MASK_DATA[j][i] OP maskValue; \
+	  image->data.PS_TYPE_IMAGE_MASK_DATA[j][i] OP maskValue; \
 	} } }
 
@@ -131,5 +131,5 @@
                        double radius,
                        const char *op,
-                       psMaskType maskValue)
+                       psImageMaskType maskValue)
 {
     if (image == NULL) {
@@ -150,5 +150,5 @@
             r2 = PS_SQR(dx) + PS_SQR(dy); \
             if (r2 <= R2) { \
-	      image->data.PS_TYPE_MASK_DATA[iy][ix] OP maskValue; \
+	      image->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] OP maskValue; \
             } } }
 
@@ -182,5 +182,5 @@
                        double radius,
                        const char *op,
-                       psMaskType maskValue)
+                       psImageMaskType maskValue)
 {
 
@@ -201,5 +201,5 @@
             r2 = PS_SQR(dx) + PS_SQR(dy); \
             if (r2 > R2) { \
-	      image->data.PS_TYPE_MASK_DATA[iy][ix] OP maskValue; \
+	      image->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] OP maskValue; \
             } } }
 
@@ -228,7 +228,7 @@
 psImage *psImageGrowMask(psImage *out,
                          const psImage *in,
-                         psMaskType maskVal,
+                         psImageMaskType maskVal,
                          unsigned int growSize,
-                         psMaskType growVal)
+                         psImageMaskType growVal)
 {
     if (in == NULL) {
@@ -237,7 +237,7 @@
         return NULL;
     }
-    if (in->type.type != PS_TYPE_MASK) {
+    if (in->type.type != PS_TYPE_IMAGE_MASK) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
-                "Invalid input image.  Input image type must match psMaskType.\n");
+                "Invalid input image.  Input image type must match psImageMaskType.\n");
         return NULL;
     }
@@ -261,6 +261,6 @@
     for (k = 0; k < in->numRows; k++) {
         for (l = 0; l < in->numCols; l++) {
-            out->data.PS_TYPE_MASK_DATA[k][l] = in->data.PS_TYPE_MASK_DATA[k][l];
-            changed->data.PS_TYPE_MASK_DATA[k][l] = 0;
+            out->data.PS_TYPE_IMAGE_MASK_DATA[k][l] = in->data.PS_TYPE_IMAGE_MASK_DATA[k][l];
+            changed->data.PS_TYPE_IMAGE_MASK_DATA[k][l] = 0;
         }
     }
@@ -268,6 +268,6 @@
     for (int i = 0; i < in->numRows; i++) {
         for (int j = 0; j < in->numCols; j++) {
-            if ( (in->data.PS_TYPE_MASK_DATA[i][j] & maskVal) != 0 &&
-                    changed->data.PS_TYPE_MASK_DATA[i][j] == 0) {
+            if ( (in->data.PS_TYPE_IMAGE_MASK_DATA[i][j] & maskVal) != 0 &&
+                    changed->data.PS_TYPE_IMAGE_MASK_DATA[i][j] == 0) {
                 m = i - growSize;
                 if (m < 0) {
@@ -281,7 +281,7 @@
                     for (l = n; l <= (j + growSize) && l < in->numCols; l++) {
                         if (((k-i)*(k-i) + (l-j)*(l-j)) <= (growSize*growSize)) {
-                            out->data.PS_TYPE_MASK_DATA[k][l] |= growVal;
-                            if ( (in->data.PS_TYPE_MASK_DATA[i][j] & maskVal) == 0 ) {
-                                changed->data.PS_TYPE_MASK_DATA[k][l] = 1;
+                            out->data.PS_TYPE_IMAGE_MASK_DATA[k][l] |= growVal;
+                            if ( (in->data.PS_TYPE_IMAGE_MASK_DATA[i][j] & maskVal) == 0 ) {
+                                changed->data.PS_TYPE_IMAGE_MASK_DATA[k][l] = 1;
                             }
                         }