summaryrefslogtreecommitdiff
path: root/pngrtran.c
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2000-04-01 21:10:05 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-04-06 16:04:53 -0500
commit68ea243ca352af493a0b12a5a9a811536d2dacc0 (patch)
tree867ec4aec07ae0dcfffe60fde42eb3eae6132385 /pngrtran.c
parent520a764cd79aea2d282cb4d2b9187f0aafb72404 (diff)
downloadlibpng-68ea243ca352af493a0b12a5a9a811536d2dacc0.tar.gz
Imported from libpng-1.0.6a.tarv1.0.6a
Diffstat (limited to 'pngrtran.c')
-rw-r--r--pngrtran.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pngrtran.c b/pngrtran.c
index bed4db7d2..02b1025c4 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * libpng 1.0.6 - March 21, 2000
+ * libpng 1.0.6a - April 2, 2000
* 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
@@ -622,7 +622,7 @@ png_set_rgb_to_gray_fixed(png_structp png_ptr, int error_action,
#endif
{
png_uint_16 red_int, green_int;
- if(red > 0 && green > 0)
+ if(red < 0 || green < 0)
{
red_int = 6968; /* .212671 * 32768 + .5 */
green_int = 23434; /* .715160 * 32768 + .5 */