]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sat, 25 Oct 2014 22:24:51 +0000 (22:24 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sat, 25 Oct 2014 22:24:51 +0000 (22:24 +0000)
coders/jpeg.c

index bac0ba1342ec20c5b103ec93f604891674689dd0..2df246983f8cf633e6161f70028629da5b900217 100644 (file)
@@ -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;