diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 13:09:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-19 13:09:00 +0400 |
| commit | 879c13bbfc79d997ce9148d24c26704fbe6e3b50 (patch) | |
| tree | c63d74cd192ce04073d59f196f5525afa80b48d1 /source/blender/blenlib/intern/math_color_inline.c | |
| parent | 4786541285f6f190922ec9857753d620c528f181 (diff) | |
rename rgb_float_to_byte, rgb_byte_to_float to rgb_float_to_uchar, rgb_uchar_to_float and swap args (math functions mostly have dest arg first like strcpy).
Diffstat (limited to 'source/blender/blenlib/intern/math_color_inline.c')
| -rw-r--r-- | source/blender/blenlib/intern/math_color_inline.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenlib/intern/math_color_inline.c b/source/blender/blenlib/intern/math_color_inline.c index 18b0e9c6278..2c7b13b86a2 100644 --- a/source/blender/blenlib/intern/math_color_inline.c +++ b/source/blender/blenlib/intern/math_color_inline.c @@ -66,9 +66,9 @@ MINLINE void linearrgb_to_srgb_uchar3(unsigned char srgb[4], const float linear[ { int r, g, b; - r = 255 * linearrgb_to_srgb(linear[0]) * 255; - g = 255 * linearrgb_to_srgb(linear[1]) * 255; - b = 255 * linearrgb_to_srgb(linear[2]) * 255; + 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); @@ -79,9 +79,9 @@ MINLINE void linearrgb_to_srgb_uchar4(unsigned char srgb[4], const float linear[ { int r, g, b, a; - r = 255 * linearrgb_to_srgb(linear[0]) * 255; - g = 255 * linearrgb_to_srgb(linear[1]) * 255; - b = 255 * linearrgb_to_srgb(linear[2]) * 255; + 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); |