Changeset 17178 for branches/pap_branch_080320/ppMerge/src/ppMergeMask.c

Timestamp:

Mar 28, 2008, 1:09:01 PM (18 years ago)

Author:

Paul Price

Message:

File I/O problems --- was getting outCell->readouts->n == 1 but
outCell->readouts->data[0] == NULL. Turns out I was freeing outRO an
extra time.
Also massaged the file activations.

File:

• branches/pap_branch_080320/ppMerge/src/ppMergeMask.c (modified) (4 diffs)

branches/pap_branch_080320/ppMerge/src/ppMergeMask.c

@@ -246 +246 @@
         }
 
-        outRO->data_exists = outCell->data_exists = outChip->data_exists = true;
-
         if (writeOut) {
             if (!pmFPAfileIOChecks(config, outView, PM_FPA_BEFORE)) {
@@ -253 +251 @@
                 goto MERGE_MASK_ERROR;
             }
+
+            outRO->data_exists = outCell->data_exists = outChip->data_exists = true;
 
             // Average concepts
@@ -289 +289 @@
             }
         }
-        psFree(outRO);
     }
     psFree(outView);
@@ -344 +343 @@
         goto PPMERGE_MASK_ERROR;
     }
-    if (!ppMergeFileActivate(config, PPMERGE_FILES_OUTPUT, false)) {
+    if (!ppMergeFileActivate(config, PPMERGE_FILES_OUTPUT, true)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to activate files.");
         goto PPMERGE_MASK_ERROR;