From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 25 Oct 2014 22:24:51 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1844
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e7d8e96737e595b38f70506cde097d56ab4c3eb;p=imagemagick

---

diff --git a/coders/jpeg.c b/coders/jpeg.c
index bac0ba134..2df246983 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1125,7 +1125,8 @@ static Image *ReadJPEGImage(const ImageInfo *image_info,
     image->units=PixelsPerCentimeterResolution;
   number_pixels=(MagickSizeType) image->columns*image->rows;
   option=GetImageOption(image_info,"jpeg:size");
-  if (option != (const char *) NULL)
+  if ((option != (const char *) NULL) &&
+      (jpeg_info.out_color_space != JCS_YCbCr))
     {
       double
         scale_factor;