commit 25d8224d15881020f2900ed5437c1567e3b52e97
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Wed May 01 11:51:26 2002 -0500
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Mon Apr 06 16:07:00 2009 -0500
tree 58954cf054285b065e81b08a88a14b51686d627c
parent 03008a08d10521b9917901f0031f9687729b6295

Imported from libpng-1.2.3rc2.tar

pngset.c

diff --git a/pngset.c b/pngset.c
index 453ff57..4d8a9fa 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * libpng 1.2.3rc1 - April 27, 2002
+ * libpng 1.2.3rc2 - May 1, 2002
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2002 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -305,7 +305,9 @@
    info_ptr->compression_type = (png_byte)compression_type;
    info_ptr->filter_type = (png_byte)filter_type;
    info_ptr->interlace_type = (png_byte)interlace_type;
-   if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
+   if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      info_ptr->channels = 1;
+   else if (info_ptr->color_type & PNG_COLOR_MASK_COLOR)
       info_ptr->channels = 3;
    else
       info_ptr->channels = 1;