Changeset 30587 for branches/czw_branch/20101203/ppTranslate/src/ppMopsMerge.c

Timestamp:

Feb 11, 2011, 4:42:29 PM (15 years ago)

Author:

watersc1

Message:

Caught up with the trunk. Now to look for bugs.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ppTranslate/src/ppMopsMerge.c (modified) (2 diffs)

branches/czw_branch/20101203/ppTranslate/src/ppMopsMerge.c

@@ -35 +35 @@
 
     ppMopsDetections *merged = NULL;    // Merged list
-    int num = 1;                                                         // Number of merged files
+    int num = 0;                                                         // Number of merged files
     for (int i = 0; i < detections->n; i++) {
         ppMopsDetections *det = detections->data[i]; // Detections of interest
@@ -163 +163 @@
     }
 
+    if (num == 0) {
+        //All detections were NULL?!
+        psTrace("ppMops.merge", 3, "All %d detections were NULL\n", detections->n);
+        return NULL;
+    }
     psTrace("ppMops.merge", 2, "%ld sources in merged detections list\n", merged->num);