From bd2fa5def6ed9d9320a7f58a3daea4eea925bccf Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 19 Nov 2011 13:28:08 -0600 Subject: [PATCH] [libpng15] Removed "zTXt" from warning in generic chunk decompression function. Bug report by Franke Busse --- ANNOUNCE | 5 +++-- CHANGES | 3 ++- pngrutil.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 4417870c1..9d00b87a4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.7beta05 - November 18, 2011 +Libpng 1.5.7beta05 - November 19, 2011 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. @@ -99,7 +99,8 @@ Version 1.5.7beta04 [November 17, 2011] Also removed a duplicate setting of this flag. Added files that were omitted from the libpng-1.5.7beta03 zip distribution. -Version 1.5.7beta05 [November 18, 2011] +Version 1.5.7beta05 [November 19, 2011] + Removed "zTXt" from warning in generic chunk decompression function. Send comments/corrections/commendations to png-mng-implement at lists.sf.net: (subscription required; visit diff --git a/CHANGES b/CHANGES index 243827fa4..c2ad29777 100644 --- a/CHANGES +++ b/CHANGES @@ -3744,7 +3744,8 @@ Version 1.5.7beta04 [November 17, 2011] Also removed a duplicate setting of this flag. Added files that were omitted from the libpng-1.5.7beta03 zip distribution. -Version 1.5.7beta05 [November 18, 2011] +Version 1.5.7beta05 [November 19, 2011] + Removed "zTXt" from warning in generic chunk decompression function. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngrutil.c b/pngrutil.c index 8ad1a67c5..9b32394a8 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -490,7 +490,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type, { PNG_WARNING_PARAMETERS(p) png_warning_parameter_signed(p, 1, PNG_NUMBER_FORMAT_d, comp_type); - png_formatted_warning(png_ptr, p, "Unknown zTXt compression type @1"); + png_formatted_warning(png_ptr, p, "Unknown compression type @1"); /* The recovery is to simply drop the data. */ }