(no commit message)

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 56a17bf1dfc3f92c67d89228bab86c8859a0d972..1cc614c7f81a05283b28623eaa177964c4dd79f5 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1707,6 +1707,9 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
   register const char
     *p;
 
+  size_t
+    length;
+
   canonical=MagickFalse;
   (void) CopyMagickString(filename,format,MaxTextExtent);
   for (p=strchr(format,'%'); p != (char *) NULL; p=strchr(p+1,'%'))
@@ -1796,8 +1799,9 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info,
         q--;
         c=(*q);
         *q='\0';
-        (void) CopyMagickString(filename+(p-format),value,(size_t)
-          (MaxTextExtent-(p-format)));
+        (void) CopyMagickString(filename+(p-format-length),value,(size_t)
+          (MaxTextExtent-(p-format-length)));
+        length+=strlen(pattern)-1;
         *q=c;
         (void) ConcatenateMagickString(filename,r+1,MaxTextExtent);
         canonical=MagickTrue;

diff --git a/MagickCore/property.c b/MagickCore/property.c
index afe15293be5284aafa635b1f6f057c80d79f6a60..e7e4bb477424ce12548d50e4492cc918fe70f5f3 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -2128,8 +2128,8 @@ MagickExport const char *GetImageProperty(const Image *image,
 %
 %  The format of the GetMagickProperty method is:
 %
-%      const char *GetMagickProperty(const ImageInfo *image_info,
-%        Image *image,const char *key)
+%      const char *GetMagickProperty(const ImageInfo *image_info,Image *image,
+%        const char *key)
 %
 %  A description of each parameter follows:
 %
@@ -2344,7 +2344,7 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
       if (LocaleNCompare("page",property,4) == 0)
         {
           (void) FormatLocaleString(value,MaxTextExtent,"%.20g",(double)
-              GetImageIndexInList(image)+1);
+            GetImageIndexInList(image)+1);
           break;
         }
       break;
@@ -2784,7 +2784,7 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
           Number of images in the list.
         */
         q+=FormatLocaleString(q,extent,"%.20g",(double)
-             GetImageListLength(image));
+          GetImageListLength(image));
         break;
       }
       case 'o':