Package: plotutils / 2.6-11

25_libpng15 Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
Description: Fix libpng 1.5 build
 libpng-1.5 hides structure members from public view, this patch
 adapts plotutils for this.
 .
 While Debian does not yet fix libpng 1.5 this will avoid future
 FTBFS.
Origin: http://lists.gnu.org/archive/html/bug-plotutils/2011-01/msg00000.html
Forwarded: See origin.
Author: Thomal Klausner <tk@giga.or.at>

--- a/libplot/z_write.c
+++ b/libplot/z_write.c
@@ -164,7 +164,7 @@
     }
 
   /* cleanup after libpng errors (error handler does a longjmp) */
-  if (setjmp (png_ptr->jmpbuf))
+  if (setjmp (png_jmpbuf (png_ptr)))
     {
       png_destroy_write_struct (&png_ptr, (png_info **)NULL);
       return -1;
@@ -444,7 +444,11 @@
 #endif
     }
 
+#if (PNG_LIBPNG_VER < 10500)
   longjmp (png_ptr->jmpbuf, 1);
+#else
+  png_longjmp (png_ptr, 1);
+#endif
 }
 
 static void 
@@ -515,7 +519,11 @@
 #endif
     }
 
+#if (PNG_LIBPNG_VER < 10500)
   longjmp (png_ptr->jmpbuf, 1);
+#else
+  png_longjmp (png_ptr, 1);
+#endif
 }
 
 static void