]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Tue, 3 Dec 2013 16:52:31 +0000 (16:52 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Tue, 3 Dec 2013 16:52:31 +0000 (16:52 +0000)
coders/jpeg.c

index 721a07ccdf67c1241a52e016678ece93b816d579..6436983bcebeca749374e889e51ed7726e436339 100644 (file)
@@ -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) ||