summaryrefslogtreecommitdiff
path: root/graphics/imlib/files/patch-load.c
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 /graphics/imlib/files/patch-load.c
parent- Allow for larger database UIDs (diff)
- update png to 1.5.10
Diffstat (limited to '')
-rw-r--r--graphics/imlib/files/patch-load.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/graphics/imlib/files/patch-load.c b/graphics/imlib/files/patch-load.c
index a51987eb63ef..471406402710 100644
--- a/graphics/imlib/files/patch-load.c
+++ b/graphics/imlib/files/patch-load.c
@@ -1,5 +1,22 @@
--- Imlib/load.c.orig 2004-09-21 02:23:20.000000000 +0200
+++ Imlib/load.c 2010-03-28 16:23:13.000000000 +0200
+@@ -170,6 +176,7 @@
+ #endif /* HAVE_LIBJPEG */
+
+ #ifdef HAVE_LIBPNG
++#include <pngpriv.h>
+ unsigned char *
+ _LoadPNG(ImlibData * id, FILE * f, int *w, int *h, int *t)
+ {
+@@ -192,7 +198,7 @@
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return NULL;
+ }
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return NULL;
@@ -1619,7 +1619,7 @@
return 0;
fread(buf, 1, 8, f);