From: Cristy <urban-warrior@imagemagick.org>
Date: Wed, 8 Aug 2018 11:11:02 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.8-10~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92a873d0873534bc6ad50e5509709919dccfbdb4;p=imagemagick

...
---

diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index 0f61af411..ecc3bd7e3 100644
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -619,8 +619,7 @@ MagickExport Image *ReadImage(const ImageInfo *image_info,
       "notify the developers",image->magick,exception->severity);
   if (IsBlobTemporary(image) != MagickFalse)
     (void) RelinquishUniqueFileResource(read_info->filename);
-  if ((GetNextImageInList(image) != (Image *) NULL) &&
-      (IsSceneGeometry(read_info->scenes,MagickFalse) != MagickFalse))
+  if (IsSceneGeometry(read_info->scenes,MagickFalse) != MagickFalse)
     {
       Image
         *clones;
diff --git a/MagickCore/image.c b/MagickCore/image.c
index 944e7f0eb..a74ba1118 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2749,9 +2749,6 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
         }
       else
         {
-          register size_t
-            n;
-
           size_t
             first,
             last;
@@ -2760,8 +2757,7 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
           image_info->scene=StringToUnsignedLong(image_info->scenes);
           image_info->number_scenes=image_info->scene;
           p=image_info->scenes;
-          q=(char *) image_info->scenes;
-          for (n=0; *q != '\0'; p++, n++)
+          for (q=(char *) image_info->scenes; *q != '\0'; p++)
           {
             while ((isspace((int) ((unsigned char) *p)) != 0) || (*p == ','))
               p++;
@@ -2780,8 +2776,6 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info,
             p=q;
           }
           image_info->number_scenes-=image_info->scene-1;
-          if ((image_info->number_scenes == 1) && (n > 1))
-            image_info->number_scenes++;  /* e.g. [0,0,0] */
         }
     }
   *component='\0';