Changeset 21183 for trunk/psLib/src/math/psClip.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/psClip.c (modified) (6 diffs)

trunk/psLib/src/math/psClip.c

@@ -22 +22 @@
 
 psClipParams *psClipParamsAlloc(psStatsOptions meanStat, psStatsOptions stdevStat,
-                                psMaskType masked, psMaskType clipped)
+                                psVectorMaskType masked, psVectorMaskType clipped)
 {
     psClipParams *params = psAlloc(sizeof(psClipParams)); // Clip parameters
@@ -48 +48 @@
     PS_ASSERT_VECTOR_NON_NULL(values, -1);
     PS_ASSERT_VECTOR_NON_NULL(mask, -1);
-    PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_MASK, -1);
+    PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_VECTOR_MASK, -1);
     PS_ASSERT_PTR(params, -1);
     PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, -1);
@@ -62 +62 @@
     }
 
-    psMaskType masked = params->masked; // Indicates masked values
-    psMaskType clipped = params->clipped; // Indicates clipped values
+    psVectorMaskType masked = params->masked; // Indicates masked values
+    psVectorMaskType clipped = params->clipped; // Indicates clipped values
     masked |= clipped;                  // Make sure we're also masking clipped values
-    psMaskType *maskData = mask->data.PS_TYPE_MASK_DATA; // Dereference mask
+    psVectorMaskType *maskData = mask->data.PS_TYPE_VECTOR_MASK_DATA; // Dereference mask
     long totalMasked = 0;               // Total number of pixels masked
 
@@ -120 +120 @@
     PS_ASSERT_VECTOR_NON_NULL(values, -1);
     PS_ASSERT_VECTOR_NON_NULL(mask, -1);
-    PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_MASK, -1);
+    PS_ASSERT_VECTOR_TYPE(mask, PS_TYPE_VECTOR_MASK, -1);
     PS_ASSERT_PTR(params, -1);
     PS_ASSERT_VECTORS_SIZE_EQUAL(values, mask, -1);
@@ -141 +141 @@
     }
 
-    psMaskType masked = params->masked; // Indicates masked values
-    psMaskType clipped = params->clipped; // Indicates clipped values
+    psVectorMaskType masked = params->masked; // Indicates masked values
+    psVectorMaskType clipped = params->clipped; // Indicates clipped values
     masked |= clipped;                  // Make sure we're also masking clipped values
 
@@ -158 +158 @@
 case PS_TYPE_##TYPE: { \
         ps##TYPE *valuesData = values->data.TYPE; /* Dereference for speed */ \
-        psMaskType *maskData = mask->data.PS_TYPE_MASK_DATA; /* Dereference mask for speed */ \
+        psVectorMaskType *maskData = mask->data.PS_TYPE_VECTOR_MASK_DATA; /* Dereference mask for speed */ \
         if (errors) { \
             ps##TYPE *errorsData = errors->data.TYPE; \