From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 6 May 2012 01:37:19 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5655
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ced47f972aef8642772a7392cd3936fdce71067;p=imagemagick

---

diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h
index 97a783a41..8094613f4 100644
--- a/MagickCore/thread-private.h
+++ b/MagickCore/thread-private.h
@@ -24,16 +24,17 @@ extern "C" {
 
 #include <MagickCore/thread_.h>
 
-#define ThreadThreshold  64
-#define IsConcurrent(columns,rows) \
-  if (((((columns) > ThreadThreshold) || ((rows) > ThreadThreshold))) && \
-      ((MagickSizeType) (columns*rows) > (ThreadThreshold*ThreadThreshold))) \
-   num_threads(GetMagickResourceLimit(ThreadResource))
-#define IsConcurrentExp(columns,rows,expression) \
-  if (((((columns) > ThreadThreshold) || ((rows) > ThreadThreshold))) && \
-      ((MagickSizeType) (columns*rows) > (ThreadThreshold*ThreadThreshold)) && \
-      (expression)) \
-   num_threads(GetMagickResourceLimit(ThreadResource))
+#define IsConcurrentColors(colors,threshold) \
+  if ((colors) > 256) \
+    num_threads(GetMagickResourceLimit(ThreadResource))
+#define IsConcurrentArea(columns,rows,threshold) \
+  if (((((columns) > 64) || ((rows) > 64))) && \
+      ((MagickSizeType) (columns*rows) > (64*64))) \
+    num_threads(GetMagickResourceLimit(ThreadResource))
+#define IsConcurrentAreaExp(columns,rows,threshold,expression) \
+  if (((((columns) > 64) || ((rows) > 64))) && \
+      ((MagickSizeType) (columns*rows) > (64*64)) && (expression)) \
+    num_threads(GetMagickResourceLimit(ThreadResource))
 
 #if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR > 10))
 #define MagickCachePrefetch(address,mode,locality) \