From: cristy Date: Wed, 12 May 2010 00:43:15 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9486 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ec6897c3b293327bc2a2c1d93d20456c9d00f6c6;p=imagemagick --- diff --git a/magick/property.c b/magick/property.c index e6126eeaf..a4bd610c3 100644 --- a/magick/property.c +++ b/magick/property.c @@ -1671,10 +1671,10 @@ static char *TracePSClippath(const unsigned char *blob,size_t length, xx=ReadPropertyMSBLong(&blob,&length); x=(long) xx; if (xx > 2147483647) - x=xx-4294967295-1; + x=(long) xx-4294967295-1; y=(long) yy; if (yy > 2147483647) - y=yy-4294967295-1; + y=(long) yy-4294967295-1; point[i].x=(double) x/4096/4096; point[i].y=1.0-(double) y/4096/4096; } @@ -1868,10 +1868,10 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length, xx=ReadPropertyMSBLong(&blob,&length); x=(long) xx; if (xx > 2147483647) - x=xx-4294967295-1; + x=(long) xx-4294967295-1; y=(long) yy; if (yy > 2147483647) - y=yy-4294967295-1; + y=(long) yy-4294967295-1; point[i].x=(double) x*columns/4096/4096; point[i].y=(double) y*rows/4096/4096; } @@ -2147,7 +2147,7 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info, filename[MaxTextExtent]; *value='\0'; - switch (*(property)) + switch (*property) { case 'b': { @@ -2396,6 +2396,8 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info, { if (LocaleNCompare("unique",property,6) == 0) { + if (*image_info->unique == '\0') + (void) AcquireUniqueFilename(image_info->unique); (void) CopyMagickString(filename,image_info->unique,MaxTextExtent); (void) CopyMagickString(value,filename,MaxTextExtent); break;