Changeset 25183

Timestamp:

Aug 24, 2009, 6:10:55 PM (17 years ago)

Author:

Paul Price

Message:

Do the merging and writing.

Location:

branches/pap_mops/ppMops/src

Files:

• ppMops.c (modified) (2 diffs)
• ppMops.h (modified) (1 diff)

branches/pap_mops/ppMops/src/ppMops.c

@@ -17 +17 @@
         exit(PS_EXIT_SYS_ERROR);
     }
+
+    ppMopsDetections *merged = ppMopsMerge(detections); // Merged detections
+    psFree(detections);
+    if (!merged) {
+        psErrorStackPrint(stderr, "Unable to merge detections");
+        exit(PS_EXIT_SYS_ERROR);
+    }
+
+    if (!ppMopsWrite(merged, args)) {
+        psErrorStackPrint(stderr, "Unable to write detections");
+        exit(PS_EXIT_SYS_ERROR);
+    }
+
+    psFree(merged);
+    psFree(args);
+
+    return PS_EXIT_SUCCESS;
+}
+
 
 #if 0
@@ -210 +229 @@
 #endif
 
-    return PS_EXIT_SUCCESS;
-}

branches/pap_mops/ppMops/src/ppMops.h

@@ -66 +66 @@
 
 /// Merge detections
-ppMopsDetections *ppMopsDetectionsMerge(const psArray *detections);
+ppMopsDetections *ppMopsMerge(const psArray *detections);
 
 /// Write detections