From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 5 Jun 2015 21:41:27 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~962
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0f5f0e78370308e0249ceac7fcada76b154e211;p=imagemagick

---

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index ccc1521ed..1be01b6aa 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -306,9 +306,11 @@ static inline MagickRealType GetPixelLuminance(const Image *restrict image,
         0.072186f*gamma*pixel[image->channel_map[BluePixelChannel].offset];
       return(intensity);
     }
-  intensity=0.212656f*DecodePixelGamma(gamma*pixel[image->channel_map[RedPixelChannel].offset])+
-    0.715158f*DecodePixelGamma(gamma*pixel[image->channel_map[GreenPixelChannel].offset])+
-    0.072186f*DecodePixelGamma(gamma*pixel[image->channel_map[BluePixelChannel].offset]);
+  intensity=0.212656f*DecodePixelGamma(gamma*
+    pixel[image->channel_map[RedPixelChannel].offset])+0.715158f*
+    DecodePixelGamma(gamma*pixel[image->channel_map[GreenPixelChannel].offset])+
+    0.072186f*DecodePixelGamma(gamma*
+    pixel[image->channel_map[BluePixelChannel].offset]);
   return(intensity);
 }
 
@@ -526,12 +528,13 @@ static inline MagickBooleanType IsPixelMonochrome(const Image *restrict image,
     red_green;
 
   red=(MagickRealType) pixel[image->channel_map[RedPixelChannel].offset];
-  if ((AbsolutePixelValue(red) >= MagickEpsilon) ||
+  if ((AbsolutePixelValue(red) >= MagickEpsilon) &&
       (AbsolutePixelValue(red-QuantumRange) >= MagickEpsilon))
     return(MagickFalse);
   red_green=(MagickRealType) pixel[image->channel_map[RedPixelChannel].offset]-
     pixel[image->channel_map[GreenPixelChannel].offset];
-  green_blue=(MagickRealType) pixel[image->channel_map[GreenPixelChannel].offset]-
+  green_blue=(MagickRealType)
+    pixel[image->channel_map[GreenPixelChannel].offset]-
     pixel[image->channel_map[BluePixelChannel].offset];
   if ((AbsolutePixelValue(red_green) < MagickEpsilon) &&
       (AbsolutePixelValue(green_blue) < MagickEpsilon))