Clean up compiler warnings

diff --git a/ChangeLog b/ChangeLog
index 3da2d59afe95c7a0b2cd6226ed0b2aa6c679dae0..e18b71104f81df6f9101a1a1444a098568025564 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-03-06  7.0.8-33 Cristy  <quetzlzacatenango@image...>
+  * Fix SVG conversion infinite loop (reference
+    https://imagemagick.org/discourse-server/viewtopic.php?f=3&t=35591).
+
 2019-03-05  7.0.8-32 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-32, GIT revision 15386:58d9c4692:20190305
 

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index a7df289f0d1ed715744958769254a00c92523661..ff96a47ca9ec7564fce239bd32ee8baa85409497 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -2501,7 +2501,7 @@ static MagickBooleanType RenderMVGContent(Image *image,
     {
       status=SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       if (status == MagickFalse)
-        return(status);
+        return(MagickFalse);
     }
   primitive=(char *) NULL;
   if (*draw_info->primitive != '@')

diff --git a/coders/gif.c b/coders/gif.c
index 24781a1171077956938bb45a83b8c3126fc4a006..f849959cd013a4b46eab8e1075de8f7d046bf29a 100644 (file)
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -1096,7 +1096,7 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception)
               if (count == 0)
                 break;
               buffer[count]='\0';
-              if (((ssize_t) count+offset+MagickPathExtent) >= (ssize_t) extent)
+              if ((ssize_t) (count+offset+MagickPathExtent) >= (ssize_t) extent)
                 {
                   extent<<=1;
                   comments=(char *) ResizeQuantumMemory(comments,extent+

diff --git a/coders/heic.c b/coders/heic.c
index 154a111caae655dfa31ccf32a783c5ffa263ef4b..3c5d8e9bfe3a9a9c714114aba76677f626a67758 100644 (file)
--- a/coders/heic.c
+++ b/coders/heic.c
@@ -269,7 +269,7 @@ static Image *ReadHEICImage(const ImageInfo *image_info,
                 }
             }
         }
-      exif_buffer=RelinquishMagickMemory(exif_buffer);
+      exif_buffer=(unsigned char *) RelinquishMagickMemory(exif_buffer);
   }
   /*
     Set image size
@@ -589,7 +589,7 @@ static struct heif_error heif_write_func(struct heif_context *ctx,const void* da
 
   (void) ctx;
   image=(Image*) userdata;
-  (void) WriteBlob(image,size,data);
+  (void) WriteBlob(image,size,(const unsigned char *) data);
   error_ok.code=heif_error_Ok;
   error_ok.subcode=heif_suberror_Unspecified;
   error_ok.message="ok";
@@ -710,7 +710,7 @@ static MagickBooleanType WriteHEICImage(const ImageInfo *image_info,Image *image
                 p));
               p+=GetPixelChannels(image);
 
-              if (x+1 < (long) image->columns)
+              if ((x+1) < (ssize_t) image->columns)
                 {
                   p_y[y*stride_y + x+1]=ScaleQuantumToChar(GetPixelRed(image,
                     p));