Changeset 21183 for trunk/psLib/src/mathtypes

Timestamp:

Jan 26, 2009, 8:40:07 PM (18 years ago)

Author:

eugene

Message:

incorporating changes from 16bit mask upgrades (eam_branch_20081230)

Location:

trunk/psLib/src/mathtypes

Files:

• psVector.c (modified) (3 diffs)
• psVector.h (modified) (2 diffs)

trunk/psLib/src/mathtypes/psVector.c

@@ -10 +10 @@
 *  @author Joshua Hoblitt, University of Hawaii
 *
-*  @version $Revision: 1.104 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2008-11-05 11:12:40 $
+*  @version $Revision: 1.105 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2009-01-27 06:39:38 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -987 +987 @@
 }
 
-// count number of pixels with given mask value
+// count number of pixels with given mask value.  the comparison is against a U64 type to
+// allow any int-type of vector.  all signed and unsigned int types are allowed
 long psVectorCountPixelMask (psVector *mask,
-                             psMaskType value)
+                             psU64 value)
 {
     long Npixels = 0;
@@ -998 +999 @@
     }
 
-    psElemType type;
-    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;
-    }
-
+# define PS_VECTOR_COUNT_PIXEL_MASK(NAME,TYPE) \
+    case PS_TYPE_##NAME: \
+        for (long i = 0; i < mask->n; i++) { \
+            if (mask->data.TYPE[i] & value) { \
+                Npixels ++; \
+            } \
+        } \
+        break;
+
+    psElemType type = mask->type.type;
     switch (type) {
-    case PS_TYPE_U8:
-    case PS_TYPE_U16:
-        for (long i = 0; i < mask->n; i++) {
-            if (mask->data.PS_TYPE_MASK_DATA[i] & value) {
-                Npixels ++;
-            }
-        }
-        break;
-    case PS_TYPE_S8:
-    case PS_TYPE_S16:
-    case PS_TYPE_S32:
-    case PS_TYPE_S64:
-    case PS_TYPE_U32:
-    case PS_TYPE_U64:
-    case PS_TYPE_F32:
-    case PS_TYPE_F64:
+        PS_VECTOR_COUNT_PIXEL_MASK(U8, U8);
+        PS_VECTOR_COUNT_PIXEL_MASK(U16,U16);
+        PS_VECTOR_COUNT_PIXEL_MASK(U32,U32);
+        PS_VECTOR_COUNT_PIXEL_MASK(U64,U64);
+        PS_VECTOR_COUNT_PIXEL_MASK(S8, S8);
+        PS_VECTOR_COUNT_PIXEL_MASK(S16,S16);
+        PS_VECTOR_COUNT_PIXEL_MASK(S32,S32);
+        PS_VECTOR_COUNT_PIXEL_MASK(S64,S64);
     default:
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,

trunk/psLib/src/mathtypes/psVector.h

@@ -10 +10 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-09-12 00:22:48 $
+ * @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-01-27 06:39:38 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -379 +379 @@
  */
 long psVectorCountPixelMask(
-    psVector *mask,                    ///< input vector to count
-    psMaskType value                   ///< the mask value to satisfy
+    psVector *mask,                     ///< input vector to count
+    psU64 value                         ///< the mask value to satisfy
 );