(no commit message)

diff --git a/coders/bmp.c b/coders/bmp.c
index d8e4ff85d03c544298d94a95c91fee91c35962ef..4f31b8123197c2f60721478e781284ebe032d74c 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -988,6 +988,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
             bmp_info.blue_mask=0x0000001fU;
           }
       }
+    (void) ResetMagickMemory(&shift,0,sizeof(shift));
+    (void) ResetMagickMemory(&quantum_bits,0,sizeof(quantum_bits));
     if ((bmp_info.bits_per_pixel == 16) || (bmp_info.bits_per_pixel == 32))
       {
         register size_t
@@ -996,8 +998,6 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
         /*
           Get shift and quantum bits info from bitfield masks.
         */
-        (void) ResetMagickMemory(&shift,0,sizeof(shift));
-        (void) ResetMagickMemory(&quantum_bits,0,sizeof(quantum_bits));
         if (bmp_info.red_mask != 0)
           while (((bmp_info.red_mask << shift.red) & 0x80000000UL) == 0)
             shift.red++;

diff --git a/coders/dib.c b/coders/dib.c
index 1d713a1b86a9f01a3167520344c48a97b2f52cce..a73620e4f72549833aef01b355ec2442f3e693e1 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -538,7 +538,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
       (dib_info.bits_per_pixel != 24) && (dib_info.bits_per_pixel != 32))
     ThrowReaderException(CorruptImageError,"UnrecognizedBitsPerPixel");
   if (dib_info.bits_per_pixel < 16 &&
-      dib_info.number_colors > (1U << dib_info.bits_per_pixel))
+      dib_info.number_colors > (1UL << dib_info.bits_per_pixel))
     ThrowReaderException(CorruptImageError,"UnrecognizedNumberOfColors");
   if ((dib_info.compression == 1) && (dib_info.bits_per_pixel != 8))
     ThrowReaderException(CorruptImageError,"UnrecognizedBitsPerPixel");

diff --git a/coders/jp2.c b/coders/jp2.c
index 0ec43c605fc9b5e25408fe1393fce40602ce031f..2babd13bf35166e0e999802e498460e2e1daa510 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -815,7 +815,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image,
   */
   opj_set_default_encoder_parameters(&parameters);
   for (i=1; i < 6; i++)
-    if (((1U << (i+2)) > image->columns) && ((1U << (i+2)) > image->rows))
+    if (((1UL << (i+2)) > image->columns) && ((1UL << (i+2)) > image->rows))
       break;
   parameters.numresolution=i;
   option=GetImageOption(image_info,"jp2:number-resolutions");

diff --git a/coders/jpeg.c b/coders/jpeg.c
index b280dbd6083fff014da2a1a6fd3d4bde32ac1b60..c7246c623288e109144836012bbd7c26b7d646af 100644 (file)
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2415,7 +2415,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info,
               maximum=jpeg_image->quality-1;
             (void) RelinquishUniqueFileResource(jpeg_image->filename);
           }
-          quality=(int)minimum-1;
+          quality=(int) minimum-1;
           jpeg_image=DestroyImage(jpeg_image);
         }
       jpeg_info=DestroyImageInfo(jpeg_info);