]> granicus.if.org Git - imagemagick/commitdiff
...
authorCristy <urban-warrior@imagemagick.org>
Wed, 16 Nov 2016 21:47:49 +0000 (16:47 -0500)
committerCristy <urban-warrior@imagemagick.org>
Wed, 16 Nov 2016 21:47:49 +0000 (16:47 -0500)
MagickCore/attribute.c
coders/sgi.c

index f6510b7bf318451a4a2326632aead2a9c53f7747..b76ff01a322a2ba7ce520880872c95a4f5e8ad3d 100644 (file)
@@ -679,8 +679,7 @@ MagickExport ImageType IdentifyImageGray(const Image *image,
           type=UndefinedType;
           break;
         }
-      if ((type == BilevelType) &&
-          (IsPixelMonochrome(image,p) == MagickFalse))
+      if ((type == BilevelType) && (IsPixelMonochrome(image,p) == MagickFalse))
         type=GrayscaleType;
       p+=GetPixelChannels(image);
     }
index a0eebe97df822f4255b3778cb85654a0d95ff346..3424e1f3381c5629a5717da0c51752aabd30bee7 100644 (file)
@@ -553,6 +553,9 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
       UndefinedPixelTrait;
     image->columns=iris_info.columns;
     image->rows=iris_info.rows;
+    status=SetImageExtent(image,image->columns,image->rows,exception);
+    if (status == MagickFalse)
+      return(DestroyImageList(image));
     /*
       Convert SGI raster image to pixel packets.
     */