...

diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h
index 1b2e263c470dc23bc6dd2bfd7b8edad9184a8fce..0cb98e441507cd79d07bc98a531fde83aebad429 100644 (file)
--- a/MagickCore/thread-private.h
+++ b/MagickCore/thread-private.h
@@ -19,6 +19,7 @@
 #define MAGICKCORE_THREAD_PRIVATE_H
 
 #include "MagickCore/cache.h"
+#include "MagickCore/image-private.h"
 #include "MagickCore/resource_.h"
 #include "MagickCore/thread_.h"
 
@@ -30,12 +31,12 @@ extern "C" {
   Single threaded unless workload justifies the threading overhead.
 */
 #define magick_threads(source,destination,chunk,expression) \
-  num_threads((expression) != 0 && \
+  num_threads((((expression) != 0) && \
     ((GetImagePixelCacheType(source) == MemoryCache) || \
      (GetImagePixelCacheType(source) == MapCache)) && \
     ((GetImagePixelCacheType(destination) == MemoryCache) || \
-     (GetImagePixelCacheType(destination) == MapCache)) ? \
-    max(1,min(GetMagickResourceLimit(ThreadResource),(chunk) / 16)) : 1)
+     (GetImagePixelCacheType(destination) == MapCache))) ? \
+    MagickMax(1,MagickMin(GetMagickResourceLimit(ThreadResource),(chunk)/16)) : 1)
 
 #if defined(__clang__) || (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 10))
 #define MagickCachePrefetch(address,mode,locality) \