(no commit message)

diff --git a/coders/jpeg.c b/coders/jpeg.c
index fdb04e22b6dcda74c33d2ac3df534171df400854..d9b502d27436d59b1aa76499842e28381421cdf9 100644 (file)
--- 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;
     }
   }