From 8cb69f0f2b24e401502d51d739b4193c8d13e241 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 19 Jul 2009 19:24:58 -0500 Subject: [PATCH] [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) --- ANNOUNCE | 6 ++++-- CHANGES | 4 +++- pngread.c | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index eea6ccb2b..868fe8632 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -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 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] 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 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] Build shared libraries with -lz and sometimes -lm. diff --git a/CHANGES b/CHANGES index 9d184a6b4..89eac0f01 100644 --- a/CHANGES +++ b/CHANGES @@ -2181,9 +2181,11 @@ version 1.4.0beta67 [July 6, 2009] version 1.4.0beta68 [July 19, 2009] 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 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] Build shared libraries with -lz and sometimes -lm. diff --git a/pngread.c b/pngread.c index ffb045131..2fbc4ff53 100644 --- a/pngread.c +++ b/pngread.c @@ -1,7 +1,7 @@ /* 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 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (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 */ if (transforms & PNG_TRANSFORM_GRAY_TO_RGB) - png_set_gray_to_rgb(png_structp png_ptr); + png_set_gray_to_rgb(png_ptr); #endif /* We don't handle adding filler bytes */ -- GitLab