mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-11 09:20:51 +00:00
Code Issues Releases Activity

Don't use png_jmpbuf, it doesn't work with dynamic loading.

Browse Source 
image.c (png_jmpbuf): Remove definition.
 (my_png_error, png_load): Don't use png_jmpbuf.
This commit is contained in:
Eli Zaretskii 2011-01-03 21:32:41 +02:00
parent 97382176bd
commit fb724e5537
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2011-01-03 Eli Zaretskii <eliz@gnu.org>
* image.c (png_jmpbuf): Remove definition.
(my_png_error, png_load): Don't use png_jmpbuf.
2010-12-31 Eli Zaretskii <eliz@gnu.org>
* image.c <Qlibpng_version>: New variable.

10
src/image.c
View File

@ -5648,12 +5648,6 @@ init_png_functions (Lisp_Object libraries)
#endif /* HAVE_NTGUI */
/* libpng before 1.4.0 didn't have png_jmpbuf; v1.4.0 and later
deprecate direct access to png_ptr fields. */
#ifndef png_jmpbuf
# define png_jmpbuf(PTR) ((PTR)->jmpbuf)
#endif
/* Error and warning handlers installed when the PNG library
is initialized. */
@ -5666,7 +5660,7 @@ my_png_error (png_ptr, msg)
/* Avoid compiler warning about deprecated direct access to
png_ptr's fields in libpng versions 1.4.x. */
image_error ("PNG error: %s", build_string (msg), Qnil);
longjmp (png_jmpbuf (png_ptr), 1);
longjmp (png_ptr->jmpbuf, 1);
}
@ -5842,7 +5836,7 @@ png_load (f, img)
/* Set error jump-back. We come back here when the PNG library
detects an error. */
if (setjmp (png_jmpbuf (png_ptr)))
if (setjmp (png_ptr->jmpbuf))
{
error:
if (png_ptr)