Changeset 17319 for trunk/ppMerge/src/ppMergeLoop.c

Timestamp:

Apr 4, 2008, 10:24:48 AM (18 years ago)

Author:

Paul Price

Message:

Need to declare "stats" and "view" before any "goto ERROR", since
these are freed there.

File:

• trunk/ppMerge/src/ppMergeLoop.c (modified) (3 diffs)

trunk/ppMerge/src/ppMergeLoop.c

@@ -59 +59 @@
     combination->weights = useWeights;
 
+    psMetadata *stats = NULL;           // Statistics for output
+    if (psMetadataLookup(config->arguments, "STATS.NAME")) {
+        stats = psMetadataAlloc();
+        psMetadataAddMetadata(config->arguments, PS_LIST_TAIL, "STATS.DATA", 0, "Statistics output", stats);
+    }
+
+    pmFPAview *view = pmFPAviewAlloc(0); // View to component of interest
+
     // Retrieve data placed on analysis
     psVector *scales = NULL, *zeros = NULL; // Scale and zeroes for combination
@@ -96 +104 @@
     psString darkNorm = psMetadataLookupStr(&mdok, arguments, "DARK.NORM"); // Dark normalisation
 
-    psMetadata *stats = NULL;           // Statistics for output
-    if (psMetadataLookup(config->arguments, "STATS.NAME")) {
-        stats = psMetadataAlloc();
-        psMetadataAddMetadata(config->arguments, PS_LIST_TAIL, "STATS.DATA", 0, "Statistics output", stats);
-    }
 
     if (!ppMergeFileActivate(config, PPMERGE_FILES_ALL, true)) {
@@ -111 +114 @@
     assert(output && output->fpa);
     pmFPA *outFPA = output->fpa;        // Output FPA
-    pmFPAview *view = pmFPAviewAlloc(0); // View to component of interest
     int cellNum = 0;                    // Index of cell
     if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {