Changeset 17632

Timestamp:

May 12, 2008, 8:52:31 AM (18 years ago)

Author:

Paul Price

Message:

Allow readouts to be NULL --- they are if they couldn't be matched.

File:

• trunk/ppStack/src/ppStackReadout.c (modified) (3 diffs)

trunk/ppStack/src/ppStackReadout.c

@@ -48 +48 @@
     for (int i = 0; i < num; i++) {
         pmReadout *ro = readouts->data[i];
-        assert(ro);
+        if (!ro) {
+            // Bad image
+            continue;
+        }
         pmFPA *fpa = ro->parent->parent->parent; // Parent FPA
 
@@ -86 +89 @@
     for (int i = 0; i < stack->n; i++) {
         pmStackData *data = stack->data[i]; // Data for this image
+        if (!data) {
+            continue;
+        }
         psImage *inspected = psPixelsToMask(NULL, data->inspect,
                                             psRegionSet(0, outRO->image->numCols - 1,
@@ -104 +110 @@
         pmStackData *data = stack->data[i]; // Data for this image
         pmReadout *readout = data->readout; // Readout of interest
+        if (!data || !readout) {
+            continue;
+        }
         psMetadataAddPtr(readout->analysis, PS_LIST_TAIL, PPSTACK_INSPECT_PIXELS,
                          PS_DATA_PIXELS | PS_META_DUPLICATE_OK, "Pixels to inspect from initial combination",