From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 3 Jan 2011 19:35:59 +0000 (+0200)
Subject: Don't use png_jmpbuf, it doesn't work with dynamic loading.
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~278^2~28
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d82bce4a05766f18d2087cea845072a444780dcb;p=emacs.git

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

 image.c (png_jmpbuf): Remove definition.
 (my_png_error, png_load): Don't use png_jmpbuf.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 879ecc94d72..60982993937 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
+
 2011-01-02  Eli Zaretskii  <eliz@gnu.org>
 
 	* keyboard.c (Vselect_active_regions): Doc fix.  (Bug#7702)
diff --git a/src/image.c b/src/image.c
index 41c9cb8f534..edfa208dd29 100644
--- a/src/image.c
+++ b/src/image.c
@@ -5528,12 +5528,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.  */
 
@@ -5544,7 +5538,7 @@ my_png_error (png_struct *png_ptr, const char *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);
 }
 
 
@@ -5706,7 +5700,7 @@ png_load (struct frame *f, struct image *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)