From 477b9fd50fbc4939011ab8cdb08176b0e6892586 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 3 Dec 2013 16:52:31 +0000 Subject: [PATCH] --- coders/jpeg.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/coders/jpeg.c b/coders/jpeg.c index 721a07ccd..6436983bc 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -1339,13 +1339,10 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, break; if (jpeg_info.data_precision > 8) { -#define JPEGRange(bits) \ - ((unsigned long) (0x01UL << (bits-1))+((0x01UL << (bits-1))-1)) - unsigned short scale; - scale=65535U/JPEGRange(jpeg_info.data_precision); + scale=65535U/GetQuantumRange(jpeg_info.data_precision); if (jpeg_info.output_components == 1) for (x=0; x < (ssize_t) image->columns; x++) { @@ -2621,7 +2618,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, return(MagickFalse); } scanline[0]=(JSAMPROW) jpeg_pixels; - scale=65535U/JPEGRange(jpeg_info.data_precision); + scale=65535U/GetQuantumRange(jpeg_info.data_precision); if (jpeg_info.data_precision <= 8) { if ((jpeg_info.in_color_space == JCS_RGB) || -- 2.40.0