From: Cristy <urban-warrior@imagemagick.org>
Date: Fri, 11 Aug 2017 15:33:59 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.6-7~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=120f7dfecac50e311525246e1849d3500cd33715;p=imagemagick

...
---

diff --git a/coders/gif.c b/coders/gif.c
index a08e5d95b..ab2d76e8d 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -541,9 +541,9 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image,
     Emit a code. \
   */ \
   if (bits > 0) \
-    datum|=(code) << bits; \
+    datum|=(size_t) (code) << bits; \
   else \
-    datum=code; \
+    datum=(size_t) (code); \
   bits+=number_bits; \
   while (bits >= 8) \
   { \
@@ -702,7 +702,7 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image,
           if (next_pixel != MagickFalse)
             continue;
         }
-      GIFOutputCode((size_t) waiting_code);
+      GIFOutputCode(waiting_code);
       if (free_code < MaxGIFTable)
         {
           hash_code[k]=(short) free_code++;
@@ -772,7 +772,7 @@ static MagickBooleanType EncodeImage(const ImageInfo *image_info,Image *image,
   /*
     Flush out the buffered code.
   */
-  GIFOutputCode((size_t) waiting_code);
+  GIFOutputCode(waiting_code);
   GIFOutputCode(end_of_information_code);
   if (bits > 0)
     {
@@ -1066,8 +1066,8 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception)
               Read graphics control extension.
             */
             while (ReadBlobBlock(image,buffer) != 0) ;
-            dispose=(size_t) (buffer[0] >> 2);
-            delay=(size_t) ((buffer[2] << 8) | buffer[1]);
+            dispose=(size_t) buffer[0] >> 2;
+            delay=((size_t) buffer[2] << 8) | buffer[1];
             if ((ssize_t) (buffer[0] & 0x01) == 0x01)
               opacity=(ssize_t) buffer[3];
             break;
@@ -1111,7 +1111,7 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception)
             if (loop != MagickFalse)
               while (ReadBlobBlock(image,buffer) != 0)
               {
-                iterations=(size_t) ((buffer[2] << 8) | buffer[1]);
+                iterations=((size_t) buffer[2] << 8) | buffer[1];
                 if (iterations != 0)
                   iterations++;
               }
@@ -1740,7 +1740,8 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image,
             (void) WriteBlob(image,11,(unsigned char *) "NETSCAPE2.0");
             (void) WriteBlobByte(image,(unsigned char) 0x03);
             (void) WriteBlobByte(image,(unsigned char) 0x01);
-            (void) WriteBlobLSBShort(image,(unsigned short) (image->iterations ? image->iterations - 1 : 0));
+            (void) WriteBlobLSBShort(image,(unsigned short) (image->iterations ?
+              image->iterations-1 : 0));
             (void) WriteBlobByte(image,(unsigned char) 0x00);
           }
         if ((image->gamma != 1.0f/2.2f))
diff --git a/configure b/configure
index fe4cd09c0..227d44e76 100755
--- a/configure
+++ b/configure
@@ -4530,7 +4530,7 @@ MAGICK_PATCHLEVEL_VERSION=7
 
 MAGICK_VERSION=7.0.6-7
 
-MAGICK_GIT_REVISION=20776:001ab5627:20170810
+MAGICK_GIT_REVISION=20786:4d032390d:20170811
 
 
 # Substitute library versioning