Changeset 33093 for trunk

Timestamp:

Jan 11, 2012, 11:38:10 AM (15 years ago)

Author:

bills

Message:

missed adding new argument to a couple of calls to psThreadPoolWait

Location:

trunk

Files:

• ppMerge/src/ppMergeLoop.c (modified) (1 diff)
• ppStack/src/ppStackCombineFinal.c (modified) (1 diff)
• ppStack/src/ppStackCombineInitial.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeLoop.c

@@ -382 +382 @@
 
             // Wait for the threads to finish and manage results
-            if (!psThreadPoolWait(false)) {
+            if (!psThreadPoolWait(false, true)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to combine images.");
                 return false;

trunk/ppStack/src/ppStackCombineFinal.c

@@ -71 +71 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Unable to do final combination.");
         psFree(reject);

trunk/ppStack/src/ppStackCombineInitial.c

@@ -46 +46 @@
     }
 
-    if (!psThreadPoolWait(false)) {
+    if (!psThreadPoolWait(false, true)) {
         psError(psErrorCodeLast(), false, "Unable to do initial combination.");
         return false;