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

trunk/psModules/src/camera/pmCellSquish.c

@@ -12 +12 @@
 
 
-bool pmCellSquish(pmCell *cell, psMaskType maskVal, bool useShifts)
+bool pmCellSquish(pmCell *cell, psImageMaskType maskVal, bool useShifts)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
@@ -116 +116 @@
     psImage *squishImage = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Squished image
     psImageInit(squishImage, 0.0);
-    psImage *squishMask = psImageAlloc(numCols, numRows, PS_TYPE_MASK); // Squished mask
+    psImage *squishMask = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK); // Squished mask
     psImageInit(squishMask, 0);
 
@@ -159 +159 @@
                 squishImage->data.F32[ySquish][xSquish] += image->data.F32[y][x];
                 if (mask) {
-                    squishMask->data.PS_TYPE_MASK_DATA[ySquish][xSquish] |= mask->data.U8[y][x] & maskVal;
+                    squishMask->data.PS_TYPE_IMAGE_MASK_DATA[ySquish][xSquish] |= mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskVal;
                 }
             }