(no commit message)

diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h
index 4a704bde7eb2bd8d90825606293434e32270db12..566c024719aa0af62302c12f39196d16bb4dda44 100644 (file)
--- 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 7a4d8ef39e508cf57a920a548b10d21f40a52fb8..e0c77d5e6cebab410a7b4c47a9db7ff71c897c69 100644 (file)
--- 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 },