Changeset 25027 for branches/pap/ppImage/src/ppImageReplaceBackground.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppImage (modified) (1 prop)
• ppImage/src/ppImageReplaceBackground.c (modified) (1 diff)

branches/pap/ppImage/src/ppImageReplaceBackground.c

@@ -144 +144 @@
     for (int y = 0; y < numRows; y++) {
         for (int x = 0; x < numCols; x++) {
-            float value = backData[y][x];
-            if (!isfinite(value)) {
-                image->data.F32[y][x] = NAN;
-                mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= options->lowMask;
+            if (mask && mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] & maskVal) {
+                image->data.F32[y][x] = 0.0;
             } else {
-                image->data.F32[y][x] -= value;
-            }
+                float value = backData[y][x];
+                if (!isfinite(value)) {
+                    image->data.F32[y][x] = NAN;
+                    mask->data.PS_TYPE_IMAGE_MASK_DATA[y][x] |= options->lowMask;
+                } else {
+                    image->data.F32[y][x] -= value;
+                }
+            }
         }
     }