summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2013-03-30 16:35:40 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2013-03-30 16:35:40 +0100
commit8956a23c6ca7e0174b5ece50e43bb343884cae8b (patch)
treec9f9c257a9f32513020d28056d6925c507d33bde
parent088f149d2cddd66fb45e5c9405caa9c104c855e9 (diff)
parentef5901584a28f319639c0ac22b83a7039c78ae9d (diff)
Merge branch 'master' of http://git.drumgizmo.org/drumgizmo
Merge in libpng1.2 compat fix.
-rw-r--r--configure.in2
-rw-r--r--plugingui/image.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 8d5700a..ed1ff25 100644
--- a/configure.in
+++ b/configure.in
@@ -257,7 +257,7 @@ PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.21)
dnl ======================
dnl Check for sndfile
dnl ======================
-PKG_CHECK_MODULES(PNG, libpng >= 1.5)
+PKG_CHECK_MODULES(PNG, libpng >= 1.2)
dnl ======================
dnl Check for the pthread library
diff --git a/plugingui/image.cc b/plugingui/image.cc
index e4f7391..32994b6 100644
--- a/plugingui/image.cc
+++ b/plugingui/image.cc
@@ -82,7 +82,7 @@ void GUI::Image::load(const char* data, size_t size)
const char *header = data;
// test for it being a png:
- if(png_sig_cmp((const png_byte*)header, 0, 8)) {
+ if(png_sig_cmp((png_byte*)header, 0, 8)) {
abort_("[read_png_file] File is not recognized as a PNG file");
}