[nogravity] Really fix libpng-1.5 patch to also work with libpng-1.2
Hans de Goede
jwrdegoede at fedoraproject.org
Tue Dec 6 18:13:52 UTC 2011
commit 985e9bac13c90389bb9f0d96c6c0857afce0b77c
Author: Hans de Goede <hdegoede at redhat.com>
Date: Tue Dec 6 19:14:50 2011 +0100
Really fix libpng-1.5 patch to also work with libpng-1.2
nogravity-2.00-libpng15.patch | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/nogravity-2.00-libpng15.patch b/nogravity-2.00-libpng15.patch
index b9e395e..5d04ca6 100644
--- a/nogravity-2.00-libpng15.patch
+++ b/nogravity-2.00-libpng15.patch
@@ -14,7 +14,7 @@ diff -up nogravity-2.00/rlx32/src/gx_png.c~ nogravity-2.00/rlx32/src/gx_png.c
#ifdef _DEBUG
SYS_Msg("!%s", message);
#endif
-+#ifndef LIBPNG_VERSION_12
++#if PNG_LIBPNG_VER >= 10400
+ png_longjmp(png_ptr, 1);
+#else
longjmp(png_ptr->jmpbuf, 1);
@@ -26,7 +26,7 @@ diff -up nogravity-2.00/rlx32/src/gx_png.c~ nogravity-2.00/rlx32/src/gx_png.c
info_ptr = png_create_info_struct(png_ptr);
png_read_info(png_ptr, info_ptr); /* read all PNG info up to image data */
-+#ifndef LIBPNG_VERSION_12
++#if PNG_LIBPNG_VER >= 10400
+ if (setjmp(png_jmpbuf(png_ptr)))
+#else
if (setjmp(png_ptr->jmpbuf))
More information about the scm-commits
mailing list