(no commit message)

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index cc297d51668a6cacef780fd053149ed06377f59c..cace10bdca6dcfb38c0fd5d83096624a25a67850 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1610,8 +1610,6 @@ MagickExport Image *EdgeImage(const Image *image,const double radius,
   }
   kernel_info->values[i/2]=(MagickRealType) (width*width-1.0);
   edge_image=ConvolveImage(image,kernel_info,exception);
-  if (edge_image != (Image *) NULL)
-    (void) ClampImage(edge_image,exception);
   kernel_info=DestroyKernelInfo(kernel_info);
   return(edge_image);
 }
@@ -3533,8 +3531,6 @@ MagickExport Image *SharpenImage(const Image *image,const double radius,
   }
   kernel_info->values[i/2]=(double) ((-2.0)*normalize);
   sharp_image=ConvolveImage(image,kernel_info,exception);
-  if (sharp_image != (Image *) NULL)
-    (void) ClampImage(sharp_image,exception);
   kernel_info=DestroyKernelInfo(kernel_info);
   return(sharp_image);
 }
@@ -3852,8 +3848,6 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius,
   }
   unsharp_image->type=image->type;
   unsharp_view=DestroyCacheView(unsharp_view);
-  if (unsharp_image != (Image *) NULL)
-    (void) ClampImage(unsharp_image,exception);
   image_view=DestroyCacheView(image_view);
   if (status == MagickFalse)
     unsharp_image=DestroyImage(unsharp_image);

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 75420331734c44354c9c6ecd9fc303fdd683c3ab..b15f9d6c1e3b6e07cddddb22920a49db623493d3 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -2272,8 +2272,6 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point,
       }
   }
   image_view=DestroyCacheView(image_view);
-  if (status != MagickFalse)
-    (void) ClampImage(image,exception);
   return(status);
 }
 \f

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index f67124c5a57b50fbdedbbd4b9848ce0d84cf572b..e559a60daaee29380328c6a19d6dba5b97567186 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -232,8 +232,8 @@ static inline double MagickMin(const double x,const double y)
   return(y);
 }
 
-static double ApplyEvaluateOperator(RandomInfo *random_info,
-  Quantum pixel,const MagickEvaluateOperator op,const double value)
+static double ApplyEvaluateOperator(RandomInfo *random_info,const Quantum pixel,
+  const MagickEvaluateOperator op,const double value)
 {
   double
     result;
@@ -283,8 +283,7 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,
     }
     case ExponentialEvaluateOperator:
     {
-      result=(double) (QuantumRange*exp((double) (value*QuantumScale*
-        pixel)));
+      result=(double) (QuantumRange*exp((double) (value*QuantumScale*pixel)));
       break;
     }
     case GaussianNoiseEvaluateOperator:
@@ -295,8 +294,8 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,
     }
     case ImpulseNoiseEvaluateOperator:
     {
-      result=(double) GenerateDifferentialNoise(random_info,pixel,
-        ImpulseNoise,value);
+      result=(double) GenerateDifferentialNoise(random_info,pixel,ImpulseNoise,
+        value);
       break;
     }
     case LaplacianNoiseEvaluateOperator:
@@ -313,8 +312,8 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,
     case LogEvaluateOperator:
     {
       if ((QuantumScale*pixel) >= MagickEpsilon)
-        result=(double) (QuantumRange*log((double) (QuantumScale*value*
-          pixel+1.0))/log((double) (value+1.0)));
+        result=(double) (QuantumRange*log((double) (QuantumScale*value*pixel+
+          1.0))/log((double) (value+1.0)));
       break;
     }
     case MaxEvaluateOperator:
@@ -355,14 +354,14 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,
     }
     case PoissonNoiseEvaluateOperator:
     {
-      result=(double) GenerateDifferentialNoise(random_info,pixel,
-        PoissonNoise,value);
+      result=(double) GenerateDifferentialNoise(random_info,pixel,PoissonNoise,
+        value);
       break;
     }
     case PowEvaluateOperator:
     {
-      result=(double) (QuantumRange*pow((double) (QuantumScale*pixel),
-        (double) value));
+      result=(double) (QuantumRange*pow((double) (QuantumScale*pixel),(double)
+        value));
       break;
     }
     case RightShiftEvaluateOperator:
@@ -393,8 +392,7 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,
     }
     case ThresholdEvaluateOperator:
     {
-      result=(double) (((double) pixel <= value) ? 0 :
-        QuantumRange);
+      result=(double) (((double) pixel <= value) ? 0 : QuantumRange);
       break;
     }
     case ThresholdBlackEvaluateOperator:
@@ -404,14 +402,13 @@ static double ApplyEvaluateOperator(RandomInfo *random_info,
     }
     case ThresholdWhiteEvaluateOperator:
     {
-      result=(double) (((double) pixel > value) ? QuantumRange :
-        pixel);
+      result=(double) (((double) pixel > value) ? QuantumRange : pixel);
       break;
     }
     case UniformNoiseEvaluateOperator:
     {
-      result=(double) GenerateDifferentialNoise(random_info,pixel,
-        UniformNoise,value);
+      result=(double) GenerateDifferentialNoise(random_info,pixel,UniformNoise,
+        value);
       break;
     }
     case XorEvaluateOperator: