Changeset 3879

Timestamp:

03/16/11 08:37:49 (2 years ago)

Author:

cristy

Message:

 

File:

• ImageMagick/trunk/magick/property.c (modified) (9 diffs)

ImageMagick/trunk/magick/property.c

@@ -2563 +2563 @@
     *value;
 
-  ImageInfo
-    *text_info;
-
   register char
     *q;
@@ -2592 +2589 @@
     Translate any embedded format characters.
   */
-  text_info=CloneImageInfo(image_info);
   interpret_text=AcquireString(text);
   extent=MaxTextExtent;
@@ -2813 +2809 @@
           Image output filename.
         */
-        q+=CopyMagickString(q,text_info->filename,extent);
+        q+=CopyMagickString(q,image_info->filename,extent);
         break;
       }
@@ -2864 +2860 @@
           Image scene number.
         */
-        if (text_info->number_scenes == 0)
+        if (image_info->number_scenes == 0)
           q+=FormatMagickString(q,extent,"%.20g",(double) image->scene);
         else
-          q+=FormatMagickString(q,extent,"%.20g",(double) text_info->scene);
+          q+=FormatMagickString(q,extent,"%.20g",(double) image_info->scene);
         break;
       }
@@ -2875 +2871 @@
           Unique filename.
         */
-        (void) CopyMagickString(filename,text_info->unique,extent);
+        (void) CopyMagickString(filename,image_info->unique,extent);
         q+=CopyMagickString(q,filename,extent);
         break;
@@ -2976 +2972 @@
           Image scenes.
         */
-        if (text_info->number_scenes == 0)
+        if (image_info->number_scenes == 0)
           q+=CopyMagickString(q,"2147483647",extent);
         else
-          q+=FormatMagickString(q,extent,"%.20g",(double) (text_info->scene+
-            text_info->number_scenes));
+          q+=FormatMagickString(q,extent,"%.20g",(double) (image_info->scene+
+            image_info->number_scenes));
         break;
       }
@@ -3008 +3004 @@
           Unique filename.
         */
-        (void) CopyMagickString(filename,text_info->zero,extent);
+        (void) CopyMagickString(filename,image_info->zero,extent);
         q+=CopyMagickString(q,filename,extent);
         break;
@@ -3091 +3087 @@
               }
             }
-        value=GetMagickProperty(text_info,image,pattern);
+        value=GetMagickProperty(image_info,image,pattern);
         if (value != (const char *) NULL)
           {
@@ -3169 +3165 @@
   }
   *q='\0';
-  text_info=DestroyImageInfo(text_info);
   if (text != (const char *) embed_text)
     text=DestroyString(text);