[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46727] trunk/blender/source/blender/ compositor: code cleanup: quiet warnings from compositor merge ( builds with -Werror now in cmake)

[Campbell Barton]

Revision: 46727
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46727
Author:   campbellbarton
Date:     2012-05-17 13:10:34 +0000 (Thu, 17 May 2012)
Log Message:
-----------
code cleanup: quiet warnings from compositor merge (builds with -Werror now in cmake)

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
    trunk/blender/source/blender/compositor/operations/COM_LensGhostOperation.cpp

Modified: trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp	2012-05-17 12:59:34 UTC (rev 46726)
+++ trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp	2012-05-17 13:10:34 UTC (rev 46727)
@@ -35,8 +35,10 @@
 void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context) {
 	bNode* editorNode = this->getbNode();
 	NodeBlurData * data = (NodeBlurData*)editorNode->storage;
+#if 0
 	const bNodeSocket *sock = this->getInputSocket(1)->getbNodeSocket();
-	//const float size = ((const bNodeSocketValueFloat*)sock->default_value)->value;
+	const float size = ((const bNodeSocketValueFloat*)sock->default_value)->value;
+#endif
 	
 	CompositorQuality quality = context->getQuality();
 	

Modified: trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp	2012-05-17 12:59:34 UTC (rev 46726)
+++ trunk/blender/source/blender/compositor/nodes/COM_MuteNode.cpp	2012-05-17 13:10:34 UTC (rev 46727)
@@ -70,7 +70,11 @@
 		operation = coloroperation;
 		break;
 	}
+		/* quiet warnings */
+	case COM_DT_UNKNOWN:
+		break;
 	}
+
 	if (operation) {
 		output->relinkConnections(operation->getOutputSocket(), false);
 		graph->addOperation(operation);

Modified: trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp	2012-05-17 12:59:34 UTC (rev 46726)
+++ trunk/blender/source/blender/compositor/nodes/COM_SocketProxyNode.cpp	2012-05-17 13:10:34 UTC (rev 46727)
@@ -84,6 +84,9 @@
 			graph->addOperation(operation);
 			break;
 		}
+			/* quiet warnings */
+		case COM_DT_UNKNOWN:
+			break;
 		}
 	}
 }

Modified: trunk/blender/source/blender/compositor/operations/COM_LensGhostOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_LensGhostOperation.cpp	2012-05-17 12:59:34 UTC (rev 46726)
+++ trunk/blender/source/blender/compositor/operations/COM_LensGhostOperation.cpp	2012-05-17 13:10:34 UTC (rev 46727)
@@ -723,10 +723,12 @@
 
 void LensGhostOperation::executePixel(float* color, int x, int y, MemoryBuffer *inputBuffers[], void* data) {
 	vector<LensFace*>* faces = (vector<LensFace*>*)data;
-        const float bokehWidth = bokehReader->getWidth();
-        const float bokehHeight = bokehReader->getHeight();
-        float bokeh[4];
-        color[0] = 0.0f;
+#if 0 /* UNUSED */
+	const float bokehWidth = bokehReader->getWidth();
+	const float bokehHeight = bokehReader->getHeight();
+	float bokeh[4];
+#endif
+	color[0] = 0.0f;
 	color[1] = 0.0f;
 	color[2] = 0.0f;
 	color[3] = 1.0f;