Changeset 5213 for trunk/psLib/src/mathtypes

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/mathtypes/psVector.c (modified) (4 diffs)

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-29 18:59:01 $
+*  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-30 23:09:13 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -608 +608 @@
         f = fdopen(fd, "a+");
         fprintf (f, "vector: %s\n", name);
-     
+
         for (int i = 0; i < a[0].n; i++) {
             fprintf (f, "%f\n", p_psVectorGetElementF64(a, i));
@@ -974 +974 @@
     type = mask->type.type;
 
+    if (type != PS_TYPE_MASK) {
+        psError(PS_ERR_BAD_PARAMETER_TYPE, true,
+                "psVector type does not match the specified psMaskType!\n");
+        return -1;
+    }
+
     switch (type) {
     case PS_TYPE_U8:
+    case PS_TYPE_U16:
         for (long i = 0; i < mask->n; i++) {
-            if (mask->data.U8[i] & value) {
+            if (mask->data.PS_TYPE_MASK_DATA[i] & value) {
                 Npixels ++;
             }
@@ -986 +993 @@
     case PS_TYPE_S32:
     case PS_TYPE_S64:
-    case PS_TYPE_U16:
     case PS_TYPE_U32:
     case PS_TYPE_U64: