From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 26 Mar 2017 15:31:52 +0000 (-0400)
Subject: https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31650
X-Git-Tag: 7.0.5-5~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe8147f178da334fb208976c8a7a184ade755114;p=imagemagick

https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31650
---

diff --git a/ChangeLog b/ChangeLog
index b97c7c5f1..f183f5ad2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-03-26  7.0.5-5 Cristy  <quetzlzacatenango@image...>
+  * Morphology thinning is no longer a no-op (reference
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31650).
+  * Patch two PCD writer problems, corrupt output and dark pixels (reference
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=3164).
+
 2017-03-24  7.0.5-4 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.5-4, GIT revision 19754:350fff3:20170324.
 
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 3b38779b0..8ea841bc0 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -507,7 +507,7 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string,
       if (kernel_cache == (char *) NULL)
         return((KernelInfo *) NULL);
       p=(const char *) kernel_cache;
-    }    
+    }
   kernel=NULL;
   while (GetNextToken(p,(const char **) NULL,MagickPathExtent,token), *token != '\0')
   {
@@ -2875,19 +2875,17 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image,
         switch (method)
         {
           case ConvolveMorphology: pixel=bias; break;
-          case HitAndMissMorphology: pixel=(double) QuantumRange; break;
-          case ThinningMorphology: pixel=(double) QuantumRange; break;
-          case ThickenMorphology: pixel=(double) QuantumRange; break;
-          case ErodeMorphology: pixel=(double) QuantumRange; break;
-          case DilateMorphology: pixel=0.0; break;
+          case DilateMorphology:
           case ErodeIntensityMorphology:
-          case DilateIntensityMorphology:
-          case IterativeDistanceMorphology:
+          {
+            pixel=0.0;
+            break;
+          }
+          default:
           {
             pixel=(double) p[center+i];
             break;
           }
-          default: pixel=0; break;
         }
         gamma=1.0;
         switch (method)