commit a357b99113b9fc2bca275076bdf26ea44c7f2b17
author Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Sun Feb 08 20:56:40 1998 -0600
committer Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Mon Apr 06 16:04:14 2009 -0500
tree 7dfcbb530ad6455c95bbbc24fc7799cb608d5c43
parent 0f881d62b37b416cb2020ae865aed4d11a5ec19d

Imported from libpng-0.99d.tar

pngrtran.c

diff --git a/pngrtran.c b/pngrtran.c
index 092e6f8..2db8ec6 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,12 +1,12 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * libpng 0.99c
+ * libpng 0.99d
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
  * Copyright (c) 1998, Glenn Randers-Pehrson
- * February 7, 1998
+ * February 8, 1998
  *
  * This file contains functions optionally called by an application 
  * in order to tell libpng how to handle data when reading a PNG.
@@ -1913,24 +1913,21 @@
    {
       if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
       {
-         int i;
          png_color back;
 
          back.red   = (png_byte)png_ptr->background.red;
          back.green = (png_byte)png_ptr->background.green;
          back.blue  = (png_byte)png_ptr->background.blue;
 
-         for (i = 0; i < num_palette; i++)
+         for (i = 0; i < (int)png_ptr->num_trans && i < num_palette; i++)
          {
-            if (i >= (int)png_ptr->num_trans ||
-               png_ptr->trans[i] == 0)
+            if (png_ptr->trans[i] == 0)
             {
                palette[i].red = back.red;
                palette[i].green = back.green;
                palette[i].blue = back.blue;
             }
-            else if (i < (int)png_ptr->num_trans ||
-               png_ptr->trans[i] != 0xff)
+            else if (png_ptr->trans[i] != 0xff)
             {
                png_composite(palette[i].red, png_ptr->palette[i].red,
                   png_ptr->trans[i], back.red);