[libpng17] Merged files with version 1.6.8 that have not changed since then.

This commit is contained in:
Glenn Randers-Pehrson
2013-12-19 20:33:08 -06:00
parent 06be739941
commit 9e168ea2c9
30 changed files with 59 additions and 51 deletions

4
png.c
View File

@@ -696,13 +696,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.7.0beta25 - December 15, 2013" PNG_STRING_NEWLINE \
"libpng version 1.7.0beta25 - December 20, 2013" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2013 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE;
# else
return "libpng version 1.7.0beta25 - December 15, 2013\
return "libpng version 1.7.0beta25 - December 20, 2013\
Copyright (c) 1998-2013 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";