From 63ffc9878577b7524d9a5ed488d434a255bf78bc Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 15 Oct 2017 08:35:30 -0400 Subject: [PATCH] ... --- MagickCore/thread-private.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h index 7eb748742..374e6a5f3 100644 --- a/MagickCore/thread-private.h +++ b/MagickCore/thread-private.h @@ -32,13 +32,13 @@ extern "C" { The limit is 2 if the pixel cache type is not memory or memory-mapped. */ #define magick_number_threads(source,destination,chunk,expression) \ - num_threads((((expression) != 0) && \ - ((GetImagePixelCacheType(source) == MemoryCache) || \ - (GetImagePixelCacheType(source) == MapCache)) && \ - ((GetImagePixelCacheType(destination) == MemoryCache) || \ - (GetImagePixelCacheType(destination) == MapCache))) ? \ - MagickMax(MagickMin((ssize_t) GetMagickResourceLimit(ThreadResource),(ssize_t) (chunk)/64),1) :\ - MagickMax(MagickMin(GetMagickResourceLimit(ThreadResource),2),1)) + num_threads((expression) == 0 ? 1 : \ + ((GetImagePixelCacheType(source) != MemoryCache) && \ + (GetImagePixelCacheType(source) != MapCache)) || \ + ((GetImagePixelCacheType(destination) != MemoryCache) && \ + (GetImagePixelCacheType(destination) != MapCache)) ? \ + MagickMax(MagickMin(GetMagickResourceLimit(ThreadResource),2),1) : \ + MagickMax(MagickMin((ssize_t) GetMagickResourceLimit(ThreadResource),(ssize_t) (chunk)/64),1)) #if defined(__clang__) || (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 10)) #define MagickCachePrefetch(address,mode,locality) \ -- 2.40.0