diff options
| author | Cody Maloney <cmaloney@theoreticalchaos.com> | 2010-03-14 00:07:23 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-05-18 18:12:22 -0700 |
| commit | 9e7c41e0e16183110cd7b28d012a0bb69aed4655 (patch) | |
| tree | 78864d5051d3f5e89b3ddf3293589988a6d56f48 | |
| parent | 194d9a4353dbf0b4c1d2895e60966bbc4429c54d (diff) | |
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 <cmaloney@theoreticalchaos.com>
Tested-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | 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; |