diff options
Diffstat (limited to 'geography/gdal-lib/patches/patch-ab')
| -rw-r--r-- | geography/gdal-lib/patches/patch-ab | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/geography/gdal-lib/patches/patch-ab b/geography/gdal-lib/patches/patch-ab index d4208ca9862..5a8a934371c 100644 --- a/geography/gdal-lib/patches/patch-ab +++ b/geography/gdal-lib/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.6 2011/01/17 09:14:15 wiz Exp $ +$NetBSD: patch-ab,v 1.7 2011/01/18 09:01:29 wiz Exp $ Fix build with png-1.5. @@ -31,20 +31,15 @@ Fix build with png-1.5. } /************************************************************************/ -@@ -1338,10 +1338,13 @@ static void png_gdal_error( png_structp +@@ -1338,10 +1338,10 @@ static void png_gdal_error( png_structp // libpng is generally not built as C++ and so won't honour unwind // semantics. Ugg. - jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr; -- if (psSetJmpContext) -+ if (png_jmpbuf(png_ptr)) ++ jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr); + if (psSetJmpContext) { -- longjmp( *psSetJmpContext, 1 ); -+#if (PNG_LIBPNG_VER < 10500) -+ longjmp( (jmp_buf*) png_ptr->error_ptr, 1 ); -+#else -+ png_longjmp (png_ptr, 1); -+#endif + longjmp( *psSetJmpContext, 1 ); } } |