Changeset 33415 for branches/meh_branches/ppstack_test/ppStack/src/ppStackReject.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)
• ppStack/src/ppStackReject.c (modified) (2 diffs)

branches/meh_branches/ppstack_test/ppStack/src/ppStackReject.c

@@ -33 +33 @@
         
         kernel->solution1 = psVectorAlloc(3, PS_TYPE_F64);
+        psVectorSet(kernel->solution1, 0, 1.0);
         psVectorSet(kernel->solution1, 1, 1.0);
         psVectorSet(kernel->solution1, 2, 1.0);
-        psVectorSet(kernel->solution1, 3, 1.0);
         kernel->solution2 = psVectorAlloc(3, PS_TYPE_F64);
+        psVectorSet(kernel->solution2, 0, 1.0);
         psVectorSet(kernel->solution2, 1, 1.0);
-        psVectorSet(kernel->solution1, 2, 1.0);
-        psVectorSet(kernel->solution1, 3, 1.0);
+        psVectorSet(kernel->solution2, 2, 1.0);
         
         options->kernels->data[i] = kernels;
@@ -80 +80 @@
         }
     }
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Unable to concatenate inspection lists.");
         return false;