summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2015-03-19 12:53:52 +0100
committerPhilipp Zabel <p.zabel@pengutronix.de>2015-04-14 11:53:08 +0200
commitde91543268baea4e88635b1c93dac3b64d7ff27e (patch)
tree70e36d8f3d2f82e48105003c4f903c0c39d6c960
parent594ec30073c1ef99a1bd8a20e59b0e10ac9549bb (diff)
downloadkmsfbwrap-de91543268baea4e88635b1c93dac3b64d7ff27e.tar.gz
kmsfbwrap-de91543268baea4e88635b1c93dac3b64d7ff27e.tar.xz
add support for libpng16
Reported-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-rw-r--r--src/png.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/png.c b/src/png.c
index 350f960..92b10ca 100644
--- a/src/png.c
+++ b/src/png.c
@@ -31,6 +31,10 @@
#define PNG_BYTES_TO_CHECK 4
+#if (PNG_LIBPNG_VER < 10500)
+#define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#endif
+
int png_load(char *name, struct splash *image, unsigned char **alpha)
{
int bit_depth, color_type, interlace_type;
@@ -70,7 +74,7 @@ int png_load(char *name, struct splash *image, unsigned char **alpha)
}
rp=0;
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
if(rp)