[devel] Restored the ability to include optional pngusr.h

This commit is contained in:
Glenn Randers-Pehrson 2010-04-17 18:03:02 -05:00
parent 8c065ddbe6
commit aecef098f9
3 changed files with 17 additions and 1 deletions

View File

@ -161,9 +161,9 @@ version 1.5.0beta17 [April 17, 2010]
in the new installed header file pnglibconf.h
Removed the xcode project because it has not been updated to work
with libpng-1.5.0.
Removed the ability to include optional pngusr.h
version 1.5.0beta18 [April 17, 2010]
Restored the ability to include optional pngusr.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit

View File

@ -2645,6 +2645,7 @@ version 1.5.0beta17 [April 17, 2010]
Removed the ability to include optional pngusr.h
version 1.5.0beta18 [April 17, 2010]
Restored the ability to include optional pngusr.h
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

View File

@ -25,6 +25,9 @@
#define PNGPRIV_H
#define PNGLIB_BUILD
#ifdef PNG_USER_CONFIG
# include "pngusr.h"
#endif
#include "png.h"
#include "pnginfo.h"
#include "pngstruct.h"
@ -77,6 +80,18 @@
# define PNG_WARNINGS_SUPPORTED
#endif
/* If warnings or errors are turned off the code is disabled
* or redirected here.
*/
#ifndef PNG_WARNINGS_SUPPORTED
# define png_warning(s1,s2) ((void)0)
# define png_chunk_warning(s1,s2) ((void)0)
#endif
#ifndef PNG_ERROR_TEXT_SUPPORTED
# define png_error(s1,s2) png_err(s1)
# define png_chunk_error(s1,s2) png_err(s1)
#endif
/* Added at libpng version 1.4.0 */
#if !defined(PNG_NO_CHECK_cHRM) && !defined(PNG_CHECK_cHRM_SUPPORTED)
# define PNG_CHECK_cHRM_SUPPORTED