Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 373330 Details for
Bug 287267
[java-overlay]version bump: dev-java/j3d-core-1.6.0
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
j3d-core-1.5.2-java1_7-codec-jpeg.patch
j3d-core-1.5.2-java1_7-codec-jpeg.patch (text/plain), 2.32 KB, created by
Fabio Rossi
on 2014-03-23 18:12:41 UTC
(
hide
)
Description:
j3d-core-1.5.2-java1_7-codec-jpeg.patch
Filename:
MIME Type:
Creator:
Fabio Rossi
Created:
2014-03-23 18:12:41 UTC
Size:
2.32 KB
patch
obsolete
>Description: FTBFS with java7 > * Replace use of com.sun.image.codec.jpeg.* with ImageIO. > * Extend class-path for javah >Author: Niels Thykier <niels@thykier.net> >Reviewed-by: James Page <james.page@ubuntu.com> > >--- j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java >+++ j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java.new >@@ -61,10 +61,7 @@ import com.sun.j3d.utils.scenegraph.io.r > import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException; > import java.awt.color.ColorSpace; > import java.awt.image.DataBuffer; >-import com.sun.image.codec.jpeg.JPEGImageEncoder; >-import com.sun.image.codec.jpeg.JPEGImageDecoder; >-import com.sun.image.codec.jpeg.JPEGCodec; >-import com.sun.image.codec.jpeg.JPEGEncodeParam; >+import javax.imageio.ImageIO; > > public abstract class ImageComponentState extends NodeComponentState { > >@@ -203,10 +200,9 @@ public abstract class ImageComponentStat > > private void writeBufferedImageJpegCompression( DataOutput out, BufferedImage image ) throws IOException { > ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); >- JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder( byteStream ); >- >- encoder.encode( image ); >- byteStream.close(); >+ if (!ImageIO.write(image, "jpeg", byteStream)) { >+ throw new AssertionError("No JPEG encoder available"); >+ } > > byte[] buffer = byteStream.toByteArray(); > out.writeInt( buffer.length ); >@@ -261,11 +257,15 @@ public abstract class ImageComponentStat > byte[] buffer = new byte[ size ]; > in.readFully( buffer ); > ByteArrayInputStream byteStream = new ByteArrayInputStream( buffer ); >- >- JPEGImageDecoder decoder = JPEGCodec.createJPEGDecoder( byteStream ); >- byteStream.close(); >- >- return decoder.decodeAsBufferedImage(); >+ try { >+ BufferedImage img = ImageIO.read(byteStream); >+ if (img == null) { >+ throw new AssertionError("No ImageReader available."); >+ } >+ return img; >+ } finally { >+ byteStream.close(); >+ } > } > > private void writeColorModel( DataOutput out, ColorModel colorModel ) throws IOException {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 287267
:
357844
|
373326
|
373328
| 373330 |
410038
|
516278