Merge branch 'libpng17' into libpng17-buffer-enhancements

This commit is contained in:
John Bowler
2015-11-22 20:43:56 -08:00
7 changed files with 76 additions and 10 deletions

4
png.c
View File

@@ -711,13 +711,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.7.0beta69 - November 22, 2015" PNG_STRING_NEWLINE \
"libpng version 1.7.0beta69 - November 23, 2015" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2015 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.0beta69 - November 22, 2015\
return "libpng version 1.7.0beta69 - November 23, 2015\
Copyright (c) 1998-2015 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";