Fix issue in recent color commits, was still doing a multiplication by 255 too

many, also don't check uchar range after casting to int, this can still cause
overflow with large float values.

1 files changed, 2 insertions, 20 deletions

diff --git a/source/blender/blenlib/intern/math_color.c b/source/blender/blenlib/intern/math_color.c
index 94dbdf9fe58..ca2aeca8f36 100644
--- a/source/blender/blenlib/intern/math_color.c
+++ b/source/blender/blenlib/intern/math_color.c
@@ -354,30 +354,12 @@ void rgba_uchar_to_float(float col_r[4], const unsigned char col_ub[4])
 
 void rgb_float_to_uchar(unsigned char col_r[3], const float col_f[3])
 {
-	int r, g, b;
-	
-	r= (int)(col_f[0] * 255.0f);
-	g= (int)(col_f[1] * 255.0f);
-	b= (int)(col_f[2] * 255.0f);
-	
-	col_r[0]= (char)((r <= 0)? 0 : (r >= 255)? 255 : r);
-	col_r[1]= (char)((g <= 0)? 0 : (g >= 255)? 255 : g);
-	col_r[2]= (char)((b <= 0)? 0 : (b >= 255)? 255 : b);
+	F3TOCHAR3(col_f, col_r);
 }
 
 void rgba_float_to_uchar(unsigned char col_r[4], const float col_f[4])
 {
-	int r, g, b, a;
-
-	r= (int)(col_f[0] * 255.0f);
-	g= (int)(col_f[1] * 255.0f);
-	b= (int)(col_f[2] * 255.0f);
-	a= (int)(col_f[3] * 255.0f);
-
-	col_r[0]= (char)((r <= 0)? 0 : (r >= 255)? 255 : r);
-	col_r[1]= (char)((g <= 0)? 0 : (g >= 255)? 255 : g);
-	col_r[2]= (char)((b <= 0)? 0 : (b >= 255)? 255 : b);
-	col_r[3]= (char)((a <= 0)? 0 : (a >= 255)? 255 : a);
+	F4TOCHAR4(col_f, col_r);
 }
 
 /* ********************************* color transforms ********************************* */