style cleanup: compositor

30 files changed, 86 insertions, 86 deletions

diff --git a/source/blender/compositor/COM_compositor.h b/source/blender/compositor/COM_compositor.h
index cd1615c9094..4e955ea3df1 100644
--- a/source/blender/compositor/COM_compositor.h
+++ b/source/blender/compositor/COM_compositor.h
@@ -297,7 +297,7 @@ extern "C" {
  *     - output nodes can have different priorities in the WorkScheduler.
  * This is implemented in the COM_execute function.
  */
-void COM_execute(RenderData* rd, bNodeTree *editingtree, int rendering);
+void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering);
 
 /**
  * @brief Return a list of highlighted bnodes pointers.
@@ -310,7 +310,7 @@ void COM_startReadHighlights(void);
  * @param bnode
  * @return 
  */
-int COM_isHighlightedbNode(bNode* bnode);
+int COM_isHighlightedbNode(bNode *bnode);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index e890715cafe..a87b40af89d 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -316,7 +316,7 @@ public:
 	 * @brief get all inputbuffers needed to calculate an chunk
 	 * @note all inputbuffers must be executed
 	 * @param chunkNumber the chunk to be calculated
-	 * @return MemoryBuffer** the inputbuffers
+	 * @return (MemoryBuffer **) the inputbuffers
 	 */
 	MemoryBuffer **getInputBuffersCPU();
 
@@ -324,7 +324,7 @@ public:
 	 * @brief get all inputbuffers needed to calculate an chunk
 	 * @note all inputbuffers must be executed
 	 * @param chunkNumber the chunk to be calculated
-	 * @return MemoryBuffer** the inputbuffers
+	 * @return (MemoryBuffer **) the inputbuffers
 	 */
 	MemoryBuffer **getInputBuffersOpenCL(int chunkNumber);
 
diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h
index 4f6780c8d0b..ac849bf4f6c 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystem.h
+++ b/source/blender/compositor/intern/COM_ExecutionSystem.h
@@ -153,7 +153,7 @@ public:
 	 * @brief Create a new ExecutionSystem and initialize it with the
 	 * editingtree.
 	 *
-	 * @param editingtree [bNodeTree*]
+	 * @param editingtree [bNodeTree *]
 	 * @param rendering [true false]
 	 */
 	ExecutionSystem(RenderData *rd, bNodeTree *editingtree, bool rendering, bool fastcalculation);
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
index eae98a1211f..3b8fbd6d708 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
@@ -248,7 +248,7 @@ static void imp2radangle(float A, float B, float C, float F, float *a, float *b,
 			*b = sqrtf(F2 / d);
 			*ecc = *a / *b;
 		}
-		// incr theta by 0.5*pi (angle of major axis)
+		/* incr theta by 0.5 * pi (angle of major axis) */
 		*th = 0.5f * (atan2f(B, AmC) + (float)M_PI);
 	}
 }
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index 9b6d574e321..a9cf281b02f 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -148,7 +148,7 @@ public:
 	 * @param memoryBuffers all input MemoryBuffer's needed
 	 * @param outputBuffer the outputbuffer to write to
 	 */
-	virtual void executeOpenCLRegion(OpenCLDevice* device, rcti *rect,
+	virtual void executeOpenCLRegion(OpenCLDevice *device, rcti *rect,
 	                                 unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer) {}
 
 	/**
@@ -163,7 +163,7 @@ public:
 	 * @param clMemToCleanUp all created cl_mem references must be added to this list. Framework will clean this after execution
 	 * @param clKernelsToCleanUp all created cl_kernel references must be added to this list. Framework will clean this after execution
 	 */
-	virtual void executeOpenCL(OpenCLDevice* device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {}
+	virtual void executeOpenCL(OpenCLDevice *device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp) {}
 	virtual void deinitExecution();
 
 	bool isResolutionSet() {
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
index 63f75681779..be5936b495e 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
@@ -67,7 +67,7 @@ void OpenCLDevice::execute(WorkPackage *work)
 }
 cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, SocketReader *reader)
 {
-	return COM_clAttachMemoryBufferToKernelParameter(kernel, parameterIndex, offsetIndex, cleanup, inputMemoryBuffers, (ReadBufferOperation*)reader);
+	return COM_clAttachMemoryBufferToKernelParameter(kernel, parameterIndex, offsetIndex, cleanup, inputMemoryBuffers, (ReadBufferOperation *)reader);
 }
 
 cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, ReadBufferOperation *reader)
