From: Cristy Date: Mon, 13 Mar 2017 14:40:54 +0000 (-0400) Subject: ... X-Git-Tag: 7.0.5-3~12 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f83670344687ac4db5ecba486269a0a2d9367d0;p=imagemagick ... --- diff --git a/MagickCore/image.c b/MagickCore/image.c index bfee8a4fb..6b510d001 100644 --- 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; } /* diff --git a/MagickCore/property.c b/MagickCore/property.c index 8bb7088be..6113530c5 100644 --- 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 edb576343..c9c85579f 100644 --- 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) {