freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix build with JDK 1.7. [1]

Browse Source 
- Propagate Make environment to Ant to use the correct JDK and not just the one
  that Ant was built with.

PR:		173505 [1]
Submitted by:	James Raynard <james.raynard@pobox.com> [1]
Patch by:	Piotr Smyrak <piotr.smyrak@gmail.com> [1]
Obtained from:	https://launchpad.net/ubuntu/+source/java3d/1.5.2+dfsg-8 [1]
This commit is contained in:
Stefan Walter
2013-06-16 17:05:55 +00:00
parent 56e208081c
commit 1f0ed457fd
3 changed files with 69 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
java/java3d/files/patch-ImageComponentState.java Normal file
View File

@@ -0,0 +1,50 @@
work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d
--- j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java.orig
+++ j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java
@@ -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 {

8
java/java3d/files/patch-freebsd
View File

@@ -88,6 +88,14 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/build.xml ./j3d-core/src/native/bu
<property name="bldType" value="opt"/>
<property name="javahCoreSrc"
location="${src}/classes/share/javax/media/j3d"/>
@@ -347,6 +360,7 @@
<javah destdir="${javahCoreTarget}" force="yes">
<classpath>
<pathelement path="${build}/${platform}/${bldType}/classes"/>
+ <pathelement path="${vecmath_home}/build/opt/lib/ext/vecmath.jar"/>
</classpath>
<class name="javax.media.j3d.Background"/>
diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/src/native/ogl/build-freebsd.xml
--- ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml 1970-01-01 12:00:00.000000000 +1200
+++ ./j3d-core/src/native/ogl/build-freebsd.xml 2009-07-12 13:21:41.000000000 +1200