Merging r50470 through r50477 from trunk into soc-2011-tomato
[blender.git] / source / blender / nodes / composite / nodes / node_composite_channelMatte.c
index b3690b5..06b77de 100644 (file)
 
 /* ******************* Channel Matte Node ********************************* */
 static bNodeSocketTemplate cmp_node_channel_matte_in[]={
-       {SOCK_RGBA,1,"Image", 1.0f, 1.0f, 1.0f, 1.0f},
-       {-1,0,""}
+       {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
+       {-1, 0, ""}
 };
 
 static bNodeSocketTemplate cmp_node_channel_matte_out[]={
-       {SOCK_RGBA,0,"Image"},
-       {SOCK_FLOAT,0,"Matte"},
-       {-1,0,""}
+       {SOCK_RGBA, 0, N_("Image")},
+       {SOCK_FLOAT, 0, N_("Matte")},
+       {-1, 0, ""}
 };
 
+#ifdef WITH_COMPOSITOR_LEGACY
+
 static void do_normalized_rgba_to_ycca2(bNode *UNUSED(node), float *out, float *in)
 {
        /*normalize to the range 0.0 to 1.0) */
-       rgb_to_ycc(in[0],in[1],in[2], &out[0], &out[1], &out[2], BLI_YCC_ITU_BT601);
+       rgb_to_ycc(in[0], in[1], in[2], &out[0], &out[1], &out[2], BLI_YCC_ITU_BT601);
        out[0]=(out[0])/255.0f;
        out[1]=(out[1])/255.0f;
        out[2]=(out[2])/255.0f;
@@ -61,7 +63,7 @@ static void do_normalized_ycca_to_rgba2(bNode *UNUSED(node), float *out, float *
        in[0]=in[0]*255.0f;
        in[1]=in[1]*255.0f;
        in[2]=in[2]*255.0f;
-       ycc_to_rgb(in[0],in[1],in[2], &out[0], &out[1], &out[2], BLI_YCC_ITU_BT601);
+       ycc_to_rgb(in[0], in[1], in[2], &out[0], &out[1], &out[2], BLI_YCC_ITU_BT601);
        out[3]=in[3];
 }
 
@@ -80,16 +82,19 @@ static void do_channel_matte(bNode *node, float *out, float *in)
        }
        case 1: { /* Alpha=G-MAX(R, B) */
                switch (node->custom2) {
-                       case 1: {
-                               alpha=in[0]-MAX2(in[1],in[2]);
+                       case 1:
+                       {
+                               alpha=in[0]-MAX2(in[1], in[2]);
                                break;
                        }
-                       case 2: {
-                               alpha=in[1]-MAX2(in[0],in[2]);
+                       case 2:
+                       {
+                               alpha=in[1]-MAX2(in[0], in[2]);
                                break;
                        }
-                       case 3: {
-                               alpha=in[2]-MAX2(in[0],in[1]);
+                       case 3:
+                       {
+                               alpha=in[2]-MAX2(in[0], in[1]);
                                break;
                        }
                        default:
@@ -179,13 +184,15 @@ static void node_composit_exec_channel_matte(void *data, bNode *node, bNodeStack
        out[0]->data=outbuf;
        if (out[1]->hasoutput)
                out[1]->data=valbuf_from_rgbabuf(outbuf, CHAN_A);
-       
+
        if (cbuf!=in[0]->data)
                free_compbuf(cbuf);
 
 }
 
-static void node_composit_init_channel_matte(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
+#endif  /* WITH_COMPOSITOR_LEGACY */
+
+static void node_composit_init_channel_matte(bNodeTree *UNUSED(ntree), bNode *node, bNodeTemplate *UNUSED(ntemp))
 {
        NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
        node->storage=c;
@@ -209,7 +216,9 @@ void register_node_type_cmp_channel_matte(bNodeTreeType *ttype)
        node_type_size(&ntype, 200, 80, 250);
        node_type_init(&ntype, node_composit_init_channel_matte);
        node_type_storage(&ntype, "NodeChroma", node_free_standard_storage, node_copy_standard_storage);
+#ifdef WITH_COMPOSITOR_LEGACY
        node_type_exec(&ntype, node_composit_exec_channel_matte);
+#endif
 
        nodeRegisterType(ttype, &ntype);
 }