Changeset 33415 for branches/meh_branches/ppstack_test/psLib/src/imageops/psImageCovariance.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psLib/src/imageops/psImageCovariance.c (modified) (4 diffs)

branches/meh_branches/ppstack_test/psLib/src/imageops/psImageCovariance.c

@@ -177 +177 @@
             if (threaded) {
                 psThreadJob *job = psThreadJobAlloc("PSLIB_IMAGE_COVARIANCE_CALCULATE");
-                psArrayAdd(job->args, 1, out);
-                psArrayAdd(job->args, 1, covar);
-                psArrayAdd(job->args, 1, (psKernel*)kernel); // Casting away const
+                psArrayAdd(job->args, 0, out);
+                psArrayAdd(job->args, 0, covar);
+                psArrayAdd(job->args, 0, (psKernel*)kernel); // Casting away const
                 PS_ARRAY_ADD_SCALAR(job->args, x, PS_TYPE_S32);
                 PS_ARRAY_ADD_SCALAR(job->args, y, PS_TYPE_S32);
@@ -193 +193 @@
     }
 
-    if (threaded && !psThreadPoolWait(true)) {
+    if (threaded && !psThreadPoolWait(true, true)) {
         psError(PS_ERR_UNKNOWN, false, "Error waiting for threads.");
         return false;
@@ -345 +345 @@
             if (threaded) {
                 psThreadJob *job = psThreadJobAlloc("PSLIB_IMAGE_COVARIANCE_BIN");
-                psArrayAdd(job->args, 1, out);
-                psArrayAdd(job->args, 1, covar);
+                psArrayAdd(job->args, 0, out);
+                psArrayAdd(job->args, 0, covar);
                 PS_ARRAY_ADD_SCALAR(job->args, bin, PS_TYPE_S32);
                 PS_ARRAY_ADD_SCALAR(job->args, binVal, PS_TYPE_F32);
@@ -360 +360 @@
         }
     }
-    if (threaded && !psThreadPoolWait(true)) {
+    if (threaded && !psThreadPoolWait(true, true)) {
         psError(PS_ERR_UNKNOWN, false, "Error waiting for threads.");
         return false;