Changeset 33098 for branches/meh_branches/ppsub_test/psModules/src/imcombine/pmSubtraction.c

Timestamp:

Jan 11, 2012, 11:19:21 PM (15 years ago)

Author:

mhuber

Message:

merged latest r33093 trunk changes to meh_branches/ppsub_test

Location:

branches/meh_branches/ppsub_test

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtraction.c (modified) (4 diffs)

branches/meh_branches/ppsub_test/psModules/src/imcombine/pmSubtraction.c

@@ -905 +905 @@
         }
     }
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;
@@ -1427 +1427 @@
     }
 
-    if (!psThreadPoolWait(false)) {
+    if (!psThreadPoolWait(false, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;
@@ -1487 +1487 @@
             }
         }
+        psFree(out1->covariance);
         out1->covariance = psImageCovarianceAverage(covars);
         psFree(covars);
@@ -1527 +1528 @@
             }
         }
+        psFree(out2->covariance);
         out2->covariance = psImageCovarianceAverage(covars);
         psFree(covars);