griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
many, also don't check uchar range after casting to int, this can still cause
overflow with large float values.
This commit is contained in:
Brecht Van Lommel
2012-01-19 16:22:22 +00:00
parent 167999304e
commit 1d46bbef7e
3 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenlib/BLI_math_color.h
View File

@@ -91,6 +91,9 @@ MINLINE void linearrgb_to_srgb_v4(float srgb[4], const float linear[4]);
MINLINE void srgb_to_linearrgb_predivide_v4(float linear[4], const float srgb[4]);
MINLINE void linearrgb_to_srgb_predivide_v4(float srgb[4], const float linear[4]);
MINLINE void linearrgb_to_srgb_uchar3(unsigned char srgb[3], const float linear[3]);
MINLINE void linearrgb_to_srgb_uchar4(unsigned char srgb[4], const float linear[4]);
void BLI_init_srgb_conversion(void);
/************************** Other *************************/

22
source/blender/blenlib/intern/math_color.c
View File

@@ -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 ********************************* */

26
source/blender/blenlib/intern/math_color_inline.c
View File

@@ -62,32 +62,20 @@ MINLINE void linearrgb_to_srgb_v4(float srgb[4], const float linear[4])
srgb[3] = linear[3];
}
MINLINE void linearrgb_to_srgb_uchar3(unsigned char srgb[4], const float linear[4])
MINLINE void linearrgb_to_srgb_uchar3(unsigned char srgb[3], const float linear[3])
{
int r, g, b;
float srgb_f[3];
r = 255 * linearrgb_to_srgb(linear[0]);
g = 255 * linearrgb_to_srgb(linear[1]);
b = 255 * linearrgb_to_srgb(linear[2]);
srgb[0] = FTOCHAR(r);
srgb[1] = FTOCHAR(g);
srgb[2] = FTOCHAR(b);
linearrgb_to_srgb_v3_v3(srgb_f, linear);
F3TOCHAR3(srgb_f, srgb);
}
MINLINE void linearrgb_to_srgb_uchar4(unsigned char srgb[4], const float linear[4])
{
int r, g, b, a;
float srgb_f[4];
r = 255 * linearrgb_to_srgb(linear[0]);
g = 255 * linearrgb_to_srgb(linear[1]);
b = 255 * linearrgb_to_srgb(linear[2]);
a = 255 * linear[3];
srgb[0] = FTOCHAR(r);
srgb[1] = FTOCHAR(g);
srgb[2] = FTOCHAR(b);
srgb[3] = FTOCHAR(a);
linearrgb_to_srgb_v4(srgb_f, linear);
F4TOCHAR4(srgb_f, srgb);
}
/* predivide versions to work on associated/premultipled alpha. if this should