ColorModel.java (getUnnormalizedComponents, [...]): Fix calculation which was using...

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9206f99b796d9e2980dfa472b42cfb386f1af035..3b6fd1accb72b4179b3bac9184d0c6203619b89f 100644 (file)
--- 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 9cbbf4ba31792a90dd0ff14796d4f3e221178e05..14a1b2e73b90e8355738c68d01fb85dc17d67c7b 100644 (file)
--- 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;