...

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 0458cfddeb0b82220763bb016a3fa21381830667..ecfe063ebb371e5c56193aeeb80d26fe8b9104e9 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -6290,14 +6290,15 @@ MagickExport ChannelType SetPixelChannelMask(Image *image,
             SetPixelChannelTraits(image,channel,CopyPixelTrait);
             continue;
           }
+        SetPixelChannelTraits(image,channel,UpdatePixelTrait);
+        continue;
+      }
+    if (image->alpha_trait != UndefinedPixelTrait)
+      {
+        SetPixelChannelTraits(image,channel,(const PixelTrait)
+          (UpdatePixelTrait | BlendPixelTrait));
+        continue;
       }
-    else
-      if (image->alpha_trait != UndefinedPixelTrait)
-        {
-          SetPixelChannelTraits(image,channel,(const PixelTrait)
-            (UpdatePixelTrait | BlendPixelTrait));
-          continue;
-        }
     SetPixelChannelTraits(image,channel,UpdatePixelTrait);
   }
   if (image->storage_class == PseudoClass)

diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index bd8707d951bc881ef1f9395d05772f1405169d92..21478732303819095d3de23dc517468415fc281f 100644 (file)
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -60,7 +60,7 @@ typedef enum
   RGBChannels = 0x0200,      /* set alpha from grayscale mask in RGB */
   GrayChannels = 0x0400,
   SyncChannels = 0x20000,    /* channels modified as a single unit */
-  DefaultChannels = AllChannels
+  DefaultChannels = (AllChannels &~ AlphaChannel)
 } ChannelType;  /* must correspond to PixelChannel */
 
 typedef enum