summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-02-27 09:55:11 +0100
committerDaniel Friesel <derf@finalrewind.org>2011-02-27 09:55:53 +0100
commitbbc68473129227511e1fb1f9876e3cb68bc7fa26 (patch)
tree728d75a236d1651a8b0d64c0b53fc266ca7efe47
parent1bd5482d102b7cb0032d31827ddfc25bd1342d1e (diff)
feh_png: Update to new libpng API, fixes compilation issues with 1.5.1
-rw-r--r--ChangeLog1
-rw-r--r--src/feh_png.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a43488..32859a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ git HEAD
"make xinerama=0 debug=1". By default feh is compiled with xinerama and
libcurl support enabled, see README.
* Remove builtin http client (--builtin)
+ * Fix compilation issues with libpng 1.5.1
Wed, 09 Feb 2011 20:11:26 +0100 Daniel Friesel <derf@finalrewind.org>
diff --git a/src/feh_png.c b/src/feh_png.c
index cefd4c8..f02aecb 100644
--- a/src/feh_png.c
+++ b/src/feh_png.c
@@ -66,7 +66,7 @@ gib_hash *feh_png_read_comments(char *file)
return hash;
}
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
fclose(fp);
return hash;
@@ -124,7 +124,7 @@ int feh_png_write_png(Imlib_Image image, char *file, ...)
return 0;
}
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
fclose(fp);
png_destroy_write_struct(&png_ptr, &info_ptr);
png_destroy_info_struct(png_ptr, &info_ptr);