Changeset 4938

Timestamp:

Aug 31, 2005, 3:05:41 PM (21 years ago)

Author:

drobbin

Message:

made requested changes to ImageKeep(Mask)Circle(Region) functions - (char *op)

Location:

trunk/psLib/src/imageops

Files:

• psImagePixelManip.c (modified) (9 diffs)
• psImagePixelManip.h (modified) (5 diffs)

trunk/psLib/src/imageops/psImagePixelManip.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 21:58:22 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-01 01:05:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -400 +400 @@
 void psImageMaskRegion(psImage *image,
                        psRegion *region,
-                       bool logical_and,
+                       const char *op,
                        psMaskType maskValue)
 {
@@ -414 +414 @@
             if (iy + image->row0 >= region->y1)
                 continue;
-            if (logical_and) {
+            if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
                 image->data.U8[iy][ix] &= maskValue;
-            } else {
+            } 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;
             }
         }
@@ -427 +431 @@
 void psImageKeepRegion(psImage *image,
                        psRegion *region,
-                       bool logical_and,
+                       const char *op,
                        psMaskType maskValue)
 {
@@ -443 +447 @@
             continue;
 maskit:
-            if (logical_and) {
+            if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
                 image->data.U8[iy][ix] &= maskValue;
-            } else {
+            } 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;
             }
         }
@@ -458 +466 @@
                        double y,
                        double radius,
-                       bool logical_and,
+                       const char *op,
                        psMaskType maskValue)
 {
@@ -473 +481 @@
             if (r2 > R2)
                 continue;
-            if (logical_and) {
+            if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
                 image->data.U8[iy][ix] &= maskValue;
-            } else {
+            } 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;
             }
         }
@@ -488 +500 @@
                        double y,
                        double radius,
-                       bool logical_and,
+                       const char *op,
                        psMaskType maskValue)
 {
@@ -503 +515 @@
             if (r2 < R2)
                 continue;
-            if (logical_and) {
+            if ( !strncmp(op, "&", 2) || !strncmp(op, "AND", 5) ) {
                 image->data.U8[iy][ix] &= maskValue;
-            } else {
+            } 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;
             }
         }

trunk/psLib/src/imageops/psImagePixelManip.h

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-08-31 21:58:22 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-01 01:05:41 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -95 +95 @@
     psImage *image,                    ///< the image to set
     psRegion *region,                  ///< the specified region
-    bool logical_and,                  ///< the logical operation
+    const char *op,                    ///< the logical operation
     psMaskType maskValue               ///< the specified bits
 );
@@ -107 +107 @@
     psImage *image,                    ///< the image to set
     psRegion *region,                  ///< the specified region
-    bool logical_and,                  ///< the logical operation
+    const char *op,                    ///< the logical operation
     psMaskType maskValue               ///< the specified bits
 );
@@ -121 +121 @@
     double y,                          ///< the y coordinate of the circle's center
     double radius,                     ///< the radius of the specified circle
-    bool logical_and,                  ///< the logical operation
+    const char *op,                    ///< the logical operation
     psMaskType maskValue               ///< the specified bits
 );
@@ -135 +135 @@
     double y,                          ///< the y coordinate of the circle's center
     double radius,                     ///< the radius of the specified circle
-    bool logical_and,                  ///< the logical operation
+    const char *op,                    ///< the logical operation
     psMaskType maskValue               ///< the specified bits
 );