Changeset 19477 for trunk/ppStack/src/ppStackLoop.c

Timestamp:

Sep 10, 2008, 3:24:57 PM (18 years ago)

Author:

Paul Price

Message:

Getting the order right.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (6 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -467 +467 @@
 
 
+    // Start threading
+    ppStackThreadInit();
+    ppStackThreadData *stack = ppStackThreadDataSetup(cells, imageNames, maskNames, weightNames, config);
+
     memDump("preinitial");
 
@@ -474 +478 @@
     pmFPAview *view = NULL;             // View to readout
     psArray *inspect = NULL;            // Array of arrays of pixels to inspect
-    ppStackThreadData *stack = NULL;    // Data for stacking
     psVector *exptimes = psVectorAlloc(num, PS_TYPE_F32); // Exposure times for each input
     {
@@ -487 +490 @@
             psFree(inputMask);
             psFree(exptimes);
+            psFree(cells);
             return false;
         }
@@ -499 +503 @@
             psFree(inputMask);
             psFree(exptimes);
+            psFree(cells);
             return false;
         }
@@ -516 +521 @@
             psFree(outRO);
             psFree(exptimes);
+            psFree(cells);
             return false;
         }
@@ -536 +542 @@
         psFree(cellList);
 
-        // Start threading
-        ppStackThreadInit();
-        ppStackThreadData *stack = ppStackThreadDataSetup(cells, imageNames, maskNames, weightNames, config);
-        psFree(cells);
+    psFree(cells);
 
         bool status;                    // Status of read