From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 28 Sep 2014 13:45:26 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1969
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bed32e2740deacf3f3818e376c0f0c6e52827387;p=imagemagick

---

diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 57cde8f3d..58cb1578e 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -5,7 +5,7 @@
 %                                                                             %
 %               CCCC  H   H   AAA   N   N  N   N  EEEEE   L                   %
 %              C      H   H  A   A  NN  N  NN  N  E       L                   %
-%              C      HHHHH  AAAAA  N N N  N N N  RRR     L                   %
+%              C      HHHHH  AAAAA  N N N  N N N  EEE     L                   %
 %              C      H   H  A   A  N  NN  N  NN  E       L                   %
 %               CCCC  H   H  A   A  N   N  N   N  EEEEE   LLLLL               %
 %                                                                             %
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 4163839bb..4cd450e64 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -2710,8 +2710,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
             if ((traits == UndefinedPixelTrait) ||
                 (morphology_traits == UndefinedPixelTrait))
               continue;
-            if (((morphology_traits & CopyPixelTrait) != 0) ||
-                (GetPixelReadMask(image,p+center) == 0))
+            if (GetPixelReadMask(image,p+center) == 0)
               {
                 SetPixelChannel(morphology_image,channel,p[center+i],q);
                 continue;
@@ -2866,8 +2865,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
         if ((traits == UndefinedPixelTrait) ||
             (morphology_traits == UndefinedPixelTrait))
           continue;
-        if (((morphology_traits & CopyPixelTrait) != 0) ||
-            (GetPixelReadMask(image,p+center) == 0))
+        if (GetPixelReadMask(image,p+center) == 0)
           {
             SetPixelChannel(morphology_image,channel,p[center+i],q);
             continue;