[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60228] trunk/blender/source/blender/ compositor/intern/COM_Debug.cpp: style cleanup
Campbell Barton
ideasman42 at gmail.com
Thu Sep 19 01:08:23 CEST 2013
Revision: 60228
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60228
Author: campbellbarton
Date: 2013-09-18 23:08:23 +0000 (Wed, 18 Sep 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/compositor/intern/COM_Debug.cpp
Modified: trunk/blender/source/blender/compositor/intern/COM_Debug.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_Debug.cpp 2013-09-18 22:45:14 UTC (rev 60227)
+++ trunk/blender/source/blender/compositor/intern/COM_Debug.cpp 2013-09-18 23:08:23 UTC (rev 60228)
@@ -128,68 +128,68 @@
fillcolor = "darkorange";
}
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "// OPERATION: %p\r\n", operation);
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "// OPERATION: %p\r\n", operation);
if (group)
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "\"O_%p_%p\"", operation, group);
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "\"O_%p_%p\"", operation, group);
else
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "\"O_%p\"", operation);
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, " [fillcolor=%s,style=filled,shape=record,label=\"{", fillcolor.c_str());
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "\"O_%p\"", operation);
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, " [fillcolor=%s,style=filled,shape=record,label=\"{", fillcolor.c_str());
int totinputs = operation->getNumberOfInputSockets();
if (totinputs != 0) {
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "{");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "{");
for (int k = 0; k < totinputs; k++) {
InputSocket *socket = operation->getInputSocket(k);
if (k != 0) {
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "|");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "|");
}
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "<IN_%p>", socket);
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<IN_%p>", socket);
switch (socket->getDataType()) {
case COM_DT_VALUE:
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "Value");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Value");
break;
case COM_DT_VECTOR:
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "Vector");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Vector");
break;
case COM_DT_COLOR:
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "Color");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Color");
break;
}
}
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "}");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "|");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "}");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "|");
}
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "%s\\n(%s)", m_node_names[operation].c_str(), typeid(*operation).name());
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "%s\\n(%s)", m_node_names[operation].c_str(), typeid(*operation).name());
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, " (%d,%d)", operation->getWidth(), operation->getHeight());
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, " (%d,%d)", operation->getWidth(), operation->getHeight());
int totoutputs = operation->getNumberOfOutputSockets();
if (totoutputs != 0) {
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "|");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "{");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "|");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "{");
for (int k = 0; k < totoutputs; k++) {
OutputSocket *socket = operation->getOutputSocket(k);
if (k != 0) {
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "|");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "|");
}
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "<OUT_%p>", socket);
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<OUT_%p>", socket);
switch (socket->getDataType()) {
case COM_DT_VALUE:
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "Value");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Value");
break;
case COM_DT_VECTOR:
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "Vector");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Vector");
break;
case COM_DT_COLOR:
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "Color");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Color");
break;
}
}
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "}");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "}");
}
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "}\"]");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "\r\n");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "}\"]");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "\r\n");
return len;
}
@@ -197,7 +197,7 @@
int DebugInfo::graphviz_legend_color(const char *name, const char *color, char *str, int maxlen)
{
int len = 0;
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "<TR><TD>%s</TD><TD BGCOLOR=\"%s\"></TD></TR>\r\n", name, color);
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<TR><TD>%s</TD><TD BGCOLOR=\"%s\"></TD></TR>\r\n", name, color);
return len;
}
@@ -205,14 +205,14 @@
{
/* XXX TODO */
int len = 0;
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "\r\n");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "\r\n");
return len;
}
int DebugInfo::graphviz_legend_group(const char *name, const char *color, const char *style, char *str, int maxlen)
{
int len = 0;
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "<TR><TD>%s</TD><TD CELLPADDING=\"4\"><TABLE BORDER=\"1\" CELLBORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD BGCOLOR=\"%s\"></TD></TR></TABLE></TD></TR>\r\n", name, color);
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<TR><TD>%s</TD><TD CELLPADDING=\"4\"><TABLE BORDER=\"1\" CELLBORDER=\"0\" CELLSPACING=\"0\" CELLPADDING=\"0\"><TR><TD BGCOLOR=\"%s\"></TD></TR></TABLE></TD></TR>\r\n", name, color);
return len;
}
@@ -220,31 +220,31 @@
{
int len = 0;
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "{\r\n");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "rank = sink;\r\n");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "Legend [shape=none, margin=0, label=<\r\n");
-
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, " <TABLE BORDER=\"0\" CELLBORDER=\"1\" CELLSPACING=\"0\" CELLPADDING=\"4\">\r\n");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "<TR><TD COLSPAN=\"2\"><B>Legend</B></TD></TR>\r\n");
-
- len += graphviz_legend_color("Operation", "gainsboro", str+len, maxlen>len ? maxlen-len : 0);
- len += graphviz_legend_color("Output", "dodgerblue1", str+len, maxlen>len ? maxlen-len : 0);
- len += graphviz_legend_color("Viewer", "lightskyblue3", str+len, maxlen>len ? maxlen-len : 0);
- len += graphviz_legend_color("Active Viewer", "lightskyblue1", str+len, maxlen>len ? maxlen-len : 0);
- len += graphviz_legend_color("Write Buffer", "darkorange", str+len, maxlen>len ? maxlen-len : 0);
- len += graphviz_legend_color("Read Buffer", "darkolivegreen3", str+len, maxlen>len ? maxlen-len : 0);
- len += graphviz_legend_color("Input Value", "khaki1", str+len, maxlen>len ? maxlen-len : 0);
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "{\r\n");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "rank = sink;\r\n");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "Legend [shape=none, margin=0, label=<\r\n");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "<TR><TD></TD></TR>\r\n");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, " <TABLE BORDER=\"0\" CELLBORDER=\"1\" CELLSPACING=\"0\" CELLPADDING=\"4\">\r\n");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<TR><TD COLSPAN=\"2\"><B>Legend</B></TD></TR>\r\n");
- len += graphviz_legend_group("Group Waiting", "white", "dashed", str+len, maxlen>len ? maxlen-len : 0);
- len += graphviz_legend_group("Group Running", "firebrick1", "solid", str+len, maxlen>len ? maxlen-len : 0);
- len += graphviz_legend_group("Group Finished", "chartreuse4", "solid", str+len, maxlen>len ? maxlen-len : 0);
-
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "</TABLE>\r\n");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, ">];\r\n");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "}\r\n");
+ len += graphviz_legend_color("Operation", "gainsboro", str + len, maxlen > len ? maxlen - len : 0);
+ len += graphviz_legend_color("Output", "dodgerblue1", str + len, maxlen > len ? maxlen - len : 0);
+ len += graphviz_legend_color("Viewer", "lightskyblue3", str + len, maxlen > len ? maxlen - len : 0);
+ len += graphviz_legend_color("Active Viewer", "lightskyblue1", str + len, maxlen > len ? maxlen - len : 0);
+ len += graphviz_legend_color("Write Buffer", "darkorange", str + len, maxlen > len ? maxlen - len : 0);
+ len += graphviz_legend_color("Read Buffer", "darkolivegreen3", str + len, maxlen > len ? maxlen - len : 0);
+ len += graphviz_legend_color("Input Value", "khaki1", str + len, maxlen > len ? maxlen - len : 0);
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "<TR><TD></TD></TR>\r\n");
+
+ len += graphviz_legend_group("Group Waiting", "white", "dashed", str + len, maxlen > len ? maxlen - len : 0);
+ len += graphviz_legend_group("Group Running", "firebrick1", "solid", str + len, maxlen > len ? maxlen - len : 0);
+ len += graphviz_legend_group("Group Finished", "chartreuse4", "solid", str + len, maxlen > len ? maxlen - len : 0);
+
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "</TABLE>\r\n");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, ">];\r\n");
+ len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "}\r\n");
+
return len;
}
@@ -253,14 +253,14 @@
char strbuf[64];
int len = 0;
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "digraph compositorexecution {\r\n");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "ranksep=1.5\r\n");
- len += snprintf(str+len, maxlen>len ? maxlen-len : 0, "splines=false\r\n");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list