From 103b04170dcff26ea8b1d7381aeed0af4dc74d02 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 16 Feb 2014 08:34:41 -0600 Subject: [PATCH] [libpng16] Moved redefines of png_error(), png_warning(), png_chunk_error(), and png_chunk_warning() from pngpriv.h to png.h to make them visible to libpng-calling applications. --- ANNOUNCE | 7 +++++-- CHANGES | 7 +++++-- png.h | 15 ++++++++++----- pngpriv.h | 4 ---- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index d19f9f25c..2dd365ba9 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.10beta02 - February 9, 2014 +Libpng 1.6.10beta02 - February 16, 2014 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. @@ -55,7 +55,10 @@ Version 1.6.10beta01 [February 9, 2014] and it adds corresponding code to pngimage.c to handle such options by not attempting to test them. -Version 1.6.10beta02 [February 9, 2014] +Version 1.6.10beta02 [February 16, 2014] + Moved redefines of png_error(), png_warning(), png_chunk_error(), + and png_chunk_warning() from pngpriv.h to png.h to make them visible + to libpng-calling applications. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 3b38f990e..8b812a481 100644 --- a/CHANGES +++ b/CHANGES @@ -4754,7 +4754,7 @@ Version 1.6.8 [December 19, 2013] Version 1.6.9beta01 [December 26, 2013] Bookkeeping: Moved functions around (no changes). Moved transform function definitions before the place where they are called so that - they can be masde static. Move the intrapixel functions and the + they can be made static. Move the intrapixel functions and the grayscale palette builder out of the png?tran.c files. The latter isn't a transform function and is no longer used internally, and the former MNG specific functions are better placed in pngread/pngwrite.c @@ -4829,7 +4829,10 @@ Version 1.6.10beta01 [February 9, 2014] and it adds corresponding code to pngimage.c to handle such options by not attempting to test them. -Version 1.6.10beta02 [February 9, 2014] +Version 1.6.10beta02 [February 16, 2014] + Moved redefines of png_error(), png_warning(), png_chunk_error(), + and png_chunk_warning() from pngpriv.h to png.h to make them visible + to libpng-calling applications. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/png.h b/png.h index 0ae569bb2..f23c95f11 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.10beta02 - February 9, 2014 + * libpng version 1.6.10beta02 - February 16, 2014 * Copyright (c) 1998-2014 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.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.10beta02 - February 9, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.6.10beta02 - February 16, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -224,7 +224,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.10beta02, February 9, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.10beta02, February 16, 2014, are * Copyright (c) 2004, 2006-2013 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -336,7 +336,7 @@ * Y2K compliance in libpng: * ========================= * - * February 9, 2014 + * February 16, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -404,7 +404,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.6.10beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.10beta02 - February 9, 2014\n" + " libpng version 1.6.10beta02 - February 16, 2014\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -2000,6 +2000,8 @@ PNG_EXPORTA(103, void, png_chunk_error, (png_const_structrp png_ptr, #else /* Fatal error in PNG image of libpng - can't continue */ PNG_EXPORTA(104, void, png_err, (png_const_structrp png_ptr), PNG_NORETURN); +# define png_error(s1,s2) png_err(s1) +# define png_chunk_error(s1,s2) png_err(s1) #endif #ifdef PNG_WARNINGS_SUPPORTED @@ -2010,6 +2012,9 @@ PNG_EXPORT(105, void, png_warning, (png_const_structrp png_ptr, /* Non-fatal error in libpng, chunk name is prepended to message. */ PNG_EXPORT(106, void, png_chunk_warning, (png_const_structrp png_ptr, png_const_charp warning_message)); +#else +# define png_warning(s1,s2) ((void)(s1)) +# define png_chunk_warning(s1,s2) ((void)(s1)) #endif #ifdef PNG_BENIGN_ERRORS_SUPPORTED diff --git a/pngpriv.h b/pngpriv.h index a5bfdb57b..e3f574f1f 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -378,8 +378,6 @@ #ifdef PNG_WARNINGS_SUPPORTED # define PNG_WARNING_PARAMETERS(p) png_warning_parameters p; #else -# define png_warning(s1,s2) ((void)(s1)) -# define png_chunk_warning(s1,s2) ((void)(s1)) # define png_warning_parameter(p,number,string) ((void)0) # define png_warning_parameter_unsigned(p,number,format,value) ((void)0) # define png_warning_parameter_signed(p,number,format,value) ((void)0) @@ -387,8 +385,6 @@ # define PNG_WARNING_PARAMETERS(p) #endif #ifndef PNG_ERROR_TEXT_SUPPORTED -# define png_error(s1,s2) png_err(s1) -# define png_chunk_error(s1,s2) png_err(s1) # define png_fixed_error(s1,s2) png_err(s1) #endif