[master] Reverted iTXt compatibility stuff

from 1.2.41beta05, 1.2.41beta11, and 1.2.41beta12.
This commit is contained in:
Glenn Randers-Pehrson
2009-11-08 16:51:11 -06:00
parent 87480bf6d4
commit f748fda0ed
16 changed files with 35 additions and 434 deletions

6
png.c
View File

@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.2.41 [November 3, 2009]
* Last changed in libpng 1.2.41 [November 8, 2009]
* Copyright (c) 1998-2009 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.)
@@ -722,13 +722,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.2.41beta14 - November 3, 2009" PNG_STRING_NEWLINE \
"libpng version 1.2.41beta14 - November 8, 2009" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2009 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 ((png_charp) "libpng version 1.2.41beta14 - November 3, 2009\
return ((png_charp) "libpng version 1.2.41beta14 - November 8, 2009\
Copyright (c) 1998-2009 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");