[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100357: Don't use png_jmpbuf, it doesn't work with dynamic loading.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100357
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Mon 2011-01-03 21:32:41 +0200
message:
  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.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-01-02 23:50:46 +0000
+++ b/src/ChangeLog     2011-01-03 19:32:41 +0000
@@ -1,3 +1,8 @@
+2011-01-03  Eli Zaretskii  <address@hidden>
+
+       * image.c (png_jmpbuf): Remove definition.
+       (my_png_error, png_load): Don't use png_jmpbuf.
+
 2010-12-31  Eli Zaretskii  <address@hidden>
 
        * image.c <Qlibpng_version>: New variable.

=== modified file 'src/image.c'
--- a/src/image.c       2011-01-02 23:50:46 +0000
+++ b/src/image.c       2011-01-03 19:32:41 +0000
@@ -5648,12 +5648,6 @@
 
 #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 @@
   /* 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 @@
 
   /* 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)