diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-07 14:17:39 +0200 |
| commit | 2dd6d1fc82c0563c0b3af90ad4926fa6463c204f (patch) | |
| tree | cea2d78836b0958b0402b42976c4c84ec6e700a8 /package/DirectFB/patches/patch-tools_mkdfiff_c | |
| parent | c82f34b5a8e2851c2074c1e03263f788eb2c28be (diff) | |
| parent | 3cda7c5f211225fea03a3634daeef9cafd627aa2 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/firefox/Makefile
package/jpeg/patches/patch-ltmain_sh
Diffstat (limited to 'package/DirectFB/patches/patch-tools_mkdfiff_c')
| -rw-r--r-- | package/DirectFB/patches/patch-tools_mkdfiff_c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/package/DirectFB/patches/patch-tools_mkdfiff_c b/package/DirectFB/patches/patch-tools_mkdfiff_c new file mode 100644 index 000000000..f321f8a84 --- /dev/null +++ b/package/DirectFB/patches/patch-tools_mkdfiff_c @@ -0,0 +1,11 @@ +--- DirectFB-1.4.11.orig/tools/mkdfiff.c 2010-10-31 09:49:49.000000000 +0100 ++++ DirectFB-1.4.11/tools/mkdfiff.c 2011-03-29 10:57:18.503068913 +0200 +@@ -97,7 +97,7 @@ load_image (const char *filen + if (!png_ptr) + goto cleanup; + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf (png_ptr))) { + if (desc->preallocated[0].data) { + free (desc->preallocated[0].data); + desc->preallocated[0].data = NULL; |