From 2032fc958e4b59ef2d3358f75fad09da9fa2c855 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 30 Dec 2012 22:17:37 +0000 Subject: [PATCH] --- MagickCore/thread-private.h | 5 +++-- tests/validate.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h index 4a704bde7..566c02471 100644 --- a/MagickCore/thread-private.h +++ b/MagickCore/thread-private.h @@ -34,8 +34,9 @@ extern "C" { if (((rows) > WorkloadThreshold()) && (expression)) \ num_threads((source) != (destination) ? \ GetMagickResourceLimit(ThreadResource) : \ - GetImagePixelCacheType(source) == DiskCache ? 2 : \ - GetMagickResourceLimit(ThreadResource)) + GetImagePixelCacheType(source) != DiskCache ? \ + GetMagickResourceLimit(ThreadResource) : \ + GetMagickResourceLimit(ThreadResource) < 2 ? 1 : 2) #define magick_schedule(type,chunk) \ schedule(type,(chunk) < 1 ? 1 : (chunk)) diff --git a/tests/validate.h b/tests/validate.h index 7a4d8ef39..e0c77d5e6 100644 --- a/tests/validate.h +++ b/tests/validate.h @@ -355,6 +355,7 @@ static const struct ReferenceFormats #endif { "YUV", UndefinedCompression, 0.0 }, { "YCbCr", UndefinedCompression, 0.0 }, + { "YCbCrA", UndefinedCompression, 0.0 }, #if defined(MAGICKCORE_GS_DELEGATE) { "AI", UndefinedCompression, 0.0 }, { "EPDF", UndefinedCompression, 0.0 }, -- 2.50.1