From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 18 Apr 2013 19:34:02 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3846
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a927fa5e4e90dd7e59a8526269bb41094de7cb4;p=imagemagick

---

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index ed40ae9d7..045cbf15d 100644
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -149,7 +149,8 @@ MagickExport MagickBooleanType AcquireUniqueFilename(char *path)
 %
 */
 
-static inline size_t MagickMin(const size_t x,const size_t y)
+static inline MagickSizeType MagickMin(const MagickSizeType x,
+  const MagickSizeType y)
 {
   if (x < y)
     return(x);
@@ -212,7 +213,8 @@ MagickExport MagickBooleanType AcquireUniqueSymbolicLink(const char *source,
     }
   quantum=(size_t) MagickMaxBufferExtent;
   if ((fstat(source_file,&attributes) == 0) && (attributes.st_size != 0))
-    quantum=MagickMin((size_t) attributes.st_size,MagickMaxBufferExtent);
+    quantum=(size_t) MagickMin((size_t) attributes.st_size,
+      MagickMaxBufferExtent);
   buffer=(unsigned char *) AcquireQuantumMemory(quantum,sizeof(*buffer));
   if (buffer == (unsigned char *) NULL)
     {
@@ -1868,7 +1870,7 @@ MagickPrivate MagickBooleanType ShredFile(const char *path)
         }
     }
     random_info=DestroyRandomInfo(random_info);
-    if (j < length)
+    if (j < (MagickOffsetType) length)
       break;
   }
   status=close(file);