@@ -106,7 +106,7 @@ void OpenCLDevice::COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel ker
 	}
 }
 
-void OpenCLDevice::COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex, NodeOperation* operation)
+void OpenCLDevice::COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex, NodeOperation *operation)
 {
 	if (offsetIndex != -1) {
 		cl_int error;
@@ -133,7 +133,7 @@ void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemo
 	if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error));  }
 }
 
-void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex, NodeOperation* operation)
+void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex, NodeOperation *operation)
 {
 	cl_int error;
 	const int width = outputMemoryBuffer->getWidth();
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h
index f1a1e31c930..2021cacabcc 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.h
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.h
@@ -100,9 +100,9 @@ public:
 	cl_mem COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, int offsetIndex, list<cl_mem> *cleanup, MemoryBuffer **inputMemoryBuffers, ReadBufferOperation *reader);
 	void COM_clAttachMemoryBufferOffsetToKernelParameter(cl_kernel kernel, int offsetIndex, MemoryBuffer *memoryBuffers);
 	void COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel kernel, int parameterIndex, cl_mem clOutputMemoryBuffer);
-	void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex, NodeOperation* operation);
+	void COM_clAttachSizeToKernelParameter(cl_kernel kernel, int offsetIndex, NodeOperation *operation);
 	void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer);
-	void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex, NodeOperation* operation);
+	void COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex, NodeOperation *operation);
 	cl_kernel COM_clCreateKernel(const char *kernelname, list<cl_kernel> *clKernelsToCleanUp);
 };
 
diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cpp b/source/blender/compositor/intern/COM_WorkScheduler.cpp
index 7d4134aca13..849c4affd9c 100644
--- a/source/blender/compositor/intern/COM_WorkScheduler.cpp
+++ b/source/blender/compositor/intern/COM_WorkScheduler.cpp
@@ -77,20 +77,20 @@ void ** g_highlightedNodesRead;
 
 #define HIGHLIGHT(wp) \
 { \
-	ExecutionGroup* group = wp->getExecutionGroup(); \
+	ExecutionGroup *group = wp->getExecutionGroup(); \
 	if (group->isComplex()) { \
-		NodeOperation* operation = group->getOutputNodeOperation(); \
-		if (operation->isWriteBufferOperation()) {\
-			WriteBufferOperation *writeOperation = (WriteBufferOperation*)operation;\
+		NodeOperation *operation = group->getOutputNodeOperation(); \
+		if (operation->isWriteBufferOperation()) { \
+			WriteBufferOperation *writeOperation = (WriteBufferOperation *)operation; \
 			NodeOperation *complexOperation = writeOperation->getInput(); \
 			bNode *node = complexOperation->getbNode(); \
 			if (node) { \
 				if (node->original) { \
-					node = node->original;\
-				}\
-				if (g_highlightIndex < MAX_HIGHLIGHT) {\
-					g_highlightedNodes[g_highlightIndex++] = node;\
-				}\
+					node = node->original; \
+				} \
+				if (g_highlightIndex < MAX_HIGHLIGHT) { \
+					g_highlightedNodes[g_highlightIndex++] = node; \
+				} \
 			} \
 		} \
 	} \
@@ -103,18 +103,18 @@ void COM_startReadHighlights()
 	}
 	
 	g_highlightedNodesRead = g_highlightedNodes;
-	g_highlightedNodes = new void*[MAX_HIGHLIGHT];
+	g_highlightedNodes = new void *[MAX_HIGHLIGHT];
 	g_highlightIndex = 0;
 	for (int i = 0 ; i < MAX_HIGHLIGHT; i++) {
 		g_highlightedNodes[i] = 0;
 	}
 }
 
-int COM_isHighlightedbNode(bNode* bnode)
+int COM_isHighlightedbNode(bNode *bnode)
 {
 	if (!g_highlightedNodesRead) return false;
 	for (int i = 0 ; i < MAX_HIGHLIGHT; i++) {
-		void* p = g_highlightedNodesRead[i];
+		void *p = g_highlightedNodesRead[i];
 		if (!p) return false;
 		if (p == bnode) return true;
 	}
diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp
index ab64f8f7bf1..2402f9a1163 100644
--- a/source/blender/compositor/intern/COM_compositor.cpp
+++ b/source/blender/compositor/intern/COM_compositor.cpp
@@ -54,7 +54,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering)
 	}
 
 
