Changeset 19252

Timestamp:

Aug 27, 2008, 5:10:37 PM (18 years ago)

Author:

Paul Price

Message:

Only wait for the thread pool if we're threaded. Otherwise we can end
up in trouble by calling a psThreadPoolWait from within a thread!

File:

• trunk/psLib/src/imageops/psImageConvolve.c (modified) (3 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2008-08-14 03:22:13 $
+/// @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2008-08-28 03:10:37 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -950 +950 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (threaded && !psThreadPoolWait(true)) {
         psError(PS_ERR_UNKNOWN, false, "Error waiting for threads.");
         psFree(conv);
@@ -989 +989 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (threaded && !psThreadPoolWait(true)) {
         psError(PS_ERR_UNKNOWN, false, "Error waiting for threads.");
         psFree(conv);