diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2003-12-02 19:42:08 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2003-12-02 19:42:08 +0000 |
| commit | 19f77a0a29e4b11a2129e6e275e45bb801fa301d (patch) | |
| tree | 7aa9951a62d3c8745a0e93ce199ee1c90153bab6 /gnu/java/awt/image/XBMDecoder.java | |
| parent | de6be0cb35a5c6fbf345df7d3be760be8e9d0bf5 (diff) | |
| download | classpath-19f77a0a29e4b11a2129e6e275e45bb801fa301d.tar.gz | |
2003-12-02 Thomas Fitzsimmons <fitzsim@redhat.com>
* 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.
Diffstat (limited to 'gnu/java/awt/image/XBMDecoder.java')
| -rw-r--r-- | gnu/java/awt/image/XBMDecoder.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; |