(no commit message)

diff --git a/coders/palm.c b/coders/palm.c
index 4744945e181a678d258510e2fb6f8b1abd216d1f..9a0b45f9057afe166c0ee40d52ac560f2ef9d5b3 100644 (file)
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -883,7 +883,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info,
                 MagickMax(1*image->colors-1,1));
             byte|=color << bit;
             if (bit != 0)
-              bit-=(ssize_t) bits_per_pixel;
+              bit-=(unsigned char) bits_per_pixel;
             else
               {
                 *ptr++=byte;

diff --git a/coders/png.c b/coders/png.c
index 184460d61b8092cfaf757052ad5d5d03b0cf9f95..4d1304ad81611eb0d6d572f57bed3b1c75c461e8 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -2279,8 +2279,12 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
       ((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ||
       ((int) ping_color_type == PNG_COLOR_TYPE_GRAY))
     {
+      size_t
+        one;
+
       image->storage_class=PseudoClass;
-      image->colors=1UL << ping_bit_depth;
+      one=1;
+      image->colors=one << ping_bit_depth;
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
       if (image->colors > 256)
         image->colors=256;
@@ -7182,8 +7186,12 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
             /* color_type is PNG_COLOR_TYPE_PALETTE */
             if (!mng_info->write_png_depth)
               {
+                size_t
+                  one;
+
                 ping_bit_depth=1;
-                while ((1UL << ping_bit_depth) < number_colors)
+                one=1;
+                while ((one << ping_bit_depth) < number_colors)
                   ping_bit_depth <<= 1;
               }
             ping_num_trans=0;