From c2bcbed32af61f4e70a9d23e6da16f9fe51c034b Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 6 Mar 2019 19:49:59 -0500 Subject: [PATCH] Clean up compiler warnings --- ChangeLog | 4 ++++ MagickCore/draw.c | 2 +- coders/gif.c | 2 +- coders/heic.c | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3da2d59af..e18b71104 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2019-03-06 7.0.8-33 Cristy + * 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 * Release ImageMagick version 7.0.8-32, GIT revision 15386:58d9c4692:20190305 diff --git a/MagickCore/draw.c b/MagickCore/draw.c index a7df289f0..ff96a47ca 100644 --- 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 24781a117..f849959cd 100644 --- 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 154a111ca..3c5d8e9bf 100644 --- 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)); -- 2.40.0