From bed32e2740deacf3f3818e376c0f0c6e52827387 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 28 Sep 2014 13:45:26 +0000 Subject: [PATCH] --- MagickCore/channel.c | 2 +- MagickCore/morphology.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) 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; -- 2.40.0