From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 24 May 2015 22:34:42 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1001
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90efa0a910ec27da486c2c2ed40778bb9a3e06d8;p=imagemagick

---

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 836976985..2810fa614 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -235,8 +235,6 @@ static inline MagickRealType GetPixelInfoLuma(const PixelInfo *restrict pixel)
   red=gamma*pixel->red;
   green=gamma*pixel->green;
   blue=gamma*pixel->blue;
-  if (pixel->colorspace == GRAYColorspace)
-    return(red);
   if (pixel->colorspace == sRGBColorspace)
     return(0.212656f*red+0.715158f*green+0.072186f*blue);
   red=EncodePixelGamma(red);
@@ -260,8 +258,6 @@ static inline MagickRealType GetPixelInfoLuminance(
   red=gamma*pixel->red;
   green=gamma*pixel->green;
   blue=gamma*pixel->blue;
-  if (pixel->colorspace == GRAYColorspace)
-    return(red);
   if (pixel->colorspace != sRGBColorspace)
     return(0.212656f*red+0.715158f*green+0.072186f*blue);
   red=DecodePixelGamma(red);
@@ -292,8 +288,6 @@ static inline MagickRealType GetPixelLuma(const Image *restrict image,
   red=gamma*pixel[image->channel_map[RedPixelChannel].offset];
   green=gamma*pixel[image->channel_map[GreenPixelChannel].offset];
   blue=gamma*pixel[image->channel_map[BluePixelChannel].offset];
-  if (image->colorspace == GRAYColorspace)
-    return(red);
   return(0.212656f*red+0.715158f*green+0.072186f*blue);
 }
 
@@ -313,8 +307,6 @@ static inline MagickRealType GetPixelLuminance(const Image *restrict image,
   red=gamma*pixel[image->channel_map[RedPixelChannel].offset];
   green=gamma*pixel[image->channel_map[GreenPixelChannel].offset];
   blue=gamma*pixel[image->channel_map[BluePixelChannel].offset];
-  if (image->colorspace == GRAYColorspace)
-    return(red);
   if (image->colorspace != sRGBColorspace)
     return(0.212656f*red+0.715158f*green+0.072186f*blue);
   red=DecodePixelGamma(red);