Changeset 25250

Timestamp:

Sep 2, 2009, 11:42:45 AM (17 years ago)

Author:

Paul Price

Message:

If first component has no detections, can get empty tree, resulting in abort.

File:

• branches/pap_mops/ppMops/src/ppMopsMerge.c (modified) (1 diff)

branches/pap_mops/ppMops/src/ppMopsMerge.c

@@ -34 +34 @@
     psTrace("ppMops.merge", 1, "Merging detections from %ld inputs\n", detections->n);
 
-    ppMopsDetections *merged = psMemIncrRefCounter(detections->data[0]); // Merged list
-    psTrace("ppMops.merge", 3, "Automatically merging %ld detections from input 0\n", merged->num);
+    ppMopsDetections *merged = NULL;    // Merged list
     int num = 1;                                                         // Number of merged files
-    for (int i = 1; i < detections->n; i++) {
+    for (int i = 0; i < detections->n; i++) {
         ppMopsDetections *det = detections->data[i]; // Detections of interest
         if (!det) {
             psTrace("ppMops.merge", 3, "Ignoring NULL input %d\n", i);
             continue;
+        } else if (det->num == 0) {
+            psTrace("ppMops.merge", 3, "Ignoring empty input %d\n", i);
+            continue;
         }
         num++;
+        if (!merged) {
+            psTrace("ppMops.merge", 3, "Accepting %ld detections from input %d\n", det->num, i);
+            merged = psMemIncrRefCounter(detections->data[0]);
+            continue;
+        }
         psTrace("ppMops.merge", 3, "Merging %ld detections from input %d\n", det->num, i);