mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Moved redefines of png_error(), png_warning(), png_chunk_error(),

Browse Source 
and png_chunk_warning() from pngpriv.h to png.h to make them visible
to libpng-calling applications.
This commit is contained in:
Glenn Randers-Pehrson
2014-02-16 08:34:41 -06:00
parent e40e37018d
commit 103b04170d
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
png.h
View File

@@ -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