From 122ce965e6a2cfd03426146540e17f6a5034e45c Mon Sep 17 00:00:00 2001 From: fitzsim Date: Wed, 12 Nov 2003 00:37:34 +0000 Subject: 2003-11-11 Thomas Fitzsimmons * Makefile.am: Add GdkPixbufDecoder.java and gnu_java_awt_peer_gtk_GdkPixbufDecoder.c * Makefile.in: Regenerate. * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73476 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/java/awt/image/XBMDecoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libjava/gnu/java/awt/image/XBMDecoder.java') diff --git a/libjava/gnu/java/awt/image/XBMDecoder.java b/libjava/gnu/java/awt/image/XBMDecoder.java index 2505b3d1ba9..b80fd55de54 100644 --- a/libjava/gnu/java/awt/image/XBMDecoder.java +++ b/libjava/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.3