]> granicus.if.org Git - imagemagick/commitdiff
Fix Q32 read of 16-bit grayscale PNGs
authorglennrp <glennrp@git.imagemagick.org>
Sat, 25 Aug 2012 17:36:19 +0000 (17:36 +0000)
committerglennrp <glennrp@git.imagemagick.org>
Sat, 25 Aug 2012 17:36:19 +0000 (17:36 +0000)
coders/png.c

index c561e59f2e7d226560ada06e99786063614a6bdd..28b4c590e198955cea1105440b3700e1fe2a2c48 100644 (file)
@@ -2810,7 +2810,8 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
       "  image->colorspace=%d",(int) image->colorspace);
 
   if (((int) ping_color_type == PNG_COLOR_TYPE_PALETTE) ||
-      ((int) ping_color_type == PNG_COLOR_TYPE_GRAY))
+      ((int) ping_bit_depth < 16 &&
+      (int) ping_color_type == PNG_COLOR_TYPE_GRAY))
     {
       size_t
         one;