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

---

diff --git a/coders/jpeg.c b/coders/jpeg.c
index fdb04e22b..d9b502d27 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2154,6 +2154,8 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     }
     case GRAYColorspace:
     {
+      if (image_info->type == TrueColorType)
+        break;
       jpeg_info.input_components=1;
       jpeg_info.in_color_space=JCS_GRAYSCALE;
       break;
@@ -2162,6 +2164,13 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
     {
       if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
         (void) TransformImageColorspace(image,sRGBColorspace,exception);
+      if (image_info->type == TrueColorType)
+        break;
+      if (IsGrayImage(image,&image->exception) != MagickFalse)
+        {
+          jpeg_info.input_components=1;
+          jpeg_info.in_color_space=JCS_GRAYSCALE;
+        }
       break;
     }
   }