]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Wed, 21 Sep 2011 22:36:11 +0000 (22:36 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Wed, 21 Sep 2011 22:36:11 +0000 (22:36 +0000)
coders/miff.c

index c53d8d8548f6b7313347d9205703f62303cca87c..bbde89987ff3bad39a7af74d58e3c0fcc4d745a7 100644 (file)
@@ -1209,7 +1209,8 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
     packet_size=(size_t) (quantum_info->depth/8);
     if (image->storage_class == DirectClass)
       packet_size=(size_t) (3*quantum_info->depth/8);
-    if ((image->type == BilevelType) || (image->type == GrayscaleType))
+    if ((image->type == BilevelType) || (image->type == GrayscaleType) ||
+        (image->type == GrayscaleMatteType))
       packet_size=quantum_info->depth/8;
     if (image->matte != MagickFalse)
       packet_size+=quantum_info->depth/8;
@@ -1217,6 +1218,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
       packet_size+=quantum_info->depth/8;
     if (image->compression == RLECompression)
       packet_size++;
+printf("%d\n",packet_size);
     length=image->columns;
     length=MagickMax(MagickMax(BZipMaxExtent(packet_size*image->columns),
       LZMAMaxExtent(packet_size*image->columns)),ZipMaxExtent(packet_size*
@@ -1243,7 +1245,8 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
         if (image->matte != MagickFalse)
           quantum_type=IndexAlphaQuantum;
       }
-    if ((image->type == BilevelType) || (image->type == GrayscaleType))
+    if ((image->type == BilevelType) || (image->type == GrayscaleType) ||
+        (image->type == GrayscaleMatteType))
       {
         quantum_type=GrayQuantum;
         if (image->matte != MagickFalse)