Changeset 13939

Timestamp:

Jun 21, 2007, 2:13:55 PM (19 years ago)

Author:

eugene

Message:

handle missing images (null input data entries)

File:

• trunk/ppMerge/src/ppMergeCombine.c (modified) (3 diffs)

trunk/ppMerge/src/ppMergeCombine.c

@@ -304 +304 @@
             for (int i = 0; i < filenames->n; i++) {
                 pmFPA *fpaIn = data->in->data[i]; // Input FPA
+                if (!fpaIn) { continue; } // was not a valid input file
                 pmChip *chipIn = fpaIn->chips->data[view->chip]; // Input chip
                 pmCell *cellIn = chipIn->cells->data[view->cell]; // Input cell
@@ -324 +325 @@
         for (int i = 0; i < filenames->n; i++) {
             pmFPA *fpaIn = data->in->data[i]; // Input FPA
+            if (!fpaIn) { continue; } // was not a valid input file
             pmChip *chipIn = fpaIn->chips->data[view->chip]; // Input chip
             pmChipFreeData(chipIn);
@@ -343 +345 @@
     for (int i = 0; i < filenames->n; i++) {
         pmFPA *fpaIn = data->in->data[i]; // Input FPA
+        if (!fpaIn) { continue; } // was not a valid input file
         pmFPAFreeData(fpaIn);
     }