-	/* set progress bar to 0% and status to init compositing*/
+	/* set progress bar to 0% and status to init compositing */
 	editingtree->progress(editingtree->prh, 0.0);
 
 	bool twopass = (editingtree->flag&NTREE_TWO_PASS) > 0 && !rendering;
diff --git a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
index 69f39639660..eab921863e9 100644
--- a/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_ChannelMatteNode.cpp
@@ -45,13 +45,13 @@ void ChannelMatteNode::convertToOperations(ExecutionSystem *graph, CompositorCon
 	switch (node->custom1) {
 		case CMP_NODE_CHANNEL_MATTE_CS_RGB:
 			break;
-		case CMP_NODE_CHANNEL_MATTE_CS_HSV: /*HSV*/
+		case CMP_NODE_CHANNEL_MATTE_CS_HSV: /* HSV */
 			convert = new ConvertRGBToHSVOperation();
 			break;
-		case CMP_NODE_CHANNEL_MATTE_CS_YUV: /*YUV*/
+		case CMP_NODE_CHANNEL_MATTE_CS_YUV: /* YUV */
 			convert = new ConvertRGBToYUVOperation();
 			break;
-		case CMP_NODE_CHANNEL_MATTE_CS_YCC: /*YCC*/
+		case CMP_NODE_CHANNEL_MATTE_CS_YCC: /* YCC */
 			convert = new ConvertRGBToYCCOperation();
 			((ConvertRGBToYCCOperation *)convert)->setMode(0); /* BLI_YCC_ITU_BT601 */
 			break;
diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
index a3d685de9a6..7d190332c37 100644
--- a/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
@@ -193,7 +193,7 @@ bool BokehBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffe
 	return false;
 }
 
-void BokehBlurOperation::executeOpenCL(OpenCLDevice* device,
+void BokehBlurOperation::executeOpenCL(OpenCLDevice *device,
                                        MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
                                        MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, 
                                        list<cl_kernel> *clKernelsToCleanUp) 
diff --git a/source/blender/compositor/operations/COM_BokehBlurOperation.h b/source/blender/compositor/operations/COM_BokehBlurOperation.h
index eef5429c409..646587197a9 100644
--- a/source/blender/compositor/operations/COM_BokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_BokehBlurOperation.h
@@ -59,6 +59,6 @@ public:
 
 	void setSize(float size) { this->m_size = size; this->m_sizeavailable = true; }
 	
-	void executeOpenCL(OpenCLDevice* device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp);
+	void executeOpenCL(OpenCLDevice *device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp);
 };
 #endif
diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp b/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
index 85f606fafdf..e0e68f90289 100644
--- a/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.cpp
@@ -100,7 +100,7 @@ void ChannelMatteOperation::executePixel(float *outputValue, float x, float y, P
 	/* flip because 0.0 is transparent, not 1.0 */
 	alpha = 1.0f - alpha;
 	
-	/* test range*/
+	/* test range */
 	if (alpha > limit_max) {
 		alpha = inColor[3]; /*whatever it was prior */
 	}
diff --git a/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp b/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
index 85a19d7c60f..4be03e9d914 100644
--- a/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_ChromaMatteOperation.cpp
@@ -65,7 +65,7 @@ void ChromaMatteOperation::executePixel(float *outputValue, float x, float y, Pi
 	 */
 
 	/* Algorithm from book "Video Demistified," does not include the spill reduction part */
-	/* find theta, the angle that the color space should be rotated based on key*/
+	/* find theta, the angle that the color space should be rotated based on key */
 	theta = atan2(inKey[2], inKey[1]);
 
 	/*rotate the cb and cr into x/z space */
diff --git a/source/blender/compositor/operations/COM_ColorMatteOperation.cpp b/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
index 5326e397494..26fbd99b43a 100644
--- a/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorMatteOperation.cpp
@@ -75,7 +75,7 @@ void ColorMatteOperation::executePixel(float *outputValue, float x, float y, Pix
 	    /* hue */ ((h_wrap = 2.f * fabsf(inColor[0] - inKey[0])) < hue || (2.f - h_wrap) < hue)
 	    )
 	{
-		outputValue[0] = 0.0f; /*make transparent*/
+		outputValue[0] = 0.0f; /* make transparent */
 	}
 
 	else { /*pixel is outside key color */
diff --git a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
index 80416bbccdf..e3f95eac3b4 100644
--- a/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.cpp
@@ -71,7 +71,7 @@ void ConvertDepthToRadiusOperation::initExecution()
 	this->m_dof_sp = (float)minsz / (16.f / this->m_cam_lens);    // <- == aspect * MIN2(img->x, img->y) / tan(0.5f * fov);
 	
 	if (this->m_blurPostOperation) {
-		m_blurPostOperation->setSigma(m_aperture*128.0f);
+		m_blurPostOperation->setSigma(m_aperture * 128.0f);
 	}
 }
 
@@ -87,9 +87,9 @@ void ConvertDepthToRadiusOperation::executePixel(float *outputValue, float x, fl
 		
 		// bug #6656 part 2b, do not rescale
 #if 0
-		bcrad = 0.5f*fabs(aperture*(dof_sp*(cam_invfdist - iZ) - 1.f));
+		bcrad = 0.5f * fabs(aperture * (dof_sp * (cam_invfdist - iZ) - 1.0f));
 		// scale crad back to original maximum and blend
-		crad->rect[px] = bcrad + wts->rect[px]*(scf*crad->rect[px] - bcrad);
+		crad->rect[px] = bcrad + wts->rect[px] * (scf * crad->rect[px] - bcrad);
 #endif
 		radius = 0.5f * fabsf(this->m_aperture * (this->m_dof_sp * (this->m_inverseFocalDistance - iZ) - 1.f));
 		// 'bug' #6615, limit minimum radius to 1 pixel, not really a solution, but somewhat mitigates the problem
diff --git a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
index ed3799fff5e..a95d1eec290 100644
--- a/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_DifferenceMatteOperation.cpp
@@ -64,7 +64,7 @@ void DifferenceMatteOperation::executePixel(float *outputValue, float x, float y
 	/* average together the distances */
 	difference = difference / 3.0f;
 
-	/*make 100% transparent*/
+	/* make 100% transparent */
 	if (difference < tolerance) {
 		outputValue[0] = 0.0f;
 	}
@@ -81,7 +81,7 @@ void DifferenceMatteOperation::executePixel(float *outputValue, float x, float y
 		}
 	}
 	else {
-		/*foreground object*/
+		/* foreground object */
 		outputValue[0] = inColor1[3];
 	}
 }
diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
index 2752c6a7b90..0890bc75049 100644
--- a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
+++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp
@@ -234,7 +234,7 @@ bool DilateDistanceOperation::determineDependingAreaOfInterest(rcti *input, Read
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
 
-void DilateDistanceOperation::executeOpenCL(OpenCLDevice* device,
+void DilateDistanceOperation::executeOpenCL(OpenCLDevice *device,
                                             MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer,
                                             MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
                                             list<cl_kernel> *clKernelsToCleanUp)
@@ -291,7 +291,7 @@ void ErodeDistanceOperation::executePixel(float *color, int x, int y, void *data
 	color[0] = value;
 }
 
-void ErodeDistanceOperation::executeOpenCL(OpenCLDevice* device,
+void ErodeDistanceOperation::executeOpenCL(OpenCLDevice *device,
                                            MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer,
                                            MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
                                            list<cl_kernel> *clKernelsToCleanUp)
diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.h b/source/blender/compositor/operations/COM_DilateErodeOperation.h
index 8c3eefb97e4..bd044e79fbe 100644
--- a/source/blender/compositor/operations/COM_DilateErodeOperation.h
+++ b/source/blender/compositor/operations/COM_DilateErodeOperation.h
@@ -99,7 +99,7 @@ public:
 	void setDistance(float distance) { this->m_distance = distance; }
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
 	
-	void executeOpenCL(OpenCLDevice* device,
+	void executeOpenCL(OpenCLDevice *device,
 	                   MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
 	                   MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp,
 	                   list<cl_kernel> *clKernelsToCleanUp);
@@ -113,7 +113,7 @@ public:
 	 */
 	void executePixel(float *color, int x, int y, void *data);
 
-	void executeOpenCL(OpenCLDevice* device,
+	void executeOpenCL(OpenCLDevice *device,
 	                   MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
 	                   MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, 
 	                   list<cl_kernel> *clKernelsToCleanUp);
diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
index 5e6ff2c7da1..34bf9db77ce 100644
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
@@ -101,7 +101,7 @@ void DirectionalBlurOperation::executePixel(float *color, int x, int y, void *da
 	mul_v4_v4fl(color, col2, 1.0f / (iterations+1));
 }
 
-void DirectionalBlurOperation::executeOpenCL(OpenCLDevice* device,
+void DirectionalBlurOperation::executeOpenCL(OpenCLDevice *device,
                                        MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
                                        MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, 
                                        list<cl_kernel> *clKernelsToCleanUp) 
diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
index cc49e947f95..4de435a1418 100644
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
@@ -56,7 +56,7 @@ public:
 	
 	void setData(NodeDBlurData *data) { this->m_data = data; }
 
-	void executeOpenCL(OpenCLDevice* device,
+	void executeOpenCL(OpenCLDevice *device,
 	                                       MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
 	                                       MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, 
 	                                       list<cl_kernel> *clKernelsToCleanUp);
diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
index 7c5614c0de1..847e5817675 100644
--- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
@@ -907,7 +907,7 @@ static void do_createEdgeLocationBuffer(unsigned int t, unsigned int rw, unsigne
 	 * or outer edge.
 	 *
 	 * Allocation is done by requesting 4 bytes "sizeof(int)" per pixel, even
-	 * though gbuf[] is declared as unsigned short* (2 bytes) because we don't
+	 * though gbuf[] is declared as (unsigned short *) (2 bytes) because we don't
 	 * store the pixel indexes, we only store x,y location of pixel in buffer.
 	 *
 	 * This does make the assumption that x and y can fit in 16 unsigned bits
diff --git a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
index fd70d0d329a..f7ad3115f24 100644
--- a/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.cpp
@@ -257,14 +257,14 @@ void GaussianBlurReferenceOperation::updateGauss()
 {
 	int i;
 	int x = MAX2(m_radx, m_rady);
-	this->m_maintabs = (float**)MEM_mallocN(x * sizeof(float *), "gauss array");
+	this->m_maintabs = (float **)MEM_mallocN(x * sizeof(float *), "gauss array");
 	for (i = 0; i < x; i++)
 		m_maintabs[i] = make_gausstab(i + 1);
 }
 
 void GaussianBlurReferenceOperation::executePixel(float *color, int x, int y, void *data)
 {
-	MemoryBuffer *memorybuffer = (MemoryBuffer*)data;
+	MemoryBuffer *memorybuffer = (MemoryBuffer *)data;
 	float *buffer = memorybuffer->getBuffer();
 	float *gausstabx, *gausstabcenty;
 	float *gausstaby, *gausstabcentx;
diff --git a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
index 7f637c127c1..31aae18992b 100644
--- a/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
+++ b/source/blender/compositor/operations/COM_LuminanceMatteOperation.cpp
@@ -55,7 +55,7 @@ void LuminanceMatteOperation::executePixel(float *outputValue, float x, float y,
 	 * outputValue[0] = max(inputValue[3], min(high, max(low, ((inColor[0]-low)/(high-low))))
 	 */
 		
-	/* test range*/
+	/* test range */
 	if (inColor[0] > high) {
 		alpha = 1.f;
 	}
diff --git a/source/blender/compositor/operations/COM_OpenCLKernels.cl.h b/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
index cc18039c5b1..7f60f97dfe8 100644
--- a/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
+++ b/source/blender/compositor/operations/COM_OpenCLKernels.cl.h
@@ -41,7 +41,7 @@ const char * clkernelstoh_COM_OpenCLKernels_cl = "/*\n" \
 "	float4 color = {0.0f,0.0f,0.0f,0.0f};\n" \
 "	float4 multiplyer = {0.0f,0.0f,0.0f,0.0f};\n" \
 "	float4 bokeh;\n" \
-"	const float radius2 = radius*2.0f;\n" \
+"	const float radius2 = radius * 2.0f;\n" \
 "	const int2 realCoordinate = coords + offsetOutput;\n" \
 "\n" \
 "	tempBoundingBox = read_imagef(boundingBox, SAMPLER_NEAREST, coords).s0;\n" \
@@ -56,10 +56,10 @@ const char * clkernelstoh_COM_OpenCLKernels_cl = "/*\n" \
 "		float2 uv;\n" \
 "		int2 inputXy;\n" \
 "\n" \
-"		for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny +=step, inputXy.y+=step) {\n" \
+"		for (ny = minXY.y, inputXy.y = ny - offsetInput.y ; ny < maxXY.y ; ny += step, inputXy.y += step) {\n" \
 "			uv.y = ((realCoordinate.y-ny)/radius2)*bokehImageDim.y+bokehImageCenter.y;\n" \
 "\n" \
-"			for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx +=step, inputXy.x+=step) {\n" \
+"			for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx += step, inputXy.x += step) {\n" \
 "				uv.x = ((realCoordinate.x-nx)/radius2)*bokehImageDim.x+bokehImageCenter.x;\n" \
 "				bokeh = read_imagef(bokehImage, SAMPLER_NEAREST, uv);\n" \
 "				color += bokeh * read_imagef(inputImage, SAMPLER_NEAREST, inputXy);\n" \
@@ -117,7 +117,7 @@ const char * clkernelstoh_COM_OpenCLKernels_cl = "/*\n" \
 "								float2 uv = { 256.0f + dx * 256.0f / tempSize, 256.0f + dy * 256.0f / tempSize};\n" \
 "								bokeh = read_imagef(bokehImage, SAMPLER_NEAREST, uv);\n" \
 "								readColor = read_imagef(inputImage, SAMPLER_NEAREST, inputCoordinate);\n" \
-"								color_accum += bokeh*readColor;\n" \
+"								color_accum += bokeh * readColor;\n" \
 "								multiplier_accum += bokeh;\n" \
 "							}\n" \
 "						}\n" \
@@ -152,7 +152,7 @@ const char * clkernelstoh_COM_OpenCLKernels_cl = "/*\n" \
 "		const float deltaY = (realCoordinate.y - ny);\n" \
 "		for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx ++, inputXy.x++) {\n" \
 "			const float deltaX = (realCoordinate.x - nx);\n" \
-"			const float measuredDistance = deltaX*deltaX+deltaY*deltaY;\n" \
+"			const float measuredDistance = deltaX * deltaX + deltaY * deltaY;\n" \
 "			if (measuredDistance <= distanceSquared) {\n" \
 "				value = max(value, read_imagef(inputImage, SAMPLER_NEAREST, inputXy).s0);\n" \
 "			}\n" \
@@ -183,7 +183,7 @@ const char * clkernelstoh_COM_OpenCLKernels_cl = "/*\n" \
 "		for (nx = minXY.x, inputXy.x = nx - offsetInput.x; nx < maxXY.x ; nx ++, inputXy.x++) {\n" \
 "			const float deltaX = (realCoordinate.x - nx);\n" \
 "			const float deltaY = (realCoordinate.y - ny);\n" \
-"			const float measuredDistance = deltaX*deltaX+deltaY*deltaY;\n" \
+"			const float measuredDistance = deltaX * deltaX + deltaY * deltaY;\n" \
 "			if (measuredDistance <= distanceSquared) {\n" \
 "				value = min(value, read_imagef(inputImage, SAMPLER_NEAREST, inputXy).s0);\n" \
 "			}\n" \
diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
index e28e77a5f5e..dcf9262d646 100644
--- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
+++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
@@ -79,10 +79,10 @@ bool ProjectorLensDistortionOperation::determineDependingAreaOfInterest(rcti *in
 		newInput.xmin = input->xmin - this->m_kr2 - 2;
 		newInput.xmax = input->xmax + this->m_kr2 + 2;
 	} else {
-		newInput.xmin = input->xmin - 7; //(0.25f*20*1)+2 == worse case dispersion
+		newInput.xmin = input->xmin - 7;  /* (0.25f * 20 * 1) + 2 == worse case dispersion */
 		newInput.ymin = input->ymin;
 		newInput.ymax = input->ymax;
-		newInput.xmax = input->xmax + 7; //(0.25f*20*1)+2 == worse case dispersion
+		newInput.xmax = input->xmax + 7;  /* (0.25f * 20 * 1) + 2 == worse case dispersion */
 	}
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
index 66d7e9d4d99..cd2438ecd12 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
@@ -63,22 +63,22 @@ void VariableSizeBokehBlurOperation::initExecution()
 }
 struct VariableSizeBokehBlurTileData
 {
-	MemoryBuffer* color;
-	MemoryBuffer* bokeh;
-	MemoryBuffer* size;
+	MemoryBuffer *color;
+	MemoryBuffer *bokeh;
+	MemoryBuffer *size;
 	int maxBlur;
 };
 
 void *VariableSizeBokehBlurOperation::initializeTileData(rcti *rect)
 {
 	VariableSizeBokehBlurTileData *data = new VariableSizeBokehBlurTileData();
-	data->color = (MemoryBuffer*)this->m_inputProgram->initializeTileData(rect);
-	data->bokeh = (MemoryBuffer*)this->m_inputBokehProgram->initializeTileData(rect);
-	data->size = (MemoryBuffer*)this->m_inputSizeProgram->initializeTileData(rect);
+	data->color = (MemoryBuffer *)this->m_inputProgram->initializeTileData(rect);
+	data->bokeh = (MemoryBuffer *)this->m_inputBokehProgram->initializeTileData(rect);
+	data->size = (MemoryBuffer *)this->m_inputSizeProgram->initializeTileData(rect);
 
 
 	rcti rect2;
-	this->determineDependingAreaOfInterest(rect, (ReadBufferOperation*)this->m_inputSizeProgram, &rect2);
+	this->determineDependingAreaOfInterest(rect, (ReadBufferOperation *)this->m_inputSizeProgram, &rect2);
 	data->maxBlur = (int)data->size->getMaximumValue(&rect2);
 	CLAMP(data->maxBlur, 1.0f, this->m_maxBlur);
 	return data;
@@ -86,18 +86,18 @@ void *VariableSizeBokehBlurOperation::initializeTileData(rcti *rect)
 
 void VariableSizeBokehBlurOperation::deinitializeTileData(rcti *rect, void *data)
 {
-	VariableSizeBokehBlurTileData* result = (VariableSizeBokehBlurTileData*)data;
+	VariableSizeBokehBlurTileData *result = (VariableSizeBokehBlurTileData *)data;
 	delete result;
 }
 
 void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, void *data)
 {
-	VariableSizeBokehBlurTileData* tileData = (VariableSizeBokehBlurTileData*)data;
-	MemoryBuffer* inputProgramBuffer = tileData->color;
-	MemoryBuffer* inputBokehBuffer = tileData->bokeh;
-	MemoryBuffer* inputSizeBuffer = tileData->size;
-	float* inputSizeFloatBuffer = inputSizeBuffer->getBuffer();
-	float* inputProgramFloatBuffer = inputProgramBuffer->getBuffer();
+	VariableSizeBokehBlurTileData *tileData = (VariableSizeBokehBlurTileData *)data;
+	MemoryBuffer *inputProgramBuffer = tileData->color;
+	MemoryBuffer *inputBokehBuffer = tileData->bokeh;
+	MemoryBuffer *inputSizeBuffer = tileData->size;
+	float *inputSizeFloatBuffer = inputSizeBuffer->getBuffer();
+	float *inputProgramFloatBuffer = inputProgramBuffer->getBuffer();
 	float readColor[4];
 	float bokeh[4];
 	float tempSize[4];
@@ -126,13 +126,13 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, vo
 		add_v4_fl(multiplier_accum, 1.0f);
 		float sizeCenter = tempSize[0];
 		
-		const int addXStep = QualityStepHelper::getStep()*COM_NUMBER_OF_CHANNELS;
+		const int addXStep = QualityStepHelper::getStep() * COM_NUMBER_OF_CHANNELS;
 		
 		if (sizeCenter > this->m_threshold) {
 			for (int ny = miny; ny < maxy; ny += QualityStepHelper::getStep()) {
 				float dy = ny - y;
 				int offsetNy = ny * inputSizeBuffer->getWidth() * COM_NUMBER_OF_CHANNELS;
-				int offsetNxNy = offsetNy + (minx*COM_NUMBER_OF_CHANNELS);
+				int offsetNxNy = offsetNy + (minx * COM_NUMBER_OF_CHANNELS);
 				for (int nx = minx; nx < maxx; nx += QualityStepHelper::getStep()) {
 					if (nx != x || ny != y) 
 					{
@@ -162,7 +162,7 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, vo
 
 }
 
-void VariableSizeBokehBlurOperation::executeOpenCL(OpenCLDevice* device,
+void VariableSizeBokehBlurOperation::executeOpenCL(OpenCLDevice *device,
                                        MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, 
                                        MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, 
                                        list<cl_kernel> *clKernelsToCleanUp) 
@@ -256,10 +256,10 @@ void InverseSearchRadiusOperation::initExecution()
 	this->m_inputRadius = this->getInputSocketReader(0);
 }
 
-void* InverseSearchRadiusOperation::initializeTileData(rcti *rect) 
+voi *InverseSearchRadiusOperation::initializeTileData(rcti *rect)
 {
 	MemoryBuffer * data = new MemoryBuffer(NULL, rect);
-	float* buffer = data->getBuffer();
+	float *buffer = data->getBuffer();
 	int x, y;
 	int width = this->m_inputRadius->getWidth();
 	int height = this->m_inputRadius->getHeight();
@@ -312,14 +312,14 @@ void* InverseSearchRadiusOperation::initializeTileData(rcti *rect)
 
 void InverseSearchRadiusOperation::executePixel(float *color, int x, int y, void *data) 
 {
-	MemoryBuffer *buffer = (MemoryBuffer*)data;
+	MemoryBuffer *buffer = (MemoryBuffer *)data;
 	buffer->readNoCheck(color, x, y);
 }
 
 void InverseSearchRadiusOperation::deinitializeTileData(rcti *rect, void *data) 
 {
 	if (data) {
-		MemoryBuffer* mb = (MemoryBuffer*)data;
+		MemoryBuffer *mb = (MemoryBuffer *)data;
 		delete mb;
 	}
 }
@@ -339,10 +339,10 @@ void InverseSearchRadiusOperation::determineResolution(unsigned int resolution[]
 bool InverseSearchRadiusOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
 {
 	rcti newRect;
-	newRect.ymin = input->ymin*DIVIDER - m_maxBlur;
-	newRect.ymax = input->ymax*DIVIDER + m_maxBlur;
-	newRect.xmin = input->xmin*DIVIDER - m_maxBlur;
-	newRect.xmax = input->xmax*DIVIDER + m_maxBlur;
+	newRect.ymin = input->ymin * DIVIDER - m_maxBlur;
+	newRect.ymax = input->ymax * DIVIDER + m_maxBlur;
+	newRect.xmin = input->xmin * DIVIDER - m_maxBlur;
+	newRect.xmax = input->xmax * DIVIDER + m_maxBlur;
 	return NodeOperation::determineDependingAreaOfInterest(&newRect, readOperation, output);
 }
 #endif
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
index e5430545323..f53d54f8c2c 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
@@ -66,7 +66,7 @@ public:
 
 	void setThreshold(float threshold) { this->m_threshold = threshold; }
 
-	void executeOpenCL(OpenCLDevice* device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp);
+	void executeOpenCL(OpenCLDevice *device, MemoryBuffer *outputMemoryBuffer, cl_mem clOutputBuffer, MemoryBuffer **inputMemoryBuffers, list<cl_mem> *clMemToCleanUp, list<cl_kernel> *clKernelsToCleanUp);
 };
 
 #ifdef COM_DEFOCUS_SEARCH
@@ -88,7 +88,7 @@ public:
 	 * Initialize the execution
 	 */
 	void initExecution();
-	void* initializeTileData(rcti *rect);
+	void *initializeTileData(rcti *rect);
 	void deinitializeTileData(rcti *rect, void *data);
 	
 	/**
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
index 0a31a6e170b..06ec5b51efd 100644
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
@@ -110,7 +110,7 @@ void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber)
 	memoryBuffer->setCreatedState();
 }
 
-void WriteBufferOperation::executeOpenCLRegion(OpenCLDevice* device, rcti *rect, unsigned int chunkNumber, MemoryBuffer **inputMemoryBuffers, MemoryBuffer *outputBuffer)
+void WriteBufferOperation::executeOpenCLRegion(OpenCLDevice *device, rcti *rect, unsigned int chunkNumber, MemoryBuffer **inputMemoryBuffers, MemoryBuffer *outputBuffer)
 {
 	float *outputFloatBuffer = outputBuffer->getBuffer();
 	cl_int error;
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h
index 1aa93c658cb..f1632689dbe 100644
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.h
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h
@@ -44,7 +44,7 @@ public:
 	void executeRegion(rcti *rect, unsigned int tileNumber);
 	void initExecution();
 	void deinitExecution();
-	void executeOpenCLRegion(OpenCLDevice* device, rcti *rect, unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer);
+	void executeOpenCLRegion(OpenCLDevice *device, rcti *rect, unsigned int chunkNumber, MemoryBuffer **memoryBuffers, MemoryBuffer *outputBuffer);
 	void readResolutionFromInputSocket();
 	inline NodeOperation *getInput() {
 		return m_input;