diff options
| author | Scott Gilbertson <scottg@mantatest.com> | 2002-11-30 04:51:11 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2002-11-30 04:51:11 +0000 |
| commit | 8ad3385a168fd6f2931433b361923c3581dd674a (patch) | |
| tree | 37755dc7eaedc76869fbef729b49c40dea1c70af /libjava | |
| parent | 6d6661fe6f09be8d47c5274f4bb6f22f5c063515 (diff) | |
| download | gcc-8ad3385a168fd6f2931433b361923c3581dd674a.zip gcc-8ad3385a168fd6f2931433b361923c3581dd674a.tar.gz gcc-8ad3385a168fd6f2931433b361923c3581dd674a.tar.bz2 | |
ColorModel.java (getUnnormalizedComponents, [...]): Fix calculation which was using one too many bits in the unnormalized format.
2002-11-29 Scott Gilbertson <scottg@mantatest.com>
* java/awt/image/ColorModel.java (getUnnormalizedComponents,
getNormalizedComponents): Fix calculation which was using one too
many bits in the unnormalized format.
From-SVN: r59651
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/awt/image/ColorModel.java | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9206f99..3b6fd1a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-11-29 Scott Gilbertson <scottg@mantatest.com> + + * java/awt/image/ColorModel.java (getUnnormalizedComponents, + getNormalizedComponents): Fix calculation which was using one too + many bits in the unnormalized format. + 2002-11-29 Gary Benson <gbenson@redhat.com> For PR libgcj/8759: diff --git a/libjava/java/awt/image/ColorModel.java b/libjava/java/awt/image/ColorModel.java index 9cbbf4b..14a1b2e 100644 --- a/libjava/java/awt/image/ColorModel.java +++ b/libjava/java/awt/image/ColorModel.java @@ -424,7 +424,7 @@ public abstract class ColorModel implements Transparency for (int i=0; i<numComponents; i++) { float in = normComponents[normOffset++]; - int out = (int) (in * ((2<<getComponentSize(i)) - 1)); + int out = (int) (in * ((1<<getComponentSize(i)) - 1)); components[offset++] = out; } return components; @@ -447,7 +447,7 @@ public abstract class ColorModel implements Transparency for (int i=0; i<numComponents; i++) { float in = components[offset++]; - float out = in / ((2<<getComponentSize(i)) - 1); + float out = in / ((1<<getComponentSize(i)) - 1); normComponents[normOffset++] = out; } return normComponents; |