summaryrefslogtreecommitdiff
path: root/graphics/plotutils/patches/patch-aa
blob: 6123223d2552f46aded279729fd60633d591abe7 (plain)
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
$NetBSD: patch-aa,v 1.6 2011/01/14 11:30:36 wiz Exp $

Fix build with png-1.5.

--- libplot/z_write.c.orig	2008-07-16 00:54:10.000000000 +0000
+++ libplot/z_write.c
@@ -164,7 +164,7 @@ _pl_z_maybe_output_image (S___(Plotter *
     }
 
   /* 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 @@ _our_error_fn_stdio (png_struct *png_ptr
 #endif
     }
 
+#if (PNG_LIBPNG_VER < 10500)
   longjmp (png_ptr->jmpbuf, 1);
+#else
+  png_longjmp (png_ptr, 1);
+#endif
 }
 
 static void 
@@ -515,7 +519,11 @@ _our_error_fn_stream (png_struct *png_pt
 #endif
     }
 
+#if (PNG_LIBPNG_VER < 10500)
   longjmp (png_ptr->jmpbuf, 1);
+#else
+  png_longjmp (png_ptr, 1);
+#endif
 }
 
 static void