Changeset 21183 for trunk/psLib/src/math/psHistogram.c

Timestamp:

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

Author:

eugene

Message:

incorporating changes from 16bit mask upgrades (eam_branch_20081230)

File:

• trunk/psLib/src/math/psHistogram.c (modified) (4 diffs)

trunk/psLib/src/math/psHistogram.c

@@ -5 +5 @@
  *  @author GLG (MHPCC), EAM (IfA)
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-05-07 23:11:30 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-01-27 06:39:38 $
  *
  *  Copyright 2006 IfA, University of Hawaii
@@ -231 +231 @@
                                const psVector* errors,
                                const psVector* mask,
-                               psMaskType maskVal)
+                               psVectorMaskType maskVal)
 {
     psTrace("psLib.math", 3, "---- %s() begin  ----\n", __func__);
@@ -244 +244 @@
     if (mask) {
         PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, false);
-        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_U8, false);
+        PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_VECTOR_MASK, false);
     }
     if (errors) {
@@ -274 +274 @@
     for (long i = 0; i < inF32->n; i++) {
         // Check if this pixel is masked, and if so, skip it.
-        if (!mask || (mask && (!(mask->data.U8[i] & maskVal)))) {
+        if (!mask || (mask && (!(mask->data.PS_TYPE_VECTOR_MASK_DATA[i] & maskVal)))) {
             if (inF32->data.F32[i] < out->bounds->data.F32[0]) {
                 // If this pixel is below minimum value, count it, then skip.