From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 16 Jan 2014 19:41:18 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2844
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c47ba2d623b80ce8ee29572ef7d0d438def36371;p=imagemagick

---

diff --git a/coders/jpeg.c b/coders/jpeg.c
index d9b502d27..0c85022f3 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2166,7 +2166,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
         (void) TransformImageColorspace(image,sRGBColorspace,exception);
       if (image_info->type == TrueColorType)
         break;
-      if (IsGrayImage(image,&image->exception) != MagickFalse)
+      if (IsImageGray(image,exception) != MagickFalse)
         {
           jpeg_info.input_components=1;
           jpeg_info.in_color_space=JCS_GRAYSCALE;
@@ -2174,12 +2174,6 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
       break;
     }
   }
-  if ((image_info->type != TrueColorType) &&
-      (IsImageGray(image,exception) != MagickFalse))
-    {
-      jpeg_info.input_components=1;
-      jpeg_info.in_color_space=JCS_GRAYSCALE;
-    }
   jpeg_set_defaults(&jpeg_info);
   if (jpeg_info.in_color_space == JCS_CMYK)
     jpeg_set_colorspace(&jpeg_info,JCS_YCCK);