From 7d4f1818bd613cf0a75c1d5c0a9b7549d7e32c7c Mon Sep 17 00:00:00 2001 From: Cristy Date: Fri, 25 Sep 2015 08:58:21 -0400 Subject: [PATCH] Eliminate some minor compiler warnings --- MagickCore/blob.c | 2 +- MagickCore/image.c | 4 ++-- MagickCore/xml-tree.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MagickCore/blob.c b/MagickCore/blob.c index 6d0329cfc..f72931402 100755 --- a/MagickCore/blob.c +++ b/MagickCore/blob.c @@ -1048,7 +1048,7 @@ MagickExport void *FileToBlob(const char *filename,const size_t extent, blob[*length]='\0'; return(blob); } - *length=(size_t) MagickMin(offset,extent); + *length=(size_t) MagickMin(offset,(ssize_t) extent); blob=(unsigned char *) NULL; if (~(*length) >= (MagickPathExtent-1)) blob=(unsigned char *) AcquireQuantumMemory(*length+MagickPathExtent, diff --git a/MagickCore/image.c b/MagickCore/image.c index 2a6ba0294..34a53f1ee 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -1063,8 +1063,8 @@ MagickExport MagickBooleanType CopyImagePixels(Image *image, assert(geometry != (RectangleInfo *) NULL); assert(offset != (OffsetInfo *) NULL); if ((offset->x < 0) || (offset->y < 0) || - ((offset->x+geometry->width) > (ssize_t) image->columns) || - ((offset->y+geometry->height) > (ssize_t) image->rows)) + ((offset->x+(ssize_t) geometry->width) > (ssize_t) image->columns) || + ((offset->y+(ssize_t) geometry->height) > (ssize_t) image->rows)) ThrowBinaryException(OptionError,"GeometryDoesNotContainImage", image->filename); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c index d18907012..4f657af80 100644 --- a/MagickCore/xml-tree.c +++ b/MagickCore/xml-tree.c @@ -676,7 +676,7 @@ MagickPrivate char *FileToXML(const char *filename,const size_t extent) xml[length]='\0'; return(xml); } - length=(size_t) MagickMin(offset,extent); + length=(size_t) MagickMin(offset,(ssize_t) extent); xml=(char *) NULL; if (~length >= (MagickPathExtent-1)) xml=(char *) AcquireQuantumMemory(length+MagickPathExtent,sizeof(*xml)); -- 2.50.0