[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47961] trunk/blender/source/blender: style cleanup

Campbell Barton ideasman42 at gmail.com
Fri Jun 15 16:45:50 CEST 2012


Revision: 47961
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47961
Author:   campbellbarton
Date:     2012-06-15 14:45:49 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
    trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp
    trunk/blender/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c

Modified: trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp	2012-06-15 14:40:01 UTC (rev 47960)
+++ trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp	2012-06-15 14:45:49 UTC (rev 47961)
@@ -26,16 +26,16 @@
 #include "COM_SplitViewerOperation.h"
 #include "COM_ExecutionSystem.h"
 
-SplitViewerNode::SplitViewerNode(bNode *editorNode): Node(editorNode)
+SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode)
 {
 }
 
-void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *image1Socket = this->getInputSocket(0);
 	InputSocket *image2Socket = this->getInputSocket(1);
-	Image *image = (Image*)this->getbNode()->id;
-	ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
+	Image *image = (Image *)this->getbNode()->id;
+	ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
 	if (image1Socket->isConnected() && image2Socket->isConnected()) {
 		SplitViewerOperation *splitViewerOperation = new SplitViewerOperation();
 		splitViewerOperation->setColorManagement(context->getScene()->r.color_mgt_flag & R_COLOR_MANAGEMENT);

Modified: trunk/blender/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp	2012-06-15 14:40:01 UTC (rev 47960)
+++ trunk/blender/source/blender/compositor/nodes/COM_ViewLevelsNode.cpp	2012-06-15 14:45:49 UTC (rev 47961)
@@ -26,21 +26,21 @@
 #include "COM_CalculateMeanOperation.h"
 #include "COM_CalculateStandardDeviationOperation.h"
 
-ViewLevelsNode::ViewLevelsNode(bNode *editorNode): Node(editorNode)
+ViewLevelsNode::ViewLevelsNode(bNode *editorNode) : Node(editorNode)
 {
 }
-void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)
+void ViewLevelsNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
-	InputSocket * input = this->getInputSocket(0);
+	InputSocket *input = this->getInputSocket(0);
 	bool firstOperationConnected = false;
 	if (input->isConnected()) {
 		OutputSocket *inputSocket = input->getConnection()->getFromSocket();
 		// add preview to inputSocket;
 		
-		OutputSocket * socket = this->getOutputSocket(0);
+		OutputSocket *socket = this->getOutputSocket(0);
 		if (socket->isConnected()) {
 			// calculate mean operation
-			CalculateMeanOperation * operation = new CalculateMeanOperation();
+			CalculateMeanOperation *operation = new CalculateMeanOperation();
 			input->relinkConnections(operation->getInputSocket(0), 0, graph);
 			firstOperationConnected = true;
 			operation->setSetting(this->getbNode()->custom1);
@@ -51,7 +51,7 @@
 		socket = this->getOutputSocket(1);
 		if (socket->isConnected()) {
 			// calculate standard deviation operation
-			CalculateStandardDeviationOperation * operation = new CalculateStandardDeviationOperation();
+			CalculateStandardDeviationOperation *operation = new CalculateStandardDeviationOperation();
 			if (firstOperationConnected) {
 				addLink(graph, inputSocket, operation->getInputSocket(0));
 			}

Modified: trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp	2012-06-15 14:40:01 UTC (rev 47960)
+++ trunk/blender/source/blender/compositor/nodes/COM_ViewerNode.cpp	2012-06-15 14:45:49 UTC (rev 47961)
@@ -26,16 +26,16 @@
 #include "COM_ViewerOperation.h"
 #include "COM_ExecutionSystem.h"
 
-ViewerNode::ViewerNode(bNode *editorNode): Node(editorNode)
+ViewerNode::ViewerNode(bNode *editorNode) : Node(editorNode)
 {
 }
 
-void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext * context)\
+void ViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	InputSocket *imageSocket = this->getInputSocket(0);
 	InputSocket *alphaSocket = this->getInputSocket(1);
-	Image *image = (Image*)this->getbNode()->id;
-	ImageUser * imageUser = (ImageUser*) this->getbNode()->storage;
+	Image *image = (Image *)this->getbNode()->id;
+	ImageUser *imageUser = (ImageUser *) this->getbNode()->storage;
 	bNode *editorNode = this->getbNode();
 	if (imageSocket->isConnected()) {
 		ViewerOperation *viewerOperation = new ViewerOperation();

Modified: trunk/blender/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_SplitViewerOperation.cpp	2012-06-15 14:40:01 UTC (rev 47960)
+++ trunk/blender/source/blender/compositor/operations/COM_SplitViewerOperation.cpp	2012-06-15 14:45:49 UTC (rev 47961)
@@ -60,7 +60,7 @@
 }
 
 
-void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers)
+void SplitViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
 {
 	float *buffer = this->outputBuffer;
 	unsigned char *bufferDisplay = this->outputBufferDisplay;
@@ -70,15 +70,15 @@
 	int y1 = rect->ymin;
 	int x2 = rect->xmax;
 	int y2 = rect->ymax;
-	int offset = (y1*this->getWidth() + x1 ) * 4;
+	int offset = (y1 * this->getWidth() + x1) * 4;
 	int x;
 	int y;
-	int perc = xSplit?this->splitPercentage*getWidth()/100.0f:this->splitPercentage*getHeight()/100.0f;
-	for (y = y1 ; y < y2 ; y++) {
-		for (x = x1 ; x < x2 ; x++) {
+	int perc = xSplit ? this->splitPercentage *getWidth() / 100.0f : this->splitPercentage *getHeight() / 100.0f;
+	for (y = y1; y < y2; y++) {
+		for (x = x1; x < x2; x++) {
 			bool image1;
 			float srgb[4];
-			image1 = xSplit?x>perc:y>perc;
+			image1 = xSplit ? x > perc : y > perc;
 			if (image1) {
 				image1Input->read(&(buffer[offset]), x, y, COM_PS_NEAREST, memoryBuffers);
 			}
@@ -88,21 +88,21 @@
 			/// @todo: linear conversion only when scene color management is selected, also check predivide.
 			if (this->doColorManagement) {
 				if (this->doColorPredivide) {
-					linearrgb_to_srgb_predivide_v4(srgb, buffer+offset);
+					linearrgb_to_srgb_predivide_v4(srgb, buffer + offset);
 				}
 				else {
-					linearrgb_to_srgb_v4(srgb, buffer+offset);
+					linearrgb_to_srgb_v4(srgb, buffer + offset);
 				}
 			}
 			else {
-				copy_v4_v4(srgb, buffer+offset);
+				copy_v4_v4(srgb, buffer + offset);
 			}
 	
-			F4TOCHAR4(srgb, bufferDisplay+offset);
+			rgba_float_to_uchar(bufferDisplay + offset, srgb);
 	
-			offset +=4;
+			offset += 4;
 		}
-		offset += (this->getWidth()-(x2-x1))*4;
+		offset += (this->getWidth() - (x2 - x1)) * 4;
 	}
 	updateImage(rect);
 }

Modified: trunk/blender/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp	2012-06-15 14:40:01 UTC (rev 47960)
+++ trunk/blender/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp	2012-06-15 14:45:49 UTC (rev 47961)
@@ -74,13 +74,13 @@
 	
 	/* now we combine the input with ibuf */
 	this->outputBuffer = ibuf->rect_float;
-	this->outputBufferDisplay = (unsigned char*)ibuf->rect;
+	this->outputBufferDisplay = (unsigned char *)ibuf->rect;
 	
 	BKE_image_release_ibuf(this->image, this->lock);
 }
 void ViewerBaseOperation:: updateImage(rcti *rect)
 {
-	WM_main_add_notifier(NC_WINDOW|ND_DRAW, NULL);
+	WM_main_add_notifier(NC_WINDOW | ND_DRAW, NULL);
 }
 
 void ViewerBaseOperation::deinitExecution()

Modified: trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp	2012-06-15 14:40:01 UTC (rev 47960)
+++ trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp	2012-06-15 14:45:49 UTC (rev 47961)
@@ -64,7 +64,7 @@
 }
 
 
-void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer** memoryBuffers)
+void ViewerOperation::executeRegion(rcti *rect, unsigned int tileNumber, MemoryBuffer **memoryBuffers)
 {
 	float *buffer = this->outputBuffer;
 	unsigned char *bufferDisplay = this->outputBufferDisplay;
@@ -73,36 +73,36 @@
 	const int y1 = rect->ymin;
 	const int x2 = rect->xmax;
 	const int y2 = rect->ymax;
-	const int offsetadd = (this->getWidth()-(x2-x1))*4;
-	int offset = (y1*this->getWidth() + x1 ) * 4;
+	const int offsetadd = (this->getWidth() - (x2 - x1)) * 4;
+	int offset = (y1 * this->getWidth() + x1) * 4;
 	float alpha[4], srgb[4];
 	int x;
 	int y;
 	bool breaked = false;
 
-	for (y = y1 ; y < y2 && (!breaked) ; y++) {
-		for (x = x1 ; x < x2; x++) {
+	for (y = y1; y < y2 && (!breaked); y++) {
+		for (x = x1; x < x2; x++) {
 			imageInput->read(&(buffer[offset]), x, y, COM_PS_NEAREST, memoryBuffers);
 			if (alphaInput != NULL) {
 				alphaInput->read(alpha, x, y, COM_PS_NEAREST, memoryBuffers);
-				buffer[offset+3] = alpha[0];
+				buffer[offset + 3] = alpha[0];
 			}
 			/// @todo: linear conversion only when scene color management is selected, also check predivide.
 			if (this->doColorManagement) {
 				if (this->doColorPredivide) {
-					linearrgb_to_srgb_predivide_v4(srgb, buffer+offset);
+					linearrgb_to_srgb_predivide_v4(srgb, buffer + offset);
 				}
 				else {
-					linearrgb_to_srgb_v4(srgb, buffer+offset);
+					linearrgb_to_srgb_v4(srgb, buffer + offset);
 				}
 			}
 			else {
-				copy_v4_v4(srgb, buffer+offset);
+				copy_v4_v4(srgb, buffer + offset);
 			}
 
-			F4TOCHAR4(srgb, bufferDisplay+offset);
+			rgba_float_to_uchar(bufferDisplay + offset, srgb);
 
-			offset +=4;
+			offset += 4;
 		}
 		if (isBreaked()) {
 			breaked = true;

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c	2012-06-15 14:40:01 UTC (rev 47960)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_viewer.c	2012-06-15 14:45:49 UTC (rev 47961)
@@ -34,11 +34,11 @@
 
 
 /* **************** VIEWER ******************** */

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list