Merge "Don't clamp when converting to XYZ"
diff --git a/include/ui/ColorSpace.h b/include/ui/ColorSpace.h
index 2543e7f..c6a20c9 100644
--- a/include/ui/ColorSpace.h
+++ b/include/ui/ColorSpace.h
@@ -99,11 +99,10 @@
/**
* Converts the supplied RGB value to XYZ. The input RGB value
* is decoded using this color space's electro-optical function
- * before being converted to XYZ. The returned result is clamped
- * by this color space's clamping function.
+ * before being converted to XYZ.
*/
constexpr float3 rgbToXYZ(const float3& rgb) const noexcept {
- return apply(mRGBtoXYZ * toLinear(rgb), mClamper);
+ return mRGBtoXYZ * toLinear(rgb);
}
constexpr const std::string& getName() const noexcept {
diff --git a/libs/ui/tests/colorspace_test.cpp b/libs/ui/tests/colorspace_test.cpp
index 5c127ad..b5a06e6 100644
--- a/libs/ui/tests/colorspace_test.cpp
+++ b/libs/ui/tests/colorspace_test.cpp
@@ -134,7 +134,7 @@
TEST_F(ColorSpaceTest, Clamping) {
// Pick a color outside of sRGB
- float3 c(ColorSpace::DCIP3().rgbToXYZ(float3{0, 1, 0}));
+ float3 c(ColorSpace::BT2020().rgbToXYZ(float3{0, 1, 0}));
// The color will be clamped
float3 sRGB(ColorSpace::sRGB().xyzToRGB(c));