Changeset 23594 for branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackLoop.c

Timestamp:

Mar 29, 2009, 6:15:31 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ppStack (modified) (1 prop)
• ppStack/src/ppStackLoop.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/ppStack/src/ppStackLoop.c

@@ -62 +62 @@
         return false;
     }
+    psFree(options->cells); options->cells = NULL;
+
+    // Prepare for combination
+    if (!ppStackCombinePrepare(stack, options, config)) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to prepare for combination.");
+        psFree(stack);
+        psFree(options);
+        return false;
+    }
 
     // Initial combination
@@ -103 +112 @@
     // Clean up
     psTrace("ppStack", 2, "Cleaning up after combination....\n");
-    if (!ppStackCombineFinal(stack, options, config)) {
+    if (!ppStackCleanup(stack, options, config)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to clean up.");
         psFree(stack);