From 9c66d8c3dda87121bb09cf7b5637905b948f7706 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 10 Aug 2012 11:05:36 +0000
Subject: [PATCH]
---
MagickCore/blob.c | 2 +-
MagickCore/property.c | 6 +++---
coders/inline.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/MagickCore/blob.c b/MagickCore/blob.c
index 0fe26d4d1..0bd7413bb 100644
--- 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 746496beb..14f4d2b75 100644
--- 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 d9ba97e77..83ed4d08d 100644
--- 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;
--
2.40.0