]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Tue, 22 May 2012 11:32:23 +0000 (11:32 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Tue, 22 May 2012 11:32:23 +0000 (11:32 +0000)
coders/jpeg.c

index 163f2199a31471f7ca34d71738faffd6bdc22dcc..02d86eddc33204966ddeae742863d717d558b3bb 100644 (file)
@@ -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)