Changeset 17731 for trunk/psModules/src/camera/pmFPAMaskWeight.c

Timestamp:

May 16, 2008, 4:41:00 PM (18 years ago)

Author:

Paul Price

Message:

Fixing compilation errors.

File:

• trunk/psModules/src/camera/pmFPAMaskWeight.c (modified) (2 diffs)

trunk/psModules/src/camera/pmFPAMaskWeight.c

@@ -413 +413 @@
     PM_ASSERT_READOUT_MASK(readout, false);
 
-    int numCols = image->numCols, numRows = image->numRows; // Size of image
-    psMaskType **maskData = mask->data.PS_TYPE_MASK_DATA; // Dereference mask
-    psF32 **imageData = image->data.F32;// Dereference image
-    psF32 **weightData = weight->data.F32; // Dereference weight map
+    int numCols = readout->image->numCols, numRows = readout->image->numRows; // Size of image
+    psMaskType **maskData = readout->mask->data.PS_TYPE_MASK_DATA; // Dereference mask
+    psF32 **imageData = readout->image->data.F32;// Dereference image
+    psF32 **weightData = readout->weight ? readout->weight->data.F32 : NULL; // Dereference weight map
 
     for (int y = 0; y < numRows; y++) {
@@ -422 +422 @@
             if (maskData[y][x] & maskVal) {
                 imageData[y][x] = NAN;
-                if (weight) {
+                if (weightData) {
                     weightData[y][x] = NAN;
                 }