bug#7908: png-1.5 fix for emacs-23.2 and HEAD

[Thomas Klausner <tk@giga.or.at>]

[-- Attachment #1: Type: text/plain, Size: 210 bytes --]

emacs-23.2 and git master from a few minutes don't compile against the
rather new png-1.5, which is hiding internal structure members.

The attached patch fixes the problem. Please include it.

Thanks,
 Thomas

[-- Attachment #2: patch-ae --]
[-- Type: text/plain, Size: 686 bytes --]

$NetBSD$

Fix build with png-1.5. 

--- src/image.c.orig	2011-01-16 17:00:54.000000000 +0900
+++ src/image.c	2011-01-16 17:04:35.000000000 +0900
@@ -5538,7 +5538,11 @@
   /* 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);
+#if (PNG_LIBPNG_VER < 10500)
   longjmp (png_ptr->jmpbuf, 1);
+#else
+  png_longjmp (png_ptr, 1);
+#endif
 }
 
 
@@ -5700,7 +5704,7 @@
 
   /* Set error jump-back.  We come back here when the PNG library
      detects an error.  */
-  if (setjmp (png_ptr->jmpbuf))
+  if (setjmp (png_jmpbuf(png_ptr)))
     {
     error:
       if (png_ptr)