]> granicus.if.org Git - imagemagick/commitdiff
https://github.com/ImageMagick/ImageMagick/issues/41
authorCristy <urban-warrior@imagemagick.org>
Sat, 26 Sep 2015 23:21:38 +0000 (19:21 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sat, 26 Sep 2015 23:21:38 +0000 (19:21 -0400)
MagickCore/attribute.c
MagickCore/blob.c
MagickCore/histogram.c
MagickCore/xml-tree.c

index 0f26c98a96b50608d887a6a41d34e89e4f96bbd0..23104b8f451a94a09c35d11ad596118baccf3c00 100644 (file)
@@ -608,7 +608,7 @@ MagickExport ImageType GetImageType(const Image *image)
     return(TrueColorAlphaType);
   return(TrueColorType);
 }
-
+\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -689,7 +689,7 @@ MagickExport ImageType IdentifyImageGray(const Image *image,
     type=GrayscaleAlphaType;
   return(type);
 }
-
+\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -767,7 +767,7 @@ MagickExport MagickBooleanType IdentifyImageMonochrome(const Image *image,
     return(MagickTrue);
   return(MagickFalse);
 }
-
+\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
@@ -831,7 +831,7 @@ MagickExport ImageType IdentifyImageType(const Image *image,
     return(TrueColorAlphaType);
   return(TrueColorType);
 }
-
+\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
index ef4a6a3f64043e362ba9219b93809c93a80f1890..c4ec92b9e4c2c9e9b12ede3624750d038a2652f2 100755 (executable)
@@ -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,
index 9382676b4f090107203d72159dd0334ec7d022b0..64964ed4bf469998f8d3d309cda39a6b205ffa78 100644 (file)
@@ -769,7 +769,7 @@ MagickExport MagickBooleanType IdentifyPaletteImage(const Image *image,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   return(CheckImageColors(image,exception,256));
 }
-
+\f
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
index 4f657af807f0c7b8916622947810a71da3676865..d189070128f5a46540ea16f291a0b701cd91d757 100644 (file)
@@ -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));