From: cristy Date: Thu, 17 Jan 2013 18:17:37 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4424 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ecff33aabbbf21894de998f4ba40e9cb2262673;p=imagemagick --- diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h index 69cc5a98c..aebe3c95c 100644 --- a/MagickCore/thread-private.h +++ b/MagickCore/thread-private.h @@ -32,8 +32,10 @@ extern "C" { #define magick_threads(source,destination,chunk,expression) \ num_threads((expression) == 0 ? 1 : \ ((chunk) > (16*GetMagickResourceLimit(ThreadResource))) && \ - (GetImagePixelCacheType(source) != DiskCache) && \ - (GetImagePixelCacheType(destination) != DiskCache) ? \ + ((GetImagePixelCacheType(source) == MemoryCache) || \ + (GetImagePixelCacheType(source) == MapCache)) && \ + ((GetImagePixelCacheType(destination) == MemoryCache) || \ + (GetImagePixelCacheType(destination) == MapCache)) ? \ GetMagickResourceLimit(ThreadResource) : \ GetMagickResourceLimit(ThreadResource) < 2 ? 1 : 2)