From bcc9f05ca9f41e585453557b2a65e9de45b38528 Mon Sep 17 00:00:00 2001 From: Cristy <urban-warrior@imagemagick.org> Date: Sat, 26 Sep 2015 19:21:38 -0400 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/41 --- MagickCore/attribute.c | 8 ++++---- MagickCore/blob.c | 2 +- MagickCore/histogram.c | 2 +- MagickCore/xml-tree.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 0f26c98a9..23104b8f4 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -608,7 +608,7 @@ MagickExport ImageType GetImageType(const Image *image) return(TrueColorAlphaType); return(TrueColorType); } - + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -689,7 +689,7 @@ MagickExport ImageType IdentifyImageGray(const Image *image, type=GrayscaleAlphaType; return(type); } - + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -767,7 +767,7 @@ MagickExport MagickBooleanType IdentifyImageMonochrome(const Image *image, return(MagickTrue); return(MagickFalse); } - + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -831,7 +831,7 @@ MagickExport ImageType IdentifyImageType(const Image *image, return(TrueColorAlphaType); return(TrueColorType); } - + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % diff --git a/MagickCore/blob.c b/MagickCore/blob.c index ef4a6a3f6..c4ec92b9e 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,(ssize_t) extent); + *length=(size_t) MagickMin(offset,extent); blob=(unsigned char *) NULL; if (~(*length) >= (MagickPathExtent-1)) blob=(unsigned char *) AcquireQuantumMemory(*length+MagickPathExtent, diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c index 9382676b4..64964ed4b 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -769,7 +769,7 @@ MagickExport MagickBooleanType IdentifyPaletteImage(const Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); return(CheckImageColors(image,exception,256)); } - + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % diff --git a/MagickCore/xml-tree.c b/MagickCore/xml-tree.c index 4f657af80..d18907012 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,(ssize_t) extent); + length=(size_t) MagickMin(offset,extent); xml=(char *) NULL; if (~length >= (MagickPathExtent-1)) xml=(char *) AcquireQuantumMemory(length+MagickPathExtent,sizeof(*xml)); -- 2.40.0