Changeset 28623 for trunk/ppTranslate/src/ppMops.c

Timestamp:

Jul 7, 2010, 10:44:29 AM (16 years ago)

Author:

Paul Price

Message:

Reverse merging to the 'new old version' of ppMops (r28043), since this is what MOPS wants right now. The 'new version' is at ^{/branches/ppTranslate/}

File:

• trunk/ppTranslate/src/ppMops.c (modified) (1 diff)

trunk/ppTranslate/src/ppMops.c

@@ -20 +20 @@
     }
 
-    if (!ppMopsPurgeDuplicates(detections)) {
+    ppMopsDetections *merged = ppMopsMerge(detections); // Merged detections
+    psFree(detections);
+    if (!merged) {
         psErrorStackPrint(stderr, "Unable to merge detections");
         exit(PS_EXIT_SYS_ERROR);
     }
 
-    if (!ppMopsWrite(detections, args)) {
+    if (!ppMopsWrite(merged, args)) {
         psErrorStackPrint(stderr, "Unable to write detections");
         exit(PS_EXIT_SYS_ERROR);
     }
 
-    psFree(detections);
+    psFree(merged);
     psFree(args);