Changeset 33638 for branches/eam_branches/ipp-20111122/ppMerge/src/ppMergeLoop.c

Timestamp:

Mar 30, 2012, 2:49:37 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20111122/ppMerge/src/ppMergeLoop.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/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;