Commit: ce11e1c878fa5fffb4ab0a5d0a4b453dc21b8c2e
Author: Campbell Barton
Date: Thu Mar 19 12:42:34 2015 +1100
Branches: master
https://developer.blender.org/rBce11e1c878fa5fffb4ab0a5d0a4b453dc21b8c2e
Cleanup: better not pass function call to FTOCHAR
also use rgb_uchar_to_float
===================================================================
M source/blender/imbuf/intern/colormanagement.c
===================================================================
diff --git a/source/blender/imbuf/intern/colormanagement.c
b/source/blender/imbuf/intern/colormanagement.c
index 588d81f..a1b7a14 100644
--- a/source/blender/imbuf/intern/colormanagement.c
+++ b/source/blender/imbuf/intern/colormanagement.c
@@ -1243,19 +1243,19 @@ const char
*IMB_colormanagement_get_rect_colorspace(ImBuf *ibuf)
float IMB_colormanagement_get_luminance(const float rgb[3])
{
- return dot_v3v3(luma_coefficients, rgb);
+ return dot_v3v3(luma_coefficients, rgb);
}
/* Byte equivalent of IMB_colormanagement_get_luminance(). */
unsigned char IMB_colormanagement_get_luminance_byte(const unsigned char
rgb[3])
{
- float rgbf[3];
+ float rgbf[3];
+ float val;
- rgbf[0] = (float) rgb[0] / 255.0f;
- rgbf[1] = (float) rgb[1] / 255.0f;
- rgbf[2] = (float) rgb[2] / 255.0f;
+ rgb_uchar_to_float(rgbf, rgb);
+ val = dot_v3v3(luma_coefficients, rgbf);
- return FTOCHAR(dot_v3v3(luma_coefficients, rgbf));
+ return FTOCHAR(val);
}
/*********************** Threaded display buffer transform routines
*************************/
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
