From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 13 May 2012 21:03:53 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5599
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93ff2ccd68ed252cdf2166ed23f0707d0b5a1bd7;p=imagemagick

---

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 75f2f11c9..163f2199a 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1195,10 +1195,30 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
   image->columns=jpeg_info.output_width;
   image->rows=jpeg_info.output_height;
   image->depth=(size_t) jpeg_info.data_precision;
-  if (jpeg_info.out_color_space == JCS_YCbCr)
-    SetImageColorspace(image,YCbCrColorspace,exception);
-  if (jpeg_info.out_color_space == JCS_CMYK)
-    SetImageColorspace(image,CMYKColorspace,exception);
+  switch (jpeg_info.out_color_space)
+  {
+    case JCS_RGB:
+    default:
+    {
+      SetImageColorspace(image,sRGBColorspace,exception);
+      break;
+    }
+    case JCS_GRAYSCALE:
+    {
+      SetImageColorspace(image,GRAYColorspace,exception);
+      break;
+    }
+    case JCS_YCbCr:
+    {
+      SetImageColorspace(image,YCbCrColorspace,exception);
+      break;
+    }
+    case JCS_CMYK:
+    {
+      SetImageColorspace(image,CMYKColorspace,exception);
+      break;
+    }
+  }
   option=GetImageOption(image_info,"jpeg:colors");
   if (option != (const char *) NULL)
     if (AcquireImageColormap(image,StringToUnsignedLong(option),exception)