(no commit message)

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 34026ddb219162833c3d57fe29f9043bc6fbd5b6..ac9e17eb208658572fe7c89c9c527812e5a2f227 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -1084,11 +1084,19 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image,
       }
     for (x=0; x < (ssize_t) image->columns; x++)
     {
+      double
+        pixel;
+
       register ssize_t
         i;
 
+      pixel=(double) GetPixelIntensity(image,p);      
       for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
-        histogram[GetPixelChannels(image)*ScaleQuantumToMap(p[i])+i]++;
+      {
+        if (image->channel_mask != DefaultChannels)
+          pixel=p[i];
+        histogram[GetPixelChannels(image)*ScaleQuantumToMap(pixel)+i]++;
+      }
       p+=GetPixelChannels(image);
     }
   }

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 364f0f35cca9a35859474136f4b8c8d927d501cf..d01f079bd4f61035d19538ef934dc1110a9ffbd3 100644 (file)
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -437,7 +437,7 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold,
         traits=GetPixelChannelMapTraits(image,channel);
         if ((traits & UpdatePixelTrait) == 0)
           continue;
-        if (image->channel_mask == DefaultChannels)
+        if (image->channel_mask != DefaultChannels)
           pixel=q[i];
         q[i]=(Quantum) (pixel <= threshold ? 0 : QuantumRange);
       }