(no commit message)

diff --git a/magick/fx.c b/magick/fx.c
index 065d3af1c6e882a07af2b6c505d461720604b9e1..6d345615f90e6f7dbd77180735e9dd05d3f97bc1 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -1807,7 +1807,7 @@ static MagickRealType FxGetSymbol(FxInfo *fx_info,const ChannelType channel,
     case 't':
     {
       if (LocaleCompare(symbol,"t") == 0)
-        return((MagickRealType) fx_info->images->scene);
+        return((MagickRealType) GetImageIndexInList(fx_info->images) );
       break;
     }
     case 'W':

diff --git a/magick/property.c b/magick/property.c
index 8afe29dbe81782069e3cbe9e45f2b48b699877cf..4d2f7e6560dc463caab3b6f8c4ade94fe11de6fe 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -2352,16 +2352,8 @@ MagickExport const char *GetMagickProperty(const ImageInfo *image_info,
     {
       if (LocaleNCompare("page",property,4) == 0)
         {
-          register const Image
-            *p;
-
-          size_t
-            page;
-
-          p=image;
-          for (page=1; GetPreviousImageInList(p) != (Image *) NULL; page++)
-            p=GetPreviousImageInList(p);
-          (void) FormatMagickString(value,MaxTextExtent,"%.20g",(double) page);
+          (void) FormatMagickString(value,MaxTextExtent,"%.20g",(double)
+              GetImageIndexInList(image)+1);
           break;
         }
       break;
@@ -2802,8 +2794,8 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
         /*
           Number of images in the list.
         */
-        q+=FormatMagickString(q,extent,"%.20g",(double) GetImageListLength(
-          image));
+        q+=FormatMagickString(q,extent,"%.20g",(double)
+             GetImageListLength(image));
         break;
       }
       case 'o':
@@ -2816,19 +2808,11 @@ MagickExport char *InterpretImageProperties(const ImageInfo *image_info,
       }
       case 'p':
       {
-        register const Image
-          *p;
-
-        size_t
-          page;
-
         /*
-          Image page number.
+          Image index in list.
         */
-        p=image;
-        for (page=1; GetPreviousImageInList(p) != (Image *) NULL; page++)
-          p=GetPreviousImageInList(p);
-        q+=FormatMagickString(q,extent,"%.20g",(double) page);
+        q+=FormatMagickString(q,extent,"%.20g",(double)
+            GetImageIndexInList(image));
         break;
       }
       case 'q':