aboutsummaryrefslogtreecommitdiff
path: root/x11/fbdesk/files/patch-ImagePNG.cc
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2012-06-01 05:26:28 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2012-06-01 05:26:28 +0000
commit2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch)
treec04604583d8be53b3ed7f10975be828c731f87cb /x11/fbdesk/files/patch-ImagePNG.cc
parent24315159daa0089f08acea4ba1b130fb6721ad5c (diff)
Notes
Diffstat (limited to 'x11/fbdesk/files/patch-ImagePNG.cc')
-rw-r--r--x11/fbdesk/files/patch-ImagePNG.cc21
1 files changed, 19 insertions, 2 deletions
diff --git a/x11/fbdesk/files/patch-ImagePNG.cc b/x11/fbdesk/files/patch-ImagePNG.cc
index 40c49462c946..28de77bce3b4 100644
--- a/x11/fbdesk/files/patch-ImagePNG.cc
+++ b/x11/fbdesk/files/patch-ImagePNG.cc
@@ -1,6 +1,14 @@
--- src/FbTk/ImagePNG.cc.orig 2004-09-20 16:04:11.000000000 +0200
-+++ src/FbTk/ImagePNG.cc 2010-03-29 21:44:37.000000000 +0200
-@@ -88,7 +88,7 @@
++++ src/FbTk/ImagePNG.cc 2012-05-06 09:59:07.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include "PixmapWithMask.hh"
+
+ #include <png.h>
++#include <pngpriv.h>
+ #include <cstdio>
+ #include <iostream>
+ using namespace std;
+@@ -88,7 +89,7 @@
// check header
unsigned char tag[4];
fread(tag, 1, 4, fp);
@@ -9,3 +17,12 @@
fclose(fp);
return 0;
}
+@@ -102,7 +103,7 @@
+ return 0;
+ }
+
+- if (setjmp(png.png()->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png.png()))) {
+ fclose(fp);
+ return 0;
+ }