(no commit message)

diff --git a/magick/property.c b/magick/property.c
index e6126eeafeb7480af68e6989b3e88793406a396c..a4bd610c37a50cb0b659a309cb656d75904bda57 100644 (file)
--- 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;