(no commit message)

diff --git a/coders/gif.c b/coders/gif.c
index cf904549404f3b1217f23dab8eb8f85f7302f4c4..a72a9741251e1897faf63414a3bd42e371415497 100644 (file)
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -295,12 +295,12 @@ static inline int GetNextLZWCode(LZWInfo *lzw_info,const size_t bits)
   return(code);
 }
 
-static inline ssize_t PopLZWStack(LZWStack *stack_info)
+static inline int PopLZWStack(LZWStack *stack_info)
 {
   if (stack_info->index <= stack_info->codes)
     return(-1);
   stack_info->index--;
-  return((ssize_t) *stack_info->index);
+  return((int) *stack_info->index);
 }
 
 static inline void PushLZWStack(LZWStack *stack_info,const size_t value)
@@ -673,7 +673,7 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image,
     indexes=GetVirtualIndexQueue(image);
     if (y == 0)
       waiting_code=(short) (*indexes);
-    for (x=(y == 0) ? 1 : 0; x < (ssize_t) image->columns; x++)
+    for (x=(ssize_t) (y == 0 ? 1 : 0); x < (ssize_t) image->columns; x++)
     {
       /*
         Probe hash table.

diff --git a/coders/miff.c b/coders/miff.c
index 561f7c02863e2fc0d2288263339477a8b6176f87..619dd61e1f35a4d132a33f917ef61d7b3f983e15 100644 (file)
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -927,7 +927,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
               {
                 if (LocaleCompare(keyword,"ticks-per-second") == 0)
                   {
-                    image->ticks_per_second=StringToLong(options);
+                    image->ticks_per_second=(ssize_t) StringToLong(options);
                     break;
                   }
                 if (LocaleCompare(keyword,"tile-offset") == 0)

diff --git a/magick/quantize.c b/magick/quantize.c
index b1a7413e1bcaac289a9ea10154a0d69ae2ca1dc6..00e2882dc86d956da6a9f7a3656df622cf407663 100644 (file)
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -1362,12 +1362,12 @@ static inline ssize_t CacheOffset(CubeInfo *cube_info,
     offset;
 
   offset=(ssize_t)
-    RedShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->red))) |
+    (RedShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->red))) |
     GreenShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->green))) |
-    BlueShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->blue)));
+    BlueShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->blue))));
   if (cube_info->associate_alpha != MagickFalse)
-    offset|=
-      AlphaShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->opacity)));
+    offset|=AlphaShift(ScaleQuantumToChar(ClampToUnsignedQuantum(
+      pixel->opacity)));
   return(offset);
 }
 
@@ -2469,9 +2469,6 @@ static MagickBooleanType DirectToColormapImage(Image *image,
   CacheView
     *image_view;
 
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
@@ -2481,6 +2478,9 @@ static MagickBooleanType DirectToColormapImage(Image *image,
   size_t
     number_colors;
 
+  ssize_t
+    y;
+
   status=MagickTrue;
   number_colors=(size_t) (image->columns*image->rows);
   if (AcquireImageColormap(image,number_colors) == MagickFalse)