...

diff --git a/MagickCore/image.c b/MagickCore/image.c
index bfee8a4fb198b78bde180b4004d0634f36525292..6b510d0014f3ce21bf5071fa8c3d89ca4ced0814 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2998,7 +2998,7 @@ MagickExport void SetImageInfoCustomStream(ImageInfo *image_info,
   if (image_info->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       image_info->filename);
-  image_info->custom_stream=(void *) custom_stream;
+  image_info->custom_stream=(CustomStreamInfo *) custom_stream;
 }
 \f
 /*

diff --git a/MagickCore/property.c b/MagickCore/property.c
index 8bb7088bed1dc12ef9fd96f83da5c86c7bb2c56f..6113530c51768a2f40dc32dbdf2cee3674f1bc58 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -1767,7 +1767,7 @@ static MagickBooleanType GetXMPProperty(const Image *image,const char *property)
       while (description != (XMLTreeInfo *) NULL)
       {
         char
-          *namespace;
+          *xml_namespace;
 
         node=GetXMLTreeChild(description,(const char *) NULL);
         while (node != (XMLTreeInfo *) NULL)
@@ -1777,20 +1777,20 @@ static MagickBooleanType GetXMPProperty(const Image *image,const char *property)
           if ((child == (XMLTreeInfo *) NULL) &&
               (SkipXMPValue(content) == MagickFalse))
             {
-              namespace=ConstantString(GetXMLTreeTag(node));
-              (void) SubstituteString(&namespace,"exif:","xmp:");
+              xml_namespace=ConstantString(GetXMLTreeTag(node));
+              (void) SubstituteString(&xml_namespace,"exif:","xmp:");
               (void) AddValueToSplayTree((SplayTreeInfo *) image->properties,
-                namespace,ConstantString(content));
+                xml_namespace,ConstantString(content));
             }
           while (child != (XMLTreeInfo *) NULL)
           {
             content=GetXMLTreeContent(child);
             if (SkipXMPValue(content) == MagickFalse)
               {
-                namespace=ConstantString(GetXMLTreeTag(node));
-                (void) SubstituteString(&namespace,"exif:","xmp:");
+                xml_namespace=ConstantString(GetXMLTreeTag(node));
+                (void) SubstituteString(&xml_namespace,"exif:","xmp:");
                 (void) AddValueToSplayTree((SplayTreeInfo *) image->properties,
-                  namespace,ConstantString(content));
+                  xml_namespace,ConstantString(content));
               }
             child=GetXMLTreeSibling(child);
           }

diff --git a/coders/tiff.c b/coders/tiff.c
index edb5763437bc88bcdb69e29ff0237fa00a4e31f6..c9c85579feebfad0b071f279500740749ef08d42 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1620,7 +1620,7 @@ RestoreMSCWarning
     quantum_info->endian=LSBEndian;
     quantum_type=RGBQuantum;
     tiff_pixels=(unsigned char *) AcquireMagickMemory(MagickMax(
-      TIFFScanlineSize(tiff),(size_t) (image->columns*samples_per_pixel*
+      TIFFScanlineSize(tiff),(ssize_t) (image->columns*samples_per_pixel*
       pow(2.0,ceil(log(bits_per_sample)/log(2.0))))));
     if (tiff_pixels == (unsigned char *) NULL)
       {