From b06434ebfd5c7087bb994d5f000234f12b9388c1 Mon Sep 17 00:00:00 2001
From: nicolas <nicolas@git.imagemagick.org>
Date: Mon, 10 Sep 2012 18:06:15 +0000
Subject: [PATCH]

---
 MagickCore/enhance.c | 84 +++++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 44 deletions(-)

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 0cf22ec00..b20883561 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -3312,8 +3312,10 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image,
 
   /*
     Side effect: clamps values unless contrast<MagickEpsilon, in which
-    case values are left alone.
+    case nothing is done.
   */
+  if (contrast<MagickEpsilon)
+    return(MagickTrue);
   /*
     Sigmoidal function with inflexion point moved to b and "slope
     constant" set to a.
@@ -3380,43 +3382,40 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image,
   */
   if (image->storage_class == PseudoClass)
     {
-      if (contrast>=MagickEpsilon)
+      register ssize_t
+	i;
+
+      if (sharpen != MagickFalse)
 	{
-	  register ssize_t
-	    i;
-
-	  if (sharpen != MagickFalse)
-	    {
-	      for (i=0; i < (ssize_t) image->colors; i++)
-	      {
-                if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
-                  image->colormap[i].red=ScaledSig(image->colormap[i].red);
-                if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
-                  image->colormap[i].green=ScaledSig(image->colormap[i].green);
-                if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
-                  image->colormap[i].blue=ScaledSig(image->colormap[i].blue);
-                if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
-                  image->colormap[i].alpha=ScaledSig(image->colormap[i].alpha);
-	      }
-            }
-	  else
-	    {
-	      for (i=0; i < (ssize_t) image->colors; i++)
-	      {
-                if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
-                  image->colormap[i].red=
-                    InverseScaledSig(image->colormap[i].red);
-                if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
-                  image->colormap[i].green=
-                    InverseScaledSig(image->colormap[i].green);
-                if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
-                  image->colormap[i].blue=
-                    InverseScaledSig(image->colormap[i].blue);
-                if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
-                  image->colormap[i].alpha=
-                    InverseScaledSig(image->colormap[i].alpha);
-	      }
-	    }
+	  for (i=0; i < (ssize_t) image->colors; i++)
+	  {
+	    if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
+	      image->colormap[i].red=ScaledSig(image->colormap[i].red);
+	    if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
+	      image->colormap[i].green=ScaledSig(image->colormap[i].green);
+	    if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
+	      image->colormap[i].blue=ScaledSig(image->colormap[i].blue);
+	    if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
+	      image->colormap[i].alpha=ScaledSig(image->colormap[i].alpha);
+	  }
+	}
+      else
+	{
+	  for (i=0; i < (ssize_t) image->colors; i++)
+	  {
+	    if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
+	      image->colormap[i].red=
+		InverseScaledSig(image->colormap[i].red);
+	    if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
+	      image->colormap[i].green=
+		InverseScaledSig(image->colormap[i].green);
+	    if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
+	      image->colormap[i].blue=
+		InverseScaledSig(image->colormap[i].blue);
+	    if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
+	      image->colormap[i].alpha=
+		InverseScaledSig(image->colormap[i].alpha);
+	  }
 	}
     }
   /*
@@ -3467,13 +3466,10 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image,
         traits=GetPixelChannelTraits(image,channel);
         if ((traits & UpdatePixelTrait) == 0)
           continue;
-	if (contrast>=MagickEpsilon)
-	  {
-	    if (sharpen != MagickFalse)
-	      q[i]=ScaledSig(q[i]);
-	    else
-	      q[i]=InverseScaledSig(q[i]);
-	  }
+	if (sharpen != MagickFalse)
+	  q[i]=ScaledSig(q[i]);
+	else
+	  q[i]=InverseScaledSig(q[i]);
       }
       q+=GetPixelChannels(image);
     }
-- 
2.40.0