From cd39adb561b82c36f9512d9bb667a351b5500c9b Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 23 Apr 2012 23:12:39 -0500 Subject: [PATCH] [libpng16] Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around declaration of png_handle_unknown(). --- ANNOUNCE | 6 ++++-- CHANGES | 4 +++- pngpriv.h | 2 -- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 44424e93a..5a0e6fa0d 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.0beta21 - April 13, 2012 +Libpng 1.6.0beta21 - April 24, 2012 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. @@ -349,12 +349,14 @@ Version 1.6.0beta20 [March 29, 2012] Revised png_set_text_2() to avoid potential memory corruption (fixes CVE-2011-3048). -Version 1.6.0beta21 [April 13, 2012] +Version 1.6.0beta21 [April 24, 2012] Revised scripts/makefile.darwin: use system zlib; remove quotes around architecture list; add missing ppc architecture; add architecture options to shared library link; don't try to create a shared lib based on missing RELEASE variable. Enable png_set_check_for_invalid_index() for both read and write. + Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around + declaration of png_handle_unknown(). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 3d2a2f3ff..41508c822 100644 --- a/CHANGES +++ b/CHANGES @@ -4100,12 +4100,14 @@ Version 1.6.0beta20 [March 29, 2012] Revised png_set_text_2() to avoid potential memory corruption (fixes CVE-2011-3048). -Version 1.6.0beta21 [April 13, 2012] +Version 1.6.0beta21 [April 24, 2012] Revised scripts/makefile.darwin: use system zlib; remove quotes around architecture list; add missing ppc architecture; add architecture options to shared library link; don't try to create a shared lib based on missing RELEASE variable. Enable png_set_check_for_invalid_index() for both read and write. + Removed #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED in pngpriv.h around + declaration of png_handle_unknown(). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngpriv.h b/pngpriv.h index 71cb28fdb..8ec7dce75 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1303,10 +1303,8 @@ PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr, png_inforp inf png_uint_32 length),PNG_EMPTY); #endif -#ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length),PNG_EMPTY); -#endif PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_structrp png_ptr, png_uint_32 chunk_name),PNG_EMPTY);