Commit 9e7c41e0 authored by Cody Maloney's avatar Cody Maloney Committed by Alan Coopersmith

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: default avatarCody Maloney <cmaloney@theoreticalchaos.com>
Tested-by: Yaakov Selkowitz's avatarYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Alan Coopersmith's avatarAlan Coopersmith <alan.coopersmith@oracle.com>
parent 194d9a43
......@@ -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)
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment