Changeset 21183 for trunk/pswarp/src/pswarpPixelFraction.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/pswarp/src/pswarpPixelFraction.c (modified) (3 diffs)

trunk/pswarp/src/pswarpPixelFraction.c

@@ -20 +20 @@
     PS_ASSERT_IMAGE_NON_NULL(readout->mask, false);
     PS_ASSERT_IMAGES_SIZE_EQUAL(readout->mask, readout->image, false);
-    PS_ASSERT_IMAGE_TYPE(readout->mask, PS_TYPE_MASK, false);
+    PS_ASSERT_IMAGE_TYPE(readout->mask, PS_TYPE_IMAGE_MASK, false);
 
     if (stats) {
@@ -40 +40 @@
 
     // output mask bits
-    psMaskType maskValue = psMetadataLookupU8(&status, recipe, "MASK.OUTPUT"); 
+    psImageMaskType maskValue = psMetadataLookupImageMask(&status, recipe, "MASK.OUTPUT"); 
     psAssert (status, "MASK.OUTPUT was not defined");
 
@@ -55 +55 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
-            if (mask->data.PS_TYPE_MASK_DATA[y][x] & maskValue) {
+            if (mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskValue) {
                 numBad++;
             } else {