Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ebb <matt@mke3.net>2010-03-31 03:32:16 +0400
committerMatt Ebb <matt@mke3.net>2010-03-31 03:32:16 +0400
commit05c2906b769a3a56939bd870589dab637b73d63d (patch)
treeb3de8d412091615f9ea823894b1b4ea0af0042f7 /source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
parentc9f81c87b88574fa803050040a6b8ddf398968aa (diff)
Patch from Xavier Thomas:
YCbCr conversion function according to ITU-R BT.601/709 and JFIF Clarifies color space usage in rgb->ycc conversion, doesn't change existing results.
Diffstat (limited to 'source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c')
-rw-r--r--source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
index e42fafe58e5..7b3dfccab50 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
@@ -47,7 +47,7 @@ static void do_sepycca(bNode *node, float *out, float *in)
{
float y, cb, cr;
- rgb_to_ycc(in[0], in[1], in[2], &y, &cb, &cr);
+ rgb_to_ycc(in[0], in[1], in[2], &y, &cb, &cr, BLI_YCC_ITU_BT601);
/*divided by 255 to normalize for viewing in */
out[0]= y/255.0;
@@ -62,7 +62,7 @@ static void node_composit_exec_sepycca(void *data, bNode *node, bNodeStack **in,
if(in[0]->data==NULL) {
float y, cb, cr;
- rgb_to_ycc(in[0]->vec[0], in[0]->vec[1], in[0]->vec[2], &y, &cb, &cr);
+ rgb_to_ycc(in[0]->vec[0], in[0]->vec[1], in[0]->vec[2], &y, &cb, &cr, BLI_YCC_ITU_BT601);
/*divided by 255 to normalize for viewing in */
out[0]->vec[0] = y/255.0;
@@ -136,7 +136,7 @@ static void do_comb_ycca(bNode *node, float *out, float *in1, float *in2, float
cb=in2[0]*255;
cr=in3[0]*255;
- ycc_to_rgb(y,cb,cr, &r, &g, &b);
+ ycc_to_rgb(y,cb,cr, &r, &g, &b, BLI_YCC_ITU_BT601);
out[0] = r;
out[1] = g;