Changeset 5213 for trunk/psLib/src/imageops/psImageStats.c

Timestamp:

Sep 30, 2005, 1:09:13 PM (21 years ago)

Author:

drobbin

Message:

Updated ImageRow/Col for tail access, PixelCount fxns to allow for differing psMaskType(u8 or u16)

File:

• trunk/psLib/src/imageops/psImageStats.c (modified) (3 diffs)

trunk/psLib/src/imageops/psImageStats.c

@@ -9 +9 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.81 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-26 22:35:53 $
+ *  @version $Revision: 1.82 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-30 23:09:13 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -677 +677 @@
 
     type = mask->type.type;
+    if (type != PS_TYPE_MASK) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                "psImage type does not match the specified psMaskType!\n");
+        return -1;
+    }
 
     switch (type) {
     case PS_TYPE_U8:
+    case PS_TYPE_U16:
         for (long i = x0; i < x1; i++) {
             for (long j = y0; j < y1; j++) {
-                if (mask->data.U8[i][j] & value) {
+                if (mask->data.PS_TYPE_MASK_DATA[i][j] & value) {
                     Npixels ++;
                 }
@@ -692 +698 @@
     case PS_TYPE_S32:
     case PS_TYPE_S64:
-    case PS_TYPE_U16:
     case PS_TYPE_U32:
     case PS_TYPE_U64: