From: cristy Date: Sun, 7 Apr 2013 01:31:35 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~3924 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=762e8c0753fadffc6d69ffaafc3f1405ef310fc9;p=imagemagick --- diff --git a/coders/jpeg.c b/coders/jpeg.c index 313e278f4..ab8b455bb 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -2608,28 +2608,31 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, } else if (jpeg_info.in_color_space == JCS_GRAYSCALE) - for (y=0; y < (ssize_t) image->rows; y++) { - register const Quantum - *p; - - register ssize_t - x; - - p=GetVirtualPixels(image,0,y,image->columns,1,exception); - if (p == (const Quantum *) NULL) - break; - q=jpeg_pixels; - for (x=0; x < (ssize_t) image->columns; x++) + image->intensity=Rec709LumaPixelIntensityMethod; + for (y=0; y < (ssize_t) image->rows; y++) { - *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelIntensity(image,p)); - p+=GetPixelChannels(image); + register const Quantum + *p; + + register ssize_t + x; + + p=GetVirtualPixels(image,0,y,image->columns,1,exception); + if (p == (const Quantum *) NULL) + break; + q=jpeg_pixels; + for (x=0; x < (ssize_t) image->columns; x++) + { + *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelIntensity(image,p)); + p+=GetPixelChannels(image); + } + (void) jpeg_write_scanlines(&jpeg_info,scanline,1); + status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y, + image->rows); + if (status == MagickFalse) + break; } - (void) jpeg_write_scanlines(&jpeg_info,scanline,1); - status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y, - image->rows); - if (status == MagickFalse) - break; } else for (y=0; y < (ssize_t) image->rows; y++)