[IcedTea6 1.9] RFC: Add support for libpng 1.5

[Dr Andrew John Hughes]

On 00:30 Thu 13 Oct     , Dr Andrew John Hughes wrote:
> I'd like to get this into 1.9 as well.  It's not a showstopper, but,
> as I'm having to apply it to 1.9 to do builds now, I'd prefer we
> were releasing the same thing as is being built.
> 
> The functions used seem pretty old, and all three are in the in-tree
> version of libpng.  So if you don't have them, you must be using a
> system libpng older than the version Oracle test against.
> 
> The functions are:
> 
> png_get_io_ptr
> png_jmpbuf
> png_set_read_fn
> 
> and, at least for png_get_io_ptr, the libpng documentation says:
> 
> "The png_get_io_ptr() function has been present since libpng-0.88, has
> never changed, and is unaffected by conditional compilation macros."
> 
> Ok for 1.9?
> 

Alternatively, we could use the attached patch to be on the safe side,
only changing those lines if 1.5 or above is used.
-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 248BDC07 (https://keys.indymedia.org/)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07
-------------- next part --------------
diff -r b139627f7bc3 src/share/native/sun/awt/splashscreen/splashscreen_png.c
--- a/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Mon Nov 22 09:43:58 2010 +0800
+++ b/src/share/native/sun/awt/splashscreen/splashscreen_png.c	Thu Oct 13 01:11:58 2011 +0100
@@ -31,12 +31,22 @@
 
 #define SIG_BYTES 8
 
+#if (PNG_LIBPNG_VER < 10500)
+#define GET_IO_PTR(png_ptr) png_ptr->io_ptr
+#define JMPBUF(png_ptr) png_ptr->jmpbuf
+#define SET_READ_FN(png_ptr,iop,read_func) png_ptr->io_ptr = iop; png_ptr->read_data_fn = read_func;
+#else
+#define GET_IO_PTR(png_ptr) png_get_io_ptr(png_ptr)
+#define JMPBUF(png_ptr) png_jmpbuf(png_ptr)
+#define SET_READ_FN(png_ptr,iop,read_func) png_set_read_fn(png_ptr,iop,read_func);
+#endif
+
 void PNGAPI
 my_png_read_stream(png_structp png_ptr, png_bytep data, png_size_t length)
 {
     png_uint_32 check;
 
-    SplashStream * stream = (SplashStream*)png_ptr->io_ptr;
+    SplashStream * stream = (SplashStream*)GET_IO_PTR(png_ptr);
     check = stream->read(stream, data, length);
     if (check != length)
         png_error(png_ptr, "Read Error");
@@ -71,12 +81,11 @@
         goto done;
     }
 
-    if (setjmp(png_ptr->jmpbuf)) {
+    if (setjmp(JMPBUF(png_ptr))) {
         goto done;
     }
 
-    png_ptr->io_ptr = io_ptr;
-    png_ptr->read_data_fn = read_func;
+    SET_READ_FN(png_ptr, io_ptr, read_func)
 
     png_set_sig_bytes(png_ptr, SIG_BYTES);      /* we already read the 8 signature bytes */
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111013/c1d33dc2/attachment.bin