[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

View File

@@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
* 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.)
@@ -285,9 +285,9 @@ png_default_error(png_structp png_ptr, png_const_charp error_message)
longjmp(png_ptr->jmpbuf, 1);
# endif
}
#else
PNG_ABORT();
#endif
/* Here if not setjmp support or if png_ptr is null. */
PNG_ABORT();
#ifndef PNG_CONSOLE_IO_SUPPORTED
error_message = error_message; /* Make compiler happy */
#endif