From 9e7c41e0e16183110cd7b28d012a0bb69aed4655 Mon Sep 17 00:00:00 2001 From: Cody Maloney Date: Sun, 14 Mar 2010 00:07:23 -0800 Subject: Upgraded to work with libpng14 setjmp(png_ptr->jmpbuf) is depreceated so removed it and changed the configure.ac version number to accept libpng12 or libpng14 Signed-off-by: Cody Maloney Tested-by: Yaakov Selkowitz Signed-off-by: Alan Coopersmith --- configure.ac | 2 +- xcursorgen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e7344ba..7a57230 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PROG_INSTALL XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng12) +PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng >= 1.2.0) AC_SUBST(XCURSORGEN_CFLAGS) AC_SUBST(XCURSORGEN_LIBS) diff --git a/xcursorgen.c b/xcursorgen.c index fc80f6d..daae18b 100644 --- a/xcursorgen.c +++ b/xcursorgen.c @@ -196,7 +196,7 @@ load_image (struct flist *list, char *prefix) return NULL; } - if (setjmp (png->jmpbuf)) + if (setjmp (png_jmpbuf(png))) { png_destroy_read_struct (&png, &info, NULL); return NULL; -- cgit v1.2.3