Index: trunk/psLib/src/imageops/psImagePixelManip.c
===================================================================
--- trunk/psLib/src/imageops/psImagePixelManip.c	(revision 5064)
+++ trunk/psLib/src/imageops/psImagePixelManip.c	(revision 5224)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-16 23:56:48 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-10-05 03:51:43 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -403,26 +403,49 @@
                        psMaskType maskValue)
 {
-
-    for (int iy = 0; iy < image->numRows; iy++) {
-        for (int ix = 0; ix < image->numCols; ix++) {
-            if (ix + image->col0 <  region.x0)
-                continue;
-            if (ix + image->col0 >= region.x1)
-                continue;
-            if (iy + image->row0 <  region.y0)
-                continue;
-            if (iy + image->row0 >= region.y1)
-                continue;
-            if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
-                image->data.U8[iy][ix] &= maskValue;
-            } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
-                image->data.U8[iy][ix] |= maskValue;
-            } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
-                image->data.U8[iy][ix] = maskValue;
-            } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
-                image->data.U8[iy][ix] ^= maskValue;
+    for (int j = 0; j < image->numRows; j++) {
+        for (int i = 0; i < image->numCols; i++) {
+            if ( (j + image->row0) >= region.y0 &&
+                    (j + image->row0) <= region.y1 &&
+                    (i + image->col0) >= region.x0 &&
+                    (i + image->col0) <= region.x1 ) {
+                if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[j][i] &= maskValue;
+                } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[j][i] |= maskValue;
+                } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[j][i] = maskValue;
+                } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[j][i] ^= maskValue;
+                } else {
+                    psError(PS_ERR_BAD_PARAMETER_VALUE,true,
+                            "The logical operation specified is incorrect\n");
+                    return;
+                }
             }
         }
     }
+    /*
+        for (int iy = 0; iy < image->numRows; iy++) {
+            for (int ix = 0; ix < image->numCols; ix++) {
+                if (ix + image->col0 >=  region.x0)
+                    continue;
+                if (ix + image->col0 <= region.x1)
+                    continue;
+                if (iy + image->row0 >=  region.y0)
+                    continue;
+                if (iy + image->row0 <= region.y1)
+                    continue;
+                if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] &= maskValue;
+                } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] |= maskValue;
+                } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] = maskValue;
+                } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] ^= maskValue;
+                }
+            }
+        }
+    */
 }
 
@@ -434,28 +457,51 @@
                        psMaskType maskValue)
 {
-
-    for (int iy = 0; iy < image->numRows; iy++) {
-        for (int ix = 0; ix < image->numCols; ix++) {
-            if (ix + image->col0 <  region.x0)
-                goto maskit;
-            if (ix + image->col0 >= region.x1)
-                goto maskit;
-            if (iy + image->row0 <  region.y0)
-                goto maskit;
-            if (iy + image->row0 >= region.y1)
-                goto maskit;
-            continue;
-maskit:
-            if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
-                image->data.U8[iy][ix] &= maskValue;
-            } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
-                image->data.U8[iy][ix] |= maskValue;
-            } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
-                image->data.U8[iy][ix] = maskValue;
-            } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
-                image->data.U8[iy][ix] ^= maskValue;
+    for (int j = 0; j < image->numRows; j++) {
+        for (int i = 0; i < image->numCols; i++) {
+            if ( (j + image->row0) < region.y0 ||
+                    (j + image->row0) > region.y1 ||
+                    (i + image->col0) < region.x0 ||
+                    (i + image->col0) > region.x1 ) {
+                if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[j][i] &= maskValue;
+                } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[j][i] |= maskValue;
+                } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[j][i] = maskValue;
+                } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[j][i] ^= maskValue;
+                } else {
+                    psError(PS_ERR_BAD_PARAMETER_VALUE,true,
+                            "The logical operation specified is incorrect\n");
+                    return;
+                }
             }
         }
     }
+    /*
+        for (int iy = 0; iy < image->numRows; iy++) {
+            for (int ix = 0; ix < image->numCols; ix++) {
+                if (ix + image->col0 <  region.x0)
+                    goto maskit;
+                if (ix + image->col0 > region.x1)
+                    goto maskit;
+                if (iy + image->row0 <  region.y0)
+                    goto maskit;
+                if (iy + image->row0 > region.y1)
+                    goto maskit;
+                continue;
+    maskit:
+                if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] &= maskValue;
+                } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] |= maskValue;
+                } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] = maskValue;
+                } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] ^= maskValue;
+                }
+            }
+        }
+    */
 }
 
@@ -469,4 +515,10 @@
                        psMaskType maskValue)
 {
+    if (image == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                "Invalid image input.  Image is NULL.\n");
+        return;
+    }
+
 
     double dx, dy, r2, R2;
@@ -479,14 +531,18 @@
             dy = iy + image->row0 - y;
             r2 = PS_SQR(dx) + PS_SQR(dy);
-            if (r2 > R2)
-                continue;
-            if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
-                image->data.U8[iy][ix] &= maskValue;
-            } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
-                image->data.U8[iy][ix] |= maskValue;
-            } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
-                image->data.U8[iy][ix] = maskValue;
-            } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
-                image->data.U8[iy][ix] ^= maskValue;
+            if (r2 <= R2) {
+                if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] &= maskValue;
+                } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] |= maskValue;
+                } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] = maskValue;
+                } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] ^= maskValue;
+                } else {
+                    psError(PS_ERR_BAD_PARAMETER_VALUE,true,
+                            "The logical operation specified is incorrect\n");
+                    return;
+                }
             }
         }
@@ -513,14 +569,18 @@
             dy = iy + image->row0 - y;
             r2 = PS_SQR(dx) + PS_SQR(dy);
-            if (r2 < R2)
-                continue;
-            if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
-                image->data.U8[iy][ix] &= maskValue;
-            } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
-                image->data.U8[iy][ix] |= maskValue;
-            } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
-                image->data.U8[iy][ix] = maskValue;
-            } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
-                image->data.U8[iy][ix] ^= maskValue;
+            if (r2 > R2) {
+                if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] &= maskValue;
+                } else if ( !strncmp(op, "|", 2) || !strncmp(op, "OR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] |= maskValue;
+                } else if ( !strncmp(op, "=", 2) || !strncmp(op, "EQUAL", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] = maskValue;
+                } else if ( !strncmp(op, "^", 2) || !strncmp(op, "XOR", 5) ) {
+                    image->data.PS_TYPE_MASK_DATA[iy][ix] ^= maskValue;
+                } else {
+                    psError(PS_ERR_BAD_PARAMETER_VALUE,true,
+                            "The logical operation specified is incorrect\n");
+                    return;
+                }
             }
         }