commit a96117f52c1b80ea98cd652c9174e1f2cb42dfcd
author John Bowler <jbowler@acm.org> Sat Jan 08 14:41:25 2011 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sat Jan 08 14:41:25 2011 -0600
tree 11ace75e8c1aec72e176ea0bf9fe2f72401019db
parent fff109322771f9bb2f2d265d79a2325c02ce98d8

[devel] Ensure that png_rgb_to_gray ignores palette mapped images.

pngrtran.c

diff --git a/pngrtran.c b/pngrtran.c
index 7da7886..7c1f8a1 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -2427,7 +2427,7 @@
 
    png_debug(1, "in png_do_rgb_to_gray");
 
-   if (
+   if (!(row_info->color_type & PNG_COLOR_MASK_PALETTE) &&
        (row_info->color_type & PNG_COLOR_MASK_COLOR))
    {
       png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff;