Fix CTS' ColorUtils's XYZ to Color
- CTS contains an independent copy of Monet, as CTS cannot depend on
framework
- this copy of Monet contains one piece from
com.android.internal.graphics.ColorUtils: a method for converting from
XYZ to RGB
- First, Cam.java converts from HCT to XYZ. Then, it delegates to the
above ColorUtils method to convert from XYZ to RGB
- ColorUtils' implementation _intends_ to call
Color.rgb(int from 0...255), but does not cast the result of clamping
to an int, so its accidentally calling Color.rgb(float from 0...1, ...)
- This leads to wonky overflowing behavior, results in a hex code thats
obviously red even though the color is green
- Adding a cast so ColorUtils calls Color.rgb(int, int, int) fixes the
test and leads to an expected result (hex code #ff06fc00)
Test: log statements
Bug: 200328975
Change-Id: Ib984d9e21c5df4550321bf7e4e438de239860aac
diff --git a/tests/tests/graphics/src/android/graphics/cts/utils/ColorUtils.java b/tests/tests/graphics/src/android/graphics/cts/utils/ColorUtils.java
index 62176d3..78529a1 100644
--- a/tests/tests/graphics/src/android/graphics/cts/utils/ColorUtils.java
+++ b/tests/tests/graphics/src/android/graphics/cts/utils/ColorUtils.java
@@ -52,9 +52,9 @@
b = b > 0.0031308 ? 1.055 * Math.pow(b, 1 / 2.4) - 0.055 : 12.92 * b;
return Color.rgb(
- constrain((int) Math.round(r * 255), 0, 255),
- constrain((int) Math.round(g * 255), 0, 255),
- constrain((int) Math.round(b * 255), 0, 255));
+ (int) constrain((int) Math.round(r * 255), 0, 255),
+ (int) constrain((int) Math.round(g * 255), 0, 255),
+ (int) constrain((int) Math.round(b * 255), 0, 255));
}
private static float constrain(float amount, float low, float high) {
