1 files changed, 0 insertions, 150 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
index 40dbbbb8dca..a54a8507882 100644
--- a/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
+++ b/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
@@ -45,153 +45,6 @@ static bNodeSocketTemplate cmp_node_channel_matte_out[] ={
 	{-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);
-	out[0]=(out[0])/255.0f;
-	out[1]=(out[1])/255.0f;
-	out[2]=(out[2])/255.0f;
-	out[3]=in[3];
-}
-
-static void do_normalized_ycca_to_rgba2(bNode *UNUSED(node), float *out, float *in)
-{
-	/*un-normalize the normalize from above */
-	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);
-	out[3]=in[3];
-}
-
-
-static void do_channel_matte(bNode *node, float *out, float *in)
-{
-	NodeChroma *c=(NodeChroma *)node->storage;
-	float alpha=0.0;
-
-	switch (c->algorithm) {
-	case 0: { /* Alpha=key_channel-limit channel */
-		int key_channel=node->custom2-1;
-		int limit_channel=c->channel-1;
-		alpha=in[key_channel]-in[limit_channel];
-		break;
-	}
-	case 1: { /* Alpha=G-MAX(R, B) */
-		switch (node->custom2) {
-			case 1:
-			{
-				alpha=in[0]-MAX2(in[1], in[2]);
-				break;
-			}
-			case 2:
-			{
-				alpha=in[1]-MAX2(in[0], in[2]);
-				break;
-			}
-			case 3:
-			{
-				alpha=in[2]-MAX2(in[0], in[1]);
-				break;
-			}
-			default:
-				break;
-		}
-		break;
-	}
-	default:
-		break;
-	}
-
-	/*flip because 0.0 is transparent, not 1.0*/
-	alpha=1-alpha;
-	
-	/* test range*/
-	if (alpha>c->t1) {
-		alpha=in[3]; /*whatever it was prior */
-	}
-	else if (alpha<c->t2) {
-		alpha=0.0;
-	}
-	else {/*blend */
-		alpha=(alpha-c->t2)/(c->t1-c->t2);
-	}
-
-	
-	/* don't make something that was more transparent less transparent */
-	if (alpha<in[3]) {
-		out[3]=alpha;
-	}
-	else {
-		out[3]=in[3];
-	}
-}
-
-static void node_composit_exec_channel_matte(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
-{
-	CompBuf *cbuf;
-	CompBuf *outbuf;
-	
-	if (in[0]->hasinput==0) return;
-	if (in[0]->data==NULL) return;
-	if (out[0]->hasoutput==0 && out[1]->hasoutput==0) return;
-	
-	cbuf=typecheck_compbuf(in[0]->data, CB_RGBA);
-	
-	outbuf=dupalloc_compbuf(cbuf);
-	
-	/*convert to colorspace*/
-	switch (node->custom1) {
-	case CMP_NODE_CHANNEL_MATTE_CS_RGB:
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
-		composit1_pixel_processor(node, outbuf, cbuf, in[1]->vec, do_rgba_to_hsva, CB_RGBA);
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YUV: /*YUV*/
-		composit1_pixel_processor(node, outbuf, cbuf, in[1]->vec, do_rgba_to_yuva, CB_RGBA);
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YCC: /*YCC*/
-		composit1_pixel_processor(node, outbuf, cbuf, in[1]->vec, do_normalized_rgba_to_ycca2, CB_RGBA);
-		break;
-	default:
-		break;
-	}
-
-	/*use the selected channel information to do the key */
-	composit1_pixel_processor(node, outbuf, outbuf, in[1]->vec, do_channel_matte, CB_RGBA);
-
-	/*convert back to RGB colorspace in place*/
-	switch (node->custom1) {
-	case CMP_NODE_CHANNEL_MATTE_CS_RGB: /*RGB*/
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
-		composit1_pixel_processor(node, outbuf, outbuf, in[1]->vec, do_hsva_to_rgba, CB_RGBA);
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YUV: /*YUV*/
-		composit1_pixel_processor(node, outbuf, outbuf, in[1]->vec, do_yuva_to_rgba, CB_RGBA);
-		break;
-	case CMP_NODE_CHANNEL_MATTE_CS_YCC: /*YCC*/
-		composit1_pixel_processor(node, outbuf, outbuf, in[1]->vec, do_normalized_ycca_to_rgba2, CB_RGBA);
-		break;
-	default:
-		break;
-	}
-
-	generate_preview(data, node, outbuf);
-	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);
-
-}
-
-#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");
@@ -216,9 +69,6 @@ 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);
 }