The PNG decoder sometimes set images with more than 256 different

gray-alpha pixels to storage_class=PseudoClass with an incorrect colormap.

diff --git a/ChangeLog b/ChangeLog
index 10e463755612009802325e6f9cf6f1207aabc56b..e672baee18d506abe2464f08d9865a56174f72ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
     chunk data as properties, for later retrieval and reporting by "identify",
     so users can easily and reliably discover the color-type, bit-depth, etc
     that were in the input PNG datastream.
+  * The PNG decoder sometimes set images with more than 256 different
+    gray-alpha pixels to storage_class=PseudoClass with an incorrect colormap.
 
 2011-03-30  6.6.9-2 Anthony Thyssen <A.Thyssen@griffith...>
   * Add a "Resize" distortion method (distort equivalent of -resize).

diff --git a/coders/png.c b/coders/png.c
index b3bf2467e0cd722ef9424b3abae31957832c2131..17556382dd06d4ddab89869196b417776f0f2be8 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -2212,7 +2212,6 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
   image->columns=ping_width;
   image->rows=ping_height;
   if (((int) ping_color_type == PNG_COLOR_TYPE_PALETTE) ||
-      ((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ||
       ((int) ping_color_type == PNG_COLOR_TYPE_GRAY))
     {
       size_t