(no commit message)

diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 0fe26d4d1e3dcb9934a65b21e500b414c456ef17..0bd7413bbdc53fc225fb3111507e551e86daffe7 100644 (file)
--- a/MagickCore/blob.c
+++ b/MagickCore/blob.c
@@ -989,7 +989,7 @@ MagickExport unsigned char *FileToBlob(const char *filename,const size_t extent,
             if (errno != EINTR)
               break;
           }
-        if (~(1UL*i) < (quantum+1))
+        if (~((size_t) i) < (quantum+1))
           {
             blob=(unsigned char *) RelinquishMagickMemory(blob);
             break;

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 746496beb59ee446cb8bedc5fae127a80d66a3e5..14f4d2b75ffc74856286929fbc24dd811ac6ec4c 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -616,7 +616,7 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key,
     if ((count != 0) && ((size_t) count <= length))
       {
         resource=(char *) NULL;
-        if (~(1UL*count) >= (MaxTextExtent-1))
+        if (~((size_t) count) >= (MaxTextExtent-1))
           resource=(char *) AcquireQuantumMemory((size_t) count+MaxTextExtent,
             sizeof(*resource));
         if (resource != (char *) NULL)
@@ -653,7 +653,7 @@ static MagickBooleanType Get8BIMProperty(const Image *image,const char *key,
       We have the resource of interest.
     */
     attribute=(char *) NULL;
-    if (~(1UL*count) >= (MaxTextExtent-1))
+    if (~((size_t) count) >= (MaxTextExtent-1))
       attribute=(char *) AcquireQuantumMemory((size_t) count+MaxTextExtent,
         sizeof(*attribute));
     if (attribute != (char *) NULL)
@@ -1398,7 +1398,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image,
             case EXIF_FMT_STRING:
             {
               value=(char *) NULL;
-              if (~(1UL*number_bytes) >= 1)
+              if (~((size_t) number_bytes) >= 1)
                 value=(char *) AcquireQuantumMemory((size_t) number_bytes+1UL,
                   sizeof(*value));
               if (value != (char *) NULL)

diff --git a/coders/inline.c b/coders/inline.c
index d9ba97e777e1c5505c1b9db94ab487c8be70bd57..83ed4d08d997940876c4748d025c29c96b3c6f14 100644 (file)
--- a/coders/inline.c
+++ b/coders/inline.c
@@ -147,7 +147,7 @@ static Image *ReadINLINEImage(const ImageInfo *image_info,
         if (errno != EINTR)
           break;
       }
-    if (~(1UL*i) < (quantum+1))
+    if (~((size_t) i) < (quantum+1))
       {
         inline_image=(unsigned char *) RelinquishMagickMemory(inline_image);
         break;