summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/java/awt/image/ColorModel.java4
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9206f99b796..3b6fd1accb7 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 9cbbf4ba317..14a1b2e73b9 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;
OpenPOWER on IntegriCloud