diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-18 00:57:26 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-02-18 00:57:26 +0000 |
| commit | 176fca0eb498e718a192125eb08992ff145bbfb7 (patch) | |
| tree | 9e56be145d5221c191759eacd76202a033b4f0aa /libjava | |
| parent | 1597e4545a56d83cb1cdef9c820f9ce9e99f28f4 (diff) | |
| download | gcc-176fca0eb498e718a192125eb08992ff145bbfb7.tar.gz | |
* java/awt/image/ColorModel.java: Re-merged with Classpath.
* java/awt/image/ImageFilter.java: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@63024 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/awt/image/ColorModel.java | 2 | ||||
| -rw-r--r-- | libjava/java/awt/image/ImageFilter.java | 12 |
3 files changed, 9 insertions, 10 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c8c62cbbb35..a4e1719712a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-02-17 Tom Tromey <tromey@redhat.com> + + * java/awt/image/ColorModel.java: Re-merged with Classpath. + * java/awt/image/ImageFilter.java: Likewise. + 2003-02-17 Raif S. Naffah <raif@fl.net.au> * java/math/BigInteger.java (euclidInv): Return array of diff --git a/libjava/java/awt/image/ColorModel.java b/libjava/java/awt/image/ColorModel.java index fab51667edb..f798ee2c861 100644 --- a/libjava/java/awt/image/ColorModel.java +++ b/libjava/java/awt/image/ColorModel.java @@ -142,7 +142,7 @@ public abstract class ColorModel implements Transparency bits_sum |= bits [i]; } - if ((bits.length < cspace.numComponents) + if ((bits.length < cspace.getNumComponents()) || (bits_sum < 1)) throw new IllegalArgumentException (); diff --git a/libjava/java/awt/image/ImageFilter.java b/libjava/java/awt/image/ImageFilter.java index 86bc0210a4b..f58e5381df6 100644 --- a/libjava/java/awt/image/ImageFilter.java +++ b/libjava/java/awt/image/ImageFilter.java @@ -108,15 +108,9 @@ public class ImageFilter implements ImageConsumer, Cloneable throw new IllegalArgumentException("null argument for ImageFilter.getFilterInstance(ImageConsumer)"); consumer = ic; - try { - ImageFilter f = (ImageFilter)clone(); - consumer = null; - return f; - } catch ( CloneNotSupportedException cnse ) { - cnse.printStackTrace(); - consumer = null; - return null; - } + ImageFilter f = (ImageFilter)clone(); + consumer = null; + return f; } /** |