]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/1298
authorCristy <urban-warrior@imagemagick.org>
Sun, 30 Sep 2018 19:29:40 +0000 (15:29 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sun, 30 Sep 2018 19:29:40 +0000 (15:29 -0400)
MagickCore/composite.c
MagickCore/morphology.c

index 1dd6bb8de4900c3d0671281b7b3a4c4bb7a8c8f4..56fba7345f636077903a26c9437c2205d6e545f0 100644 (file)
@@ -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:
         {
index 3e6259cb8f03a2e0f3d1f8b5f9808cc2037854e6..258432562a496e616c53eba7e7d17f5be96345e3 100644 (file)
@@ -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];