Renamed OpenCV node titles.

damiles · damiles · commit f6cce83e1f14 · 2014-03-09T22:57:04.000+01:00
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvAdd.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvAdd.c
@@ -100,7 +100,7 @@ static void node_composit_exec_cvAdd(void *data, bNode *node, bNodeStack **in, b
 void register_node_type_cmp_cvadd(ListBase *lb) {
     static bNodeType ntype;
 
-    node_type_base(&ntype, CMP_NODE_CVADDS, "OpenCV - Add", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
+    node_type_base(&ntype, CMP_NODE_CVADDS, "Add", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
     node_type_socket_templates(&ntype, cmp_node_cvAdd_in, cmp_node_cvAdd_out);
 
     node_type_size(&ntype, 150, 80, 250);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvAnd.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvAnd.c
@@ -108,7 +108,7 @@ void register_node_type_cmp_cvand(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVAND, "OpenCV - And", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVAND, "And", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvAnd_in, cmp_node_cvAnd_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvAnd);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvCanny.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvCanny.c
@@ -115,7 +115,7 @@ void register_node_type_cmp_cvcanny(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVCANNY, "OpenCV - Canny", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW|NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVCANNY, "Canny", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW|NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvCanny_in, cmp_node_cvCanny_out);
 	node_type_size(&ntype, 150, 80, 250);
         node_type_init(&ntype, node_composit_init_cvcanny);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvCopy.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvCopy.c
@@ -82,7 +82,7 @@ void register_node_type_cmp_cvcopy(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVCOPY, "OpenCV - Copy", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVCOPY, "Copy", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvCopy_in, cmp_node_cvCopy_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvCopy);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvCvtColor.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvCvtColor.c
@@ -114,7 +114,7 @@ void register_node_type_cmp_cvcvtcolor(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVCVTCOLOR, "OpenCV - Convert color", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW|NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVCVTCOLOR, "Convert color", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW|NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvCvtColor_in, cmp_node_cvCvtColor_out);
 	node_type_size(&ntype, 150, 80, 250);
         node_type_init(&ntype, node_composit_init_cvCvtColor);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvDilate.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvDilate.c
@@ -85,7 +85,7 @@ static void node_composit_exec_cvDilate(void *data, bNode *node, bNodeStack **in
 void register_node_type_cmp_cvdilate(ListBase *lb) {
     static bNodeType ntype;
 
-    node_type_base(&ntype, CMP_NODE_CVDILATE, "OpenCV - Dilate", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
+    node_type_base(&ntype, CMP_NODE_CVDILATE, "Dilate", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
     node_type_socket_templates(&ntype, cmp_node_cvDilate_in, cmp_node_cvDilate_out);
     node_type_size(&ntype, 150, 80, 250);
     node_type_exec(&ntype, node_composit_exec_cvDilate);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvDiv.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvDiv.c
@@ -85,7 +85,7 @@ static void node_composit_exec_cvDiv(void *data, bNode *node, bNodeStack **in, b
 void register_node_type_cmp_cvdiv(ListBase *lb) {
     static bNodeType ntype;
 
-    node_type_base(&ntype, CMP_NODE_CVDIV, "OpenCV - Div", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
+    node_type_base(&ntype, CMP_NODE_CVDIV, "Div", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
     node_type_socket_templates(&ntype, cmp_node_cvDiv_in, cmp_node_cvDiv_out);
     node_type_size(&ntype, 150, 80, 250);
     node_type_exec(&ntype, node_composit_exec_cvDiv);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvDrawContour.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvDrawContour.c
@@ -92,7 +92,7 @@ void register_node_type_cmp_cvdrawcontour(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVDRAWCONTOUR, "OpenCV - Draw Contour", NODE_CLASS_OCV_DRAW, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVDRAWCONTOUR, "Draw Contour", NODE_CLASS_OCV_DRAW, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvDrawContour_in, cmp_node_cvDrawContour_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvDrawContour);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvErode.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvErode.c
@@ -88,7 +88,7 @@ void register_node_type_cmp_cverode(ListBase *lb)
 {
 	static bNodeType ntype;
 
-	node_type_base(&ntype, CMP_NODE_CVERODE, "OpenCV - Erode", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVERODE, "Erode", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvErode_in, cmp_node_cvErode_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvErode);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvGravityCenter.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvGravityCenter.c
@@ -104,7 +104,7 @@ static void node_composit_exec_cvGravityCenter(void *data, bNode *node, bNodeSta
 	{
 		static bNodeType ntype;
 
-		node_type_base(&ntype, CMP_NODE_CVGRAVITYCENTER, "OpenCV - Gravity Center", NODE_CLASS_OCV_DRAW, NODE_OPTIONS);
+		node_type_base(&ntype, CMP_NODE_CVGRAVITYCENTER, "Gravity Center", NODE_CLASS_OCV_DRAW, NODE_OPTIONS);
 		node_type_socket_templates(&ntype,cmp_node_cvGravityCenter_in, cmp_node_cvGravityCenter_out);
 		node_type_size(&ntype, 150, 80, 250);
 		node_type_exec(&ntype, node_composit_exec_cvGravityCenter);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvHarris.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvHarris.c
@@ -86,7 +86,7 @@ void register_node_type_cmp_cvharris(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVHARRIS, "OpenCV - Harris", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVHARRIS, "Harris", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvHarris_in, cmp_node_cvHarris_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvHarris);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvHough.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvHough.c
@@ -108,7 +108,7 @@ void register_node_type_cmp_cvhough(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVHOUGH, "OpenCV - Hough", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVHOUGH, "Hough", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvHough_in, cmp_node_cvHough_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvHough);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvLaplace.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvLaplace.c
@@ -82,7 +82,7 @@ void register_node_type_cmp_cvlaplace(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVLAPLACE, "OpenCV - Laplace", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVLAPLACE, "Laplace", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvLaplace_in, cmp_node_cvLaplace_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvLaplace);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvMult.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvMult.c
@@ -86,7 +86,7 @@ static void node_composit_exec_cvMult(void *data, bNode *node, bNodeStack **in,
 void register_node_type_cmp_cvmult(ListBase *lb) {
     static bNodeType ntype;
 
-    node_type_base(&ntype, CMP_NODE_CVMULT, "OpenCV - Mult", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
+    node_type_base(&ntype, CMP_NODE_CVMULT, "Mult", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
     node_type_socket_templates(&ntype, cmp_node_cvMult_in, cmp_node_cvMult_out);
     node_type_size(&ntype, 150, 80, 250);
     node_type_exec(&ntype, node_composit_exec_cvMult);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvNegative.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvNegative.c
@@ -72,7 +72,7 @@ void register_node_type_cmp_cvnegative(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVNEGATIVE, "OpenCV - Negative", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVNEGATIVE, "Negative", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvNegative_in, cmp_node_cvNegative_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvNegative);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvNot.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvNot.c
@@ -70,7 +70,7 @@ static void node_composit_exec_cvNot(void *data, bNode *node, bNodeStack **in, b
 void register_node_type_cmp_cvnot(ListBase *lb) {
     static bNodeType ntype;
 
-    node_type_base(&ntype, CMP_NODE_CVNOT, "OpenCV - Not", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
+    node_type_base(&ntype, CMP_NODE_CVNOT, "Not", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
     node_type_socket_templates(&ntype, cmp_node_cvNot_in, cmp_node_cvNot_out);
     node_type_size(&ntype, 150, 80, 250);
     node_type_exec(&ntype, node_composit_exec_cvNot);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvOr.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvOr.c
@@ -109,7 +109,7 @@ void register_node_type_cmp_cvor(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVOR, "OpenCV - Or", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVOR, "Or", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvOr_in, cmp_node_cvOr_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvOr);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvPoint.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvPoint.c
@@ -64,7 +64,7 @@ void register_node_type_cmp_cvpoint(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVPOINT, "OpenCV - 2D point", NODE_CLASS_OCV_INPUT, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVPOINT, "2D point", NODE_CLASS_OCV_INPUT, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_CvPoint_in, cmp_node_CvPoint_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_CvPoint);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvResize.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvResize.c
@@ -68,7 +68,7 @@ void register_node_type_cmp_cvresize(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVRESIZE, "OpenCV - Resize", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVRESIZE, "Resize", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvResize_in, cmp_node_cvResize_out);
 	node_type_size(&ntype, 150, 80, 250);
 	node_type_exec(&ntype, node_composit_exec_cvResize);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvSmooth.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvSmooth.c
@@ -31,83 +31,75 @@
 #include "../../BOCV_util.h"
 
 
-static bNodeSocketTemplate cmp_node_cvSmooth_in[]= {
-	{	SOCK_OCV_IMAGE, 1, "cvImage",			1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-	{	SOCK_FLOAT, 1, "Param1",			3.0f, 0.0f, 0.0f, 0.0f, 1.0f, 100.0f},
-	{	SOCK_FLOAT, 1, "Param2",			3.0f, 0.0f, 0.0f, 0.0f, 1.0f, 100.0f},
-	{	SOCK_FLOAT, 1, "Param3",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100.0f},
-	{	SOCK_FLOAT, 1, "Param4",			0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100.0f},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_cvSmooth_in[] = {
+    { SOCK_RGBA, 1, "Image", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
+    { SOCK_INT, 1, "Aperture Width", 3.0f, 0.0f, 0.0f, 0.0f, 1.0f, 100.0f},
+    { SOCK_INT, 1, "Aperture Height", 3.0f, 0.0f, 0.0f, 0.0f, 1.0f, 100.0f},
+    { SOCK_FLOAT, 1, "Sigma 1", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100.0f},
+    { SOCK_FLOAT, 1, "Sigma 2", 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100.0f},
+    { -1, 0, ""}
 };
-static bNodeSocketTemplate cmp_node_cvSmooth_out[]= {
-	{	SOCK_OCV_IMAGE, 0, "cvImage",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	}
+static bNodeSocketTemplate cmp_node_cvSmooth_out[] = {
+    { SOCK_RGBA, 0, "cvImage", 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
+    { -1, 0, ""}
 };
 
-static void node_composit_exec_cvSmooth(void *data, bNode *node, bNodeStack **in, bNodeStack **out)
-{
+static void node_composit_exec_cvSmooth(void *data, bNode *node, bNodeStack **in, bNodeStack **out) {
     //TODO: Use atach buffers
-	int w,h;
-	int p1, p2;
-	float p3,p4;
-	int type;
-	CV_FUNCNAME( "cvSmooth" ); 
-	if(out[0]->hasoutput==0) return;
-	cvSetErrMode(1); //Parent mode error
-	__CV_BEGIN__;
-	if(in[0]->data){
-		IplImage *img, *smth;
-		CV_CALL(img = in[0]->data);
-		w=img->width;
-		h=img->height;
-		CV_CALL(p1= (int)in[1]->vec[0]);
-		if((p1%2)==0){
-			p1--;
-		}
-		CV_CALL(p2= (int)in[2]->vec[0]);
-		if((p2%2)==0)
-			p2--;
-		CV_CALL(p3= in[3]->vec[0]);
-		CV_CALL(p4= in[4]->vec[0]);
-		
-		smth = cvCreateImage(cvSize(w,h), img->depth, img->nChannels);
-		
-	
-		switch(node->custom1) {
-			case 0:
-				type=CV_BLUR_NO_SCALE;
-				break;
-			case 1:
-				type=CV_BLUR;
-				break;
-			case 2:
-				type=CV_GAUSSIAN;
-				break;
-			case 3://Must change image to 8U with 1 3 or 4 channels
-				type=CV_MEDIAN;
-				break;
-			case 4://Must change image to 8U with 1 or 3 channels
-				type=CV_BILATERAL;
-				break;
-		}
-	
-		CV_CALL(cvSmooth(img, smth, type, p1, p2, p3, p4 ));
-		
-		CV_CALL(out[0]->data= smth);
-	}
-	__CV_END__;
+    int w, h;
+    int p1, p2;
+    float p3, p4;
+    int type;
+    if (out[0]->hasoutput == 0) return;
+
+    if (in[0]->data) {
+        IplImage *img, *smth;
+        CompBuf* dst_buf;
+        img = BOCV_IplImage_attach(in[0]->data);
+        w = img->width;
+        h = img->height;
+        //Make input data as odd value
+        p1 = (int) in[1]->vec[0];
+        if ((p1 % 2) == 0) {
+            p1--;
+        }
+        //Make input data as odd value
+        p2 = (int) in[2]->vec[0];
+        if ((p2 % 2) == 0)
+            p2--;
+        
+        p3 = in[3]->vec[0];
+        p4 = in[4]->vec[0];
+
+        dst_buf = alloc_compbuf(img->width, img->height, img->nChannels, 1);
+        smth = BOCV_IplImage_attach(dst_buf);
+        
+        type= node->custom1;
+        
+        cvSmooth(img, smth, type, p1, p2, p3, p4);
+
+        out[0]->data = dst_buf;
+        
+        BOCV_IplImage_detach(smth);
+        BOCV_IplImage_detach(img);
+    }
+
 }
 
 
-void register_node_type_cmp_cvsmooth(ListBase *lb)
+static void node_composit_init_cvsmooth(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp))
 {
-	static bNodeType ntype;
-	
-	node_type_base(&ntype, CMP_NODE_CVSMOOTH, "OpenCV - Smooth", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
-	node_type_socket_templates(&ntype,cmp_node_cvSmooth_in, cmp_node_cvSmooth_out);
-	node_type_size(&ntype, 150, 80, 250);
-	node_type_exec(&ntype, node_composit_exec_cvSmooth);
-	
-	nodeRegisterType(lb, &ntype);
+	node->custom1= CV_GAUSSIAN; //2
+}
+
+void register_node_type_cmp_cvsmooth(ListBase *lb) {
+    static bNodeType ntype;
+
+    node_type_base(&ntype, CMP_NODE_CVSMOOTH, "Smooth", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);
+    node_type_socket_templates(&ntype, cmp_node_cvSmooth_in, cmp_node_cvSmooth_out);
+    node_type_size(&ntype, 150, 80, 250);
+    node_type_exec(&ntype, node_composit_exec_cvSmooth);
+
+    nodeRegisterType(lb, &ntype);
 }
 
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvSobel.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvSobel.c
@@ -91,7 +91,7 @@ static void node_composit_exec_cvSobel(void *data, bNode *node, bNodeStack **in,
 void register_node_type_cmp_cvsobel(ListBase *lb) {
     static bNodeType ntype;
 
-    node_type_base(&ntype, CMP_NODE_CVSOBEL, "OpenCV - Sobel", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW|NODE_OPTIONS);
+    node_type_base(&ntype, CMP_NODE_CVSOBEL, "Sobel", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW|NODE_OPTIONS);
     node_type_socket_templates(&ntype, cmp_node_cvSobel_in, cmp_node_cvSobel_out);
     node_type_size(&ntype, 150, 80, 250);
     node_type_exec(&ntype, node_composit_exec_cvSobel);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvSub.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvSub.c
@@ -99,7 +99,7 @@ static void node_composit_exec_cvSub(void *data, bNode *node, bNodeStack **in, b
 void register_node_type_cmp_cvsub(ListBase *lb) {
     static bNodeType ntype;
 
-    node_type_base(&ntype, CMP_NODE_CVSUB, "OpenCV - Sub", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
+    node_type_base(&ntype, CMP_NODE_CVSUB, "Sub", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
     node_type_socket_templates(&ntype, cmp_node_cvSub_in, cmp_node_cvSub_out);
     node_type_size(&ntype, 150, 80, 250);
     node_type_exec(&ntype, node_composit_exec_cvSub);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvThreshold.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvThreshold.c
@@ -113,7 +113,7 @@ void register_node_type_cmp_cvthreshold(ListBase *lb)
 {
 	static bNodeType ntype;
 	
-	node_type_base(&ntype, CMP_NODE_CVTHRESHOLD, "OpenCV - Threshold", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW|NODE_OPTIONS);
+	node_type_base(&ntype, CMP_NODE_CVTHRESHOLD, "Threshold", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW|NODE_OPTIONS);
 	node_type_socket_templates(&ntype,cmp_node_cvThreshold_in, cmp_node_cvThreshold_out);
 	node_type_size(&ntype, 150, 80, 250);
         node_type_init(&ntype, node_composit_init_cvthreshold);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_CvXor.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_CvXor.c
@@ -105,7 +105,7 @@ static void node_composit_exec_cvXOr(void *data, bNode *node, bNodeStack **in, b
 void register_node_type_cmp_cvxor(ListBase *lb) {
     static bNodeType ntype;
 
-    node_type_base(&ntype, CMP_NODE_CVXOR, "OpenCV - XOr", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
+    node_type_base(&ntype, CMP_NODE_CVXOR, "XOr", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);
     node_type_socket_templates(&ntype, cmp_node_cvXOr_in, cmp_node_cvXOr_out);
     node_type_size(&ntype, 150, 80, 250);
     node_type_exec(&ntype, node_composit_exec_cvXOr);
diff --git a/source/blender/nodes/composite/nodes/OpenCV/CMP_GetStructuringElement.c b/source/blender/nodes/composite/nodes/OpenCV/CMP_GetStructuringElement.c
@@ -73,7 +73,7 @@ static void node_composit_init_getStructuringElement(bNodeTree *UNUSED(ntree), b
 void register_node_type_cmp_getStructuringElement(ListBase *lb) {
     static bNodeType ntype;
 
-    node_type_base(&ntype, CMP_NODE_CVGETSTRUCTURINGELEMENT, "OpenCV - getStructuringElement", NODE_CLASS_OCV_INPUT, NODE_OPTIONS);
+    node_type_base(&ntype, CMP_NODE_CVGETSTRUCTURINGELEMENT, "Structuring Element", NODE_CLASS_OCV_INPUT, NODE_OPTIONS);
     node_type_socket_templates(&ntype, cmp_node_getStructuringElement_in, cmp_node_getStructuringElement_out);
     node_type_init(&ntype, node_composit_init_getStructuringElement);
     node_type_size(&ntype, 150, 80, 250);

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ void register_node_type_cmp_cvand(ListBase *lb)`
`108`	`108`	`{`
`109`	`109`	`static bNodeType ntype;`
`110`	`110`
`111`		`- node_type_base(&ntype, CMP_NODE_CVAND, "OpenCV - And", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);`
	`111`	`+ node_type_base(&ntype, CMP_NODE_CVAND, "And", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);`
`112`	`112`	`node_type_socket_templates(&ntype,cmp_node_cvAnd_in, cmp_node_cvAnd_out);`
`113`	`113`	`node_type_size(&ntype, 150, 80, 250);`
`114`	`114`	`node_type_exec(&ntype, node_composit_exec_cvAnd);`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void register_node_type_cmp_cvcanny(ListBase *lb)`
`115`	`115`	`{`
`116`	`116`	`static bNodeType ntype;`
`117`	`117`
`118`		`- node_type_base(&ntype, CMP_NODE_CVCANNY, "OpenCV - Canny", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW\|NODE_OPTIONS);`
	`118`	`+ node_type_base(&ntype, CMP_NODE_CVCANNY, "Canny", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW\|NODE_OPTIONS);`
`119`	`119`	`node_type_socket_templates(&ntype,cmp_node_cvCanny_in, cmp_node_cvCanny_out);`
`120`	`120`	`node_type_size(&ntype, 150, 80, 250);`
`121`	`121`	`node_type_init(&ntype, node_composit_init_cvcanny);`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ void register_node_type_cmp_cvcopy(ListBase *lb)`
`82`	`82`	`{`
`83`	`83`	`static bNodeType ntype;`
`84`	`84`
`85`		`- node_type_base(&ntype, CMP_NODE_CVCOPY, "OpenCV - Copy", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);`
	`85`	`+ node_type_base(&ntype, CMP_NODE_CVCOPY, "Copy", NODE_CLASS_OCV_ARRAY, NODE_OPTIONS);`
`86`	`86`	`node_type_socket_templates(&ntype,cmp_node_cvCopy_in, cmp_node_cvCopy_out);`
`87`	`87`	`node_type_size(&ntype, 150, 80, 250);`
`88`	`88`	`node_type_exec(&ntype, node_composit_exec_cvCopy);`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ void register_node_type_cmp_cvcvtcolor(ListBase *lb)`
`114`	`114`	`{`
`115`	`115`	`static bNodeType ntype;`
`116`	`116`
`117`		`- node_type_base(&ntype, CMP_NODE_CVCVTCOLOR, "OpenCV - Convert color", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW\|NODE_OPTIONS);`
	`117`	`+ node_type_base(&ntype, CMP_NODE_CVCVTCOLOR, "Convert color", NODE_CLASS_OCV_IMAGEPROCESS, NODE_PREVIEW\|NODE_OPTIONS);`
`118`	`118`	`node_type_socket_templates(&ntype,cmp_node_cvCvtColor_in, cmp_node_cvCvtColor_out);`
`119`	`119`	`node_type_size(&ntype, 150, 80, 250);`
`120`	`120`	`node_type_init(&ntype, node_composit_init_cvCvtColor);`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ void register_node_type_cmp_cvdrawcontour(ListBase *lb)`
`92`	`92`	`{`
`93`	`93`	`static bNodeType ntype;`
`94`	`94`
`95`		`- node_type_base(&ntype, CMP_NODE_CVDRAWCONTOUR, "OpenCV - Draw Contour", NODE_CLASS_OCV_DRAW, NODE_OPTIONS);`
	`95`	`+ node_type_base(&ntype, CMP_NODE_CVDRAWCONTOUR, "Draw Contour", NODE_CLASS_OCV_DRAW, NODE_OPTIONS);`
`96`	`96`	`node_type_socket_templates(&ntype,cmp_node_cvDrawContour_in, cmp_node_cvDrawContour_out);`
`97`	`97`	`node_type_size(&ntype, 150, 80, 250);`
`98`	`98`	`node_type_exec(&ntype, node_composit_exec_cvDrawContour);`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void register_node_type_cmp_cverode(ListBase *lb)`
`88`	`88`	`{`
`89`	`89`	`static bNodeType ntype;`
`90`	`90`
`91`		`- node_type_base(&ntype, CMP_NODE_CVERODE, "OpenCV - Erode", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);`
	`91`	`+ node_type_base(&ntype, CMP_NODE_CVERODE, "Erode", NODE_CLASS_OCV_IMAGEPROCESS, NODE_OPTIONS);`
`92`	`92`	`node_type_socket_templates(&ntype,cmp_node_cvErode_in, cmp_node_cvErode_out);`
`93`	`93`	`node_type_size(&ntype, 150, 80, 250);`
`94`	`94`	`node_type_exec(&ntype, node_composit_exec_cvErode);`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ static void node_composit_exec_cvGravityCenter(void data, bNode node, bNodeSta`
`104`	`104`	`{`
`105`	`105`	`static bNodeType ntype;`
`106`	`106`
`107`		`- node_type_base(&ntype, CMP_NODE_CVGRAVITYCENTER, "OpenCV - Gravity Center", NODE_CLASS_OCV_DRAW, NODE_OPTIONS);`
	`107`	`+ node_type_base(&ntype, CMP_NODE_CVGRAVITYCENTER, "Gravity Center", NODE_CLASS_OCV_DRAW, NODE_OPTIONS);`
`108`	`108`	`node_type_socket_templates(&ntype,cmp_node_cvGravityCenter_in, cmp_node_cvGravityCenter_out);`
`109`	`109`	`node_type_size(&ntype, 150, 80, 250);`
`110`	`110`	`node_type_exec(&ntype, node_composit_exec_cvGravityCenter);`