Changeset 8652

Timestamp:

07/11/12 19:59:00 (10 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk/MagickCore

Files:

• enhance.c (modified) (1 diff)
• threshold.c (modified) (1 diff)

ImageMagick/trunk/MagickCore/enhance.c

@@ -1085 +1085 @@
     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);
     }

ImageMagick/trunk/MagickCore/threshold.c

@@ -438 +438 @@
         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);