From 59ac5a1725b2e1184c83ac7dcd755fd33d06f696 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 18 Feb 2003 00:57:26 +0000
Subject: [PATCH] ColorModel.java: Re-merged with Classpath.
* java/awt/image/ColorModel.java: Re-merged with Classpath.
* java/awt/image/ImageFilter.java: Likewise.
From-SVN: r63024
---
libjava/ChangeLog | 5 +++++
libjava/java/awt/image/ColorModel.java | 2 +-
libjava/java/awt/image/ImageFilter.java | 12 +++---------
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c8c62cbbb354..a4e1719712aa 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 fab51667edba..f798ee2c8616 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 86bc0210a4bb..f58e5381df63 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;
}
/**
--
GitLab