From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 30 Sep 2018 19:29:40 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1298
X-Git-Tag: 7.0.8-13~78
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=870dd03b2f1371310645cb74521772eecd604b92;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1298
---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 1dd6bb8de..56fba7345 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -1415,7 +1415,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
         case ColorBurnCompositeOp:
         case ColorDodgeCompositeOp:
         case DarkenCompositeOp:
-        case DifferenceCompositeOp:
         case DivideDstCompositeOp:
         case DivideSrcCompositeOp:
         case ExclusionCompositeOp:
@@ -1467,6 +1466,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
           alpha=Da*(1.0-Sa);
           break;
         }
+        case DifferenceCompositeOp:
         case OutCompositeOp:
         case SrcOutCompositeOp:
         {
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 3e6259cb8..258432562 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -2880,13 +2880,23 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
         minimum=(double) QuantumRange;
         switch (method)
         {
-          case ConvolveMorphology: pixel=bias; break;
+          case ConvolveMorphology:
+          {
+            pixel=bias;
+            break;
+          }
           case DilateMorphology:
           case ErodeIntensityMorphology:
           {
             pixel=0.0;
             break;
           }
+          case HitAndMissMorphology:
+          case ErodeMorphology:
+          {
+            pixel=QuantumRange;
+            break;
+          }
           default:
           {
             pixel=(double) p[center+i];