From 10272731ee81b934d514c7240362e3ab874aa38d Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Wed, 8 Jan 2014 14:02:46 +0000
Subject: [PATCH] color: fix issues in color to string conversions.
---
src/image/color/color.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/image/color/color.cpp b/src/image/color/color.cpp
index ba9ea517..b2249af8 100644
--- a/src/image/color/color.cpp
+++ b/src/image/color/color.cpp
@@ -19,25 +19,25 @@ namespace lol
String Color::HexString4Bpp(vec3 c)
{
- uvec3 c2 = (uvec3)(clamp(c, 0.f, 1.f) * 255.0f);
+ uvec3 c2 = (uvec3)(clamp(c, 0.f, 1.f) * 255.999f);
return String::Printf("%01x%01x%01x", c2.r, c2.g, c2.b);
}
String Color::HexString4Bpp(vec4 c)
{
- uvec4 c2 = (uvec4)(clamp(c, 0.f, 1.f) * 255.0f);
+ uvec4 c2 = (uvec4)(clamp(c, 0.f, 1.f) * 15.999f);
return String::Printf("%01x%1x%01x%01x", c2.r, c2.g, c2.b, c2.a);
}
String Color::HexString8Bpp(vec3 c)
{
- uvec3 c2 = (uvec3)(clamp(c, 0.f, 1.f) * 255.0f);
+ uvec3 c2 = (uvec3)(clamp(c, 0.f, 1.f) * 255.999f);
return String::Printf("%02x%02x%02x", c2.r, c2.g, c2.b);
}
String Color::HexString8Bpp(vec4 c)
{
- uvec4 c2 = (uvec4)(clamp(c, 0.f, 1.f) * 255.0f);
+ uvec4 c2 = (uvec4)(clamp(c, 0.f, 1.f) * 15.999f);
return String::Printf("%02x%2x%02x%02x", c2.r, c2.g, c2.b, c2.a);
}