From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 22 May 2012 11:32:23 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5556
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36fc5502b94714181b3919182cb7d65cad841b8d;p=imagemagick

---

diff --git a/coders/jpeg.c b/coders/jpeg.c
index 163f2199a..02d86eddc 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1067,14 +1067,6 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
       (image_info->colorspace == Rec601YCbCrColorspace) ||
       (image_info->colorspace == Rec709YCbCrColorspace))
     jpeg_info.out_color_space=JCS_YCbCr;
-  if (IsITUFaxImage(image) != MagickFalse)
-    {
-      SetImageColorspace(image,LabColorspace,exception);
-      jpeg_info.out_color_space=JCS_YCbCr;
-    }
-  else
-    if (jpeg_info.out_color_space == JCS_CMYK)
-      SetImageColorspace(image,CMYKColorspace,exception);
   /*
     Set image resolution.
   */
@@ -1219,6 +1211,11 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
       break;
     }
   }
+  if (IsITUFaxImage(image) != MagickFalse)
+    {
+      SetImageColorspace(image,LabColorspace,exception);
+      jpeg_info.out_color_space=JCS_YCbCr;
+    }
   option=GetImageOption(image_info,"jpeg:colors");
   if (option != (const char *) NULL)
     if (AcquireImageColormap(image,StringToUnsignedLong(option),exception)