Mercurial > hg > openjdk > icedtea > jdk7 > jdk
changeset 4524:e46d527097f1
G356743: Support building against libpng 1.5.
author | andrew |
---|---|
date | Wed, 03 Aug 2011 00:33:07 +0100 |
parents | ccf86bbc61fd |
children | 3a2014eddd87 |
files | src/share/native/sun/awt/splashscreen/splashscreen_png.c |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/sun/awt/splashscreen/splashscreen_png.c Fri Jul 29 16:00:32 2011 -0400 +++ b/src/share/native/sun/awt/splashscreen/splashscreen_png.c Wed Aug 03 00:33:07 2011 +0100 @@ -36,7 +36,7 @@ { png_uint_32 check; - SplashStream * stream = (SplashStream*)png_ptr->io_ptr; + SplashStream * stream = (SplashStream*)png_get_io_ptr(png_ptr); check = stream->read(stream, data, length); if (check != length) png_error(png_ptr, "Read Error"); @@ -71,12 +71,11 @@ goto done; } - if (setjmp(png_ptr->jmpbuf)) { + if (setjmp(png_jmpbuf(png_ptr))) { goto done; } - png_ptr->io_ptr = io_ptr; - png_ptr->read_data_fn = read_func; + png_set_read_fn(png_ptr, io_ptr, read_func); png_set_sig_bytes(png_ptr, SIG_BYTES); /* we already read the 8 signature bytes */