Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-09-07 17:12:26 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-09-07 17:23:25 +0300
commit0b2d1badecc48b5cbff5ec088b29c6e9acc5e1d0 (patch)
tree0283a5c819d1e709edfd0de814636aa83a9b1033 /source/blender/compositor/intern
parentab823176d31dc155645de733f1cd4fbd6ad74592 (diff)
Cleanup: use post increment/decrement
When the result isn't used, prefer post increment/decrement (already used nearly everywhere in Blender).
Diffstat (limited to 'source/blender/compositor/intern')
-rw-r--r--source/blender/compositor/intern/COM_Debug.cpp14
-rw-r--r--source/blender/compositor/intern/COM_NodeGraph.cpp6
-rw-r--r--source/blender/compositor/intern/COM_NodeOperation.cpp2
-rw-r--r--source/blender/compositor/intern/COM_NodeOperationBuilder.cpp54
4 files changed, 38 insertions, 38 deletions
diff --git a/source/blender/compositor/intern/COM_Debug.cpp b/source/blender/compositor/intern/COM_Debug.cpp
index 72c1e0cf316..c2ef7d37a59 100644
--- a/source/blender/compositor/intern/COM_Debug.cpp
+++ b/source/blender/compositor/intern/COM_Debug.cpp
@@ -335,7 +335,7 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
int totops = system->m_operations.size();
int totgroups = system->m_groups.size();
std::map<NodeOperation *, std::vector<std::string>> op_groups;
- for (int i = 0; i < totgroups; ++i) {
+ for (int i = 0; i < totgroups; i++) {
const ExecutionGroup *group = system->m_groups[i];
len += snprintf(str + len, maxlen > len ? maxlen - len : 0, "// GROUP: %d\r\n", i);
@@ -377,7 +377,7 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
}
/* operations not included in any group */
- for (int j = 0; j < totops; ++j) {
+ for (int j = 0; j < totops; j++) {
NodeOperation *operation = system->m_operations[j];
if (op_groups.find(operation) != op_groups.end()) {
continue;
@@ -397,8 +397,8 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
std::vector<std::string> &read_groups = op_groups[read];
std::vector<std::string> &write_groups = op_groups[write];
- for (int k = 0; k < write_groups.size(); ++k) {
- for (int l = 0; l < read_groups.size(); ++l) {
+ for (int k = 0; k < write_groups.size(); k++) {
+ for (int l = 0; l < read_groups.size(); l++) {
len += snprintf(str + len,
maxlen > len ? maxlen - len : 0,
"\"O_%p%s\" -> \"O_%p%s\" [style=dotted]\r\n",
@@ -448,8 +448,8 @@ bool DebugInfo::graphviz_system(const ExecutionSystem *system, char *str, int ma
from,
to_op,
to);
- for (int k = 0; k < from_groups.size(); ++k) {
- for (int l = 0; l < to_groups.size(); ++l) {
+ for (int k = 0; k < from_groups.size(); k++) {
+ for (int l = 0; l < to_groups.size(); l++) {
len += snprintf(str + len,
maxlen > len ? maxlen - len : 0,
"\"O_%p%s\":\"OUT_%p\":e -> \"O_%p%s\":\"IN_%p\":w",
@@ -483,7 +483,7 @@ void DebugInfo::graphviz(const ExecutionSystem *system)
BLI_snprintf(basename, sizeof(basename), "compositor_%d.dot", m_file_index);
BLI_join_dirfile(filename, sizeof(filename), BKE_tempdir_session(), basename);
- ++m_file_index;
+ m_file_index++;
FILE *fp = BLI_fopen(filename, "wb");
fputs(str, fp);
diff --git a/source/blender/compositor/intern/COM_NodeGraph.cpp b/source/blender/compositor/intern/COM_NodeGraph.cpp
index b4d6cc0ff60..ce54aef946b 100644
--- a/source/blender/compositor/intern/COM_NodeGraph.cpp
+++ b/source/blender/compositor/intern/COM_NodeGraph.cpp
@@ -160,7 +160,7 @@ void NodeGraph::add_bNode(const CompositorContext &context,
NodeGraph::NodeInputs NodeGraph::find_inputs(const NodeRange &node_range, bNodeSocket *b_socket)
{
NodeInputs result;
- for (NodeGraph::NodeIterator it = node_range.first; it != node_range.second; ++it) {
+ for (NodeGraph::NodeIterator it = node_range.first; it != node_range.second; it++) {
Node *node = *it;
for (int index = 0; index < node->getNumberOfInputSockets(); index++) {
NodeInput *input = node->getInputSocket(index);
@@ -174,7 +174,7 @@ NodeGraph::NodeInputs NodeGraph::find_inputs(const NodeRange &node_range, bNodeS
NodeOutput *NodeGraph::find_output(const NodeRange &node_range, bNodeSocket *b_socket)
{
- for (NodeGraph::NodeIterator it = node_range.first; it != node_range.second; ++it) {
+ for (NodeGraph::NodeIterator it = node_range.first; it != node_range.second; it++) {
Node *node = *it;
for (int index = 0; index < node->getNumberOfOutputSockets(); index++) {
NodeOutput *output = node->getOutputSocket(index);
@@ -206,7 +206,7 @@ void NodeGraph::add_bNodeLink(const NodeRange &node_range, bNodeLink *b_nodelink
}
NodeInputs inputs = find_inputs(node_range, b_nodelink->tosock);
- for (NodeInputs::const_iterator it = inputs.begin(); it != inputs.end(); ++it) {
+ for (NodeInputs::const_iterator it = inputs.begin(); it != inputs.end(); it++) {
NodeInput *input = *it;
if (input->isLinked()) {
continue;
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp
index 80243c10760..61e18c93a61 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperation.cpp
@@ -152,7 +152,7 @@ NodeOperation *NodeOperation::getInputOperation(unsigned int inputSocketIndex)
void NodeOperation::getConnectedInputSockets(Inputs *sockets)
{
- for (Inputs::const_iterator it = m_inputs.begin(); it != m_inputs.end(); ++it) {
+ for (Inputs::const_iterator it = m_inputs.begin(); it != m_inputs.end(); it++) {
NodeOperationInput *input = *it;
if (input->isConnected()) {
sockets->push_back(input);
diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
index 198385649da..ae9949b9018 100644
--- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp
@@ -70,7 +70,7 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system)
* so multiple operations can use the same node input.
*/
OpInputInverseMap inverse_input_map;
- for (InputSocketMap::const_iterator it = m_input_map.begin(); it != m_input_map.end(); ++it) {
+ for (InputSocketMap::const_iterator it = m_input_map.begin(); it != m_input_map.end(); it++) {
inverse_input_map[it->second].push_back(it->first);
}
@@ -92,7 +92,7 @@ void NodeOperationBuilder::convertToOperations(ExecutionSystem *system)
continue;
}
- for (OpInputs::const_iterator it = op_to_list.begin(); it != op_to_list.end(); ++it) {
+ for (OpInputs::const_iterator it = op_to_list.begin(); it != op_to_list.end(); it++) {
NodeOperationInput *op_to = *it;
addLink(op_from, op_to);
}
@@ -166,7 +166,7 @@ void NodeOperationBuilder::addLink(NodeOperationOutput *from, NodeOperationInput
void NodeOperationBuilder::removeInputLink(NodeOperationInput *to)
{
- for (Links::iterator it = m_links.begin(); it != m_links.end(); ++it) {
+ for (Links::iterator it = m_links.begin(); it != m_links.end(); it++) {
Link &link = *it;
if (link.to() == to) {
/* unregister with the input */
@@ -274,7 +274,7 @@ void NodeOperationBuilder::registerViewer(ViewerOperation *viewer)
void NodeOperationBuilder::add_datatype_conversions()
{
Links convert_links;
- for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
+ for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
/* proxy operations can skip data type conversion */
@@ -288,7 +288,7 @@ void NodeOperationBuilder::add_datatype_conversions()
convert_links.push_back(link);
}
}
- for (Links::const_iterator it = convert_links.begin(); it != convert_links.end(); ++it) {
+ for (Links::const_iterator it = convert_links.begin(); it != convert_links.end(); it++) {
const Link &link = *it;
NodeOperation *converter = Converter::convertDataType(link.from(), link.to());
if (converter) {
@@ -308,16 +308,16 @@ void NodeOperationBuilder::add_operation_input_constants()
*/
typedef std::vector<NodeOperationInput *> Inputs;
Inputs pending_inputs;
- for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
+ for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
- for (int k = 0; k < op->getNumberOfInputSockets(); ++k) {
+ for (int k = 0; k < op->getNumberOfInputSockets(); k++) {
NodeOperationInput *input = op->getInputSocket(k);
if (!input->isConnected()) {
pending_inputs.push_back(input);
}
}
}
- for (Inputs::const_iterator it = pending_inputs.begin(); it != pending_inputs.end(); ++it) {
+ for (Inputs::const_iterator it = pending_inputs.begin(); it != pending_inputs.end(); it++) {
NodeOperationInput *input = *it;
add_input_constant_value(input, find_node_input(m_input_map, input));
}
@@ -378,7 +378,7 @@ void NodeOperationBuilder::add_input_constant_value(NodeOperationInput *input,
void NodeOperationBuilder::resolve_proxies()
{
Links proxy_links;
- for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
+ for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
/* don't replace links from proxy to proxy, since we may need them for replacing others! */
if (link.from()->getOperation().isProxyOperation() &&
@@ -387,7 +387,7 @@ void NodeOperationBuilder::resolve_proxies()
}
}
- for (Links::const_iterator it = proxy_links.begin(); it != proxy_links.end(); ++it) {
+ for (Links::const_iterator it = proxy_links.begin(); it != proxy_links.end(); it++) {
const Link &link = *it;
NodeOperationInput *to = link.to();
@@ -410,7 +410,7 @@ void NodeOperationBuilder::resolve_proxies()
void NodeOperationBuilder::determineResolutions()
{
/* determine all resolutions of the operations (Width/Height) */
- for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
+ for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
if (op->isOutputOperation(m_context->isRendering()) && !op->isPreviewOperation()) {
@@ -421,7 +421,7 @@ void NodeOperationBuilder::determineResolutions()
}
}
- for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
+ for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
if (op->isOutputOperation(m_context->isRendering()) && op->isPreviewOperation()) {
@@ -435,7 +435,7 @@ void NodeOperationBuilder::determineResolutions()
/* add convert resolution operations when needed */
{
Links convert_links;
- for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
+ for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
if (link.to()->getResizeMode() != COM_SC_NO_RESIZE) {
@@ -446,7 +446,7 @@ void NodeOperationBuilder::determineResolutions()
}
}
}
- for (Links::const_iterator it = convert_links.begin(); it != convert_links.end(); ++it) {
+ for (Links::const_iterator it = convert_links.begin(); it != convert_links.end(); it++) {
const Link &link = *it;
Converter::convertResolution(*this, link.from(), link.to());
}
@@ -457,7 +457,7 @@ NodeOperationBuilder::OpInputs NodeOperationBuilder::cache_output_links(
NodeOperationOutput *output) const
{
OpInputs inputs;
- for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
+ for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
if (link.from() == output) {
inputs.push_back(link.to());
@@ -469,7 +469,7 @@ NodeOperationBuilder::OpInputs NodeOperationBuilder::cache_output_links(
WriteBufferOperation *NodeOperationBuilder::find_attached_write_buffer_operation(
NodeOperationOutput *output) const
{
- for (Links::const_iterator it = m_links.begin(); it != m_links.end(); ++it) {
+ for (Links::const_iterator it = m_links.begin(); it != m_links.end(); it++) {
const Link &link = *it;
if (link.from() == output) {
NodeOperation &op = link.to()->getOperation();
@@ -529,7 +529,7 @@ void NodeOperationBuilder::add_output_buffers(NodeOperation *operation,
}
WriteBufferOperation *writeOperation = NULL;
- for (OpInputs::const_iterator it = targets.begin(); it != targets.end(); ++it) {
+ for (OpInputs::const_iterator it = targets.begin(); it != targets.end(); it++) {
NodeOperationInput *target = *it;
/* try to find existing write buffer operation */
@@ -555,7 +555,7 @@ void NodeOperationBuilder::add_output_buffers(NodeOperation *operation,
writeOperation->readResolutionFromInputSocket();
/* add readbuffer op for every former connected input */
- for (OpInputs::const_iterator it = targets.begin(); it != targets.end(); ++it) {
+ for (OpInputs::const_iterator it = targets.begin(); it != targets.end(); it++) {
NodeOperationInput *target = *it;
if (&target->getOperation() == writeOperation) {
continue; /* skip existing write op links */
@@ -578,13 +578,13 @@ void NodeOperationBuilder::add_complex_operation_buffers()
* will invalidate iterators over the main m_operations
*/
Operations complex_ops;
- for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
+ for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
if ((*it)->isComplex()) {
complex_ops.push_back(*it);
}
}
- for (Operations::const_iterator it = complex_ops.begin(); it != complex_ops.end(); ++it) {
+ for (Operations::const_iterator it = complex_ops.begin(); it != complex_ops.end(); it++) {
NodeOperation *op = *it;
DebugInfo::operation_read_write_buffer(op);
@@ -608,7 +608,7 @@ static void find_reachable_operations_recursive(Tags &reachable, NodeOperation *
}
reachable.insert(op);
- for (int i = 0; i < op->getNumberOfInputSockets(); ++i) {
+ for (int i = 0; i < op->getNumberOfInputSockets(); i++) {
NodeOperationInput *input = op->getInputSocket(i);
if (input->isConnected()) {
find_reachable_operations_recursive(reachable, &input->getLink()->getOperation());
@@ -626,7 +626,7 @@ static void find_reachable_operations_recursive(Tags &reachable, NodeOperation *
void NodeOperationBuilder::prune_operations()
{
Tags reachable;
- for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
+ for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
/* output operations are primary executed operations */
@@ -637,7 +637,7 @@ void NodeOperationBuilder::prune_operations()
/* delete unreachable operations */
Operations reachable_ops;
- for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
+ for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
if (reachable.find(op) != reachable.end()) {
@@ -661,7 +661,7 @@ static void sort_operations_recursive(NodeOperationBuilder::Operations &sorted,
}
visited.insert(op);
- for (int i = 0; i < op->getNumberOfInputSockets(); ++i) {
+ for (int i = 0; i < op->getNumberOfInputSockets(); i++) {
NodeOperationInput *input = op->getInputSocket(i);
if (input->isConnected()) {
sort_operations_recursive(sorted, visited, &input->getLink()->getOperation());
@@ -677,7 +677,7 @@ void NodeOperationBuilder::sort_operations()
sorted.reserve(m_operations.size());
Tags visited;
- for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
+ for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
sort_operations_recursive(sorted, visited, *it);
}
@@ -696,7 +696,7 @@ static void add_group_operations_recursive(Tags &visited, NodeOperation *op, Exe
}
/* add all eligible input ops to the group */
- for (int i = 0; i < op->getNumberOfInputSockets(); ++i) {
+ for (int i = 0; i < op->getNumberOfInputSockets(); i++) {
NodeOperationInput *input = op->getInputSocket(i);
if (input->isConnected()) {
add_group_operations_recursive(visited, &input->getLink()->getOperation(), group);
@@ -717,7 +717,7 @@ ExecutionGroup *NodeOperationBuilder::make_group(NodeOperation *op)
void NodeOperationBuilder::group_operations()
{
- for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); ++it) {
+ for (Operations::const_iterator it = m_operations.begin(); it != m_operations.end(); it++) {
NodeOperation *op = *it;
if (op->isOutputOperation(m_context->isRendering())) {