[devel] Removed extraneous declaration

from the new call to png_read_gray_to_rgb() (bug introduced in
libpng-1.4.0beta67). (Patch contributed by Alam Arias)
This commit is contained in:
Glenn Randers-Pehrson 2009-07-19 19:24:58 -05:00
parent 97a4573885
commit 8cb69f0f2b
3 changed files with 9 additions and 5 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.4.0beta69 - July 19, 2009 Libpng 1.4.0beta69 - July 20, 2009
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -502,9 +502,11 @@ version 1.4.0beta67 [July 6, 2009]
version 1.4.0beta68 [July 19, 2009] version 1.4.0beta68 [July 19, 2009]
Avoid some tests in filter selection in pngwutil.c Avoid some tests in filter selection in pngwutil.c
version 1.4.0beta69 [July 19, 2009] version 1.4.0beta69 [July 20, 2009]
Simplified the new filter-selection test. This runs faster in the Simplified the new filter-selection test. This runs faster in the
common "PNG_ALL_FILTERS" and PNG_FILTER_NONE cases. common "PNG_ALL_FILTERS" and PNG_FILTER_NONE cases.
Removed extraneous declaration from the new call to png_read_gray_to_rgb()
(bug introduced in libpng-1.4.0beta67).
version 1.4.0betaN [future] version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm. Build shared libraries with -lz and sometimes -lm.

View File

@ -2181,9 +2181,11 @@ version 1.4.0beta67 [July 6, 2009]
version 1.4.0beta68 [July 19, 2009] version 1.4.0beta68 [July 19, 2009]
Avoid some tests in filter selection in pngwutil.c Avoid some tests in filter selection in pngwutil.c
version 1.4.0beta69 [July 19, 2009] version 1.4.0beta69 [July 20, 2009]
Simplified the new filter-selection test. This runs faster in the Simplified the new filter-selection test. This runs faster in the
common "PNG_ALL_FILTERS" and PNG_FILTER_NONE cases. common "PNG_ALL_FILTERS" and PNG_FILTER_NONE cases.
Removed extraneous declaration from the new call to png_read_gray_to_rgb()
(bug introduced in libpng-1.4.0beta67).
version 1.4.0betaN [future] version 1.4.0betaN [future]
Build shared libraries with -lz and sometimes -lm. Build shared libraries with -lz and sometimes -lm.

View File

@ -1,7 +1,7 @@
/* pngread.c - read a PNG file /* pngread.c - read a PNG file
* *
* Last changed in libpng 1.4.0 [July 19, 2009] * Last changed in libpng 1.4.0 [July 20, 2009]
* Copyright (c) 1998-2009 Glenn Randers-Pehrson * Copyright (c) 1998-2009 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@ -1306,7 +1306,7 @@ png_read_png(png_structp png_ptr, png_infop info_ptr,
/* Expand grayscale image to RGB /* Expand grayscale image to RGB
*/ */
if (transforms & PNG_TRANSFORM_GRAY_TO_RGB) if (transforms & PNG_TRANSFORM_GRAY_TO_RGB)
png_set_gray_to_rgb(png_structp png_ptr); png_set_gray_to_rgb(png_ptr);
#endif #endif
/* We don't handle adding filler bytes */ /* We don't handle adding filler bytes */