From 19f77a0a29e4b11a2129e6e275e45bb801fa301d Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Tue, 2 Dec 2003 19:42:08 +0000 Subject: 2003-12-02 Thomas Fitzsimmons * include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h, include/gnu_java_awt_peer_gtk_GtkComponentPeer.h, include/gnu_java_awt_peer_gtk_GtkToolkit.h: Regenerate. * native/jni/gtk-peer/Makefile.am: Add gnu_java_awt_peer_gtk_GdkPixbufDecoder.c. * gnu/java/awt/image/ImageDecoder.java (ImageDecoder(byte[],int,int)): New constructor. (startProduction): Create ByteArrayInputStream when url and filename are null. (produce): Declare stream parameter as InputStream. * gnu/java/awt/image/XBMDecoder.java (produce): Declare stream parameter as InputStream. * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java (GdkPixbufDecoder(byte[],int,int)): New constructor. (produce): Declare stream parameter as InputStream. * gnu/java/awt/peer/gtk/GtkComponentPeer.java (prepareImage): Throw NPE if image is null. Set image's observer before running PrepareImage thread. Pass image to startProduction. * gnu/java/awt/peer/gtk/GtkImage.java: Add null checks before calls to source's member functions. (observer): New field. (setObserver): New method. (setDimensions, setPixels, imageComplete): Call observer's imageUpdate. * gnu/java/awt/peer/gtk/GtkToolkit.java (checkImage, getImage): Return new GtkImage. (prepareImage): Implement. * java/awt/Component.java: Add static fields incrementalDraw and redrawRate. (imageUpdate): Implement. (createImage): Call Toolkit's createImage if peer is null. (prepareImage): Throw NPE if image is null. * java/awt/MediaTracker.java: Fix return value. --- gnu/java/awt/image/XBMDecoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/java/awt/image/XBMDecoder.java') diff --git a/gnu/java/awt/image/XBMDecoder.java b/gnu/java/awt/image/XBMDecoder.java index 2505b3d1b..b80fd55de 100644 --- a/gnu/java/awt/image/XBMDecoder.java +++ b/gnu/java/awt/image/XBMDecoder.java @@ -62,7 +62,7 @@ public class XBMDecoder extends ImageDecoder super (url); } - public void produce (Vector v, FileInputStream is) throws IOException + public void produce (Vector v, InputStream is) throws IOException { reader = new BufferedReader (new InputStreamReader (is)); int width = -1, height = -1; -- cgit v1.2.1