diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-09-07 17:12:26 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-09-07 17:23:25 +0300 |
commit | 0b2d1badecc48b5cbff5ec088b29c6e9acc5e1d0 (patch) | |
tree | 0283a5c819d1e709edfd0de814636aa83a9b1033 /source/blender/compositor | |
parent | ab823176d31dc155645de733f1cd4fbd6ad74592 (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')
25 files changed, 98 insertions, 98 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())) { diff --git a/source/blender/compositor/nodes/COM_CornerPinNode.cpp b/source/blender/compositor/nodes/COM_CornerPinNode.cpp index 9a9ecb755af..efe847bbfbf 100644 --- a/source/blender/compositor/nodes/COM_CornerPinNode.cpp +++ b/source/blender/compositor/nodes/COM_CornerPinNode.cpp @@ -45,7 +45,7 @@ void CornerPinNode::convertToOperations(NodeConverter &converter, converter.addOperation(plane_mask_operation); converter.mapInputSocket(input_image, warp_image_operation->getInputSocket(0)); - for (int i = 0; i < 4; ++i) { + for (int i = 0; i < 4; i++) { NodeInput *corner_input = getInputSocket(node_corner_index[i]); converter.mapInputSocket(corner_input, warp_image_operation->getInputSocket(i + 1)); converter.mapInputSocket(corner_input, plane_mask_operation->getInputSocket(i)); diff --git a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp index 4219fd49d44..da80ef697c1 100644 --- a/source/blender/compositor/nodes/COM_CryptomatteNode.cpp +++ b/source/blender/compositor/nodes/COM_CryptomatteNode.cpp @@ -90,7 +90,7 @@ void CryptomatteNode::convertToOperations(NodeConverter &converter, converter.addOperation(operation); - for (int i = 0; i < getNumberOfInputSockets() - 1; ++i) { + for (int i = 0; i < getNumberOfInputSockets() - 1; i++) { converter.mapInputSocket(this->getInputSocket(i + 1), operation->getInputSocket(i)); } diff --git a/source/blender/compositor/nodes/COM_ImageNode.cpp b/source/blender/compositor/nodes/COM_ImageNode.cpp index 6bce56ffd52..8e2590a9d92 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.cpp +++ b/source/blender/compositor/nodes/COM_ImageNode.cpp @@ -206,7 +206,7 @@ void ImageNode::convertToOperations(NodeConverter &converter, /* without this, multilayer that fail to load will crash blender [#32490] */ if (is_multilayer_ok == false) { - for (int i = 0; i < getNumberOfOutputSockets(); ++i) { + for (int i = 0; i < getNumberOfOutputSockets(); i++) { converter.setInvalidOutput(getOutputSocket(i)); } } diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp b/source/blender/compositor/nodes/COM_OutputFileNode.cpp index 822359771f3..d40f822eb55 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp +++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp @@ -69,7 +69,7 @@ void OutputFileNode::convertToOperations(NodeConverter &converter, int num_inputs = getNumberOfInputSockets(); bool previewAdded = false; - for (int i = 0; i < num_inputs; ++i) { + for (int i = 0; i < num_inputs; i++) { NodeInput *input = getInputSocket(i); NodeImageMultiFileSocket *sockdata = (NodeImageMultiFileSocket *)input->getbNodeSocket()->storage; @@ -88,7 +88,7 @@ void OutputFileNode::convertToOperations(NodeConverter &converter, else { /* single layer format */ int num_inputs = getNumberOfInputSockets(); bool previewAdded = false; - for (int i = 0; i < num_inputs; ++i) { + for (int i = 0; i < num_inputs; i++) { NodeInput *input = getInputSocket(i); if (input->isLinked()) { NodeImageMultiFileSocket *sockdata = diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp index 84c41134b89..1b2e3b2821e 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.cpp +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cpp @@ -93,7 +93,7 @@ __m128 *BlurBaseOperation::convert_gausstab_sse(const float *gausstab, int size) { int n = 2 * size + 1; __m128 *gausstab_sse = (__m128 *)MEM_mallocN_aligned(sizeof(__m128) * n, 16, "gausstab sse"); - for (int i = 0; i < n; ++i) { + for (int i = 0; i < n; i++) { gausstab_sse[i] = _mm_set1_ps(gausstab[i]); } return gausstab_sse; diff --git a/source/blender/compositor/operations/COM_DenoiseOperation.cpp b/source/blender/compositor/operations/COM_DenoiseOperation.cpp index 3aeaba539f9..8235c296c5a 100644 --- a/source/blender/compositor/operations/COM_DenoiseOperation.cpp +++ b/source/blender/compositor/operations/COM_DenoiseOperation.cpp @@ -152,7 +152,7 @@ void DenoiseOperation::generateDenoise(float *data, /* copy the alpha channel, OpenImageDenoise currently only supports RGB */ size_t numPixels = inputTileColor->getWidth() * inputTileColor->getHeight(); - for (size_t i = 0; i < numPixels; ++i) { + for (size_t i = 0; i < numPixels; i++) { data[i * 4 + 3] = inputBufferColor[i * 4 + 3]; } return; diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp index 7cf1086dca1..52bc00e9b84 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.cpp +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cpp @@ -387,7 +387,7 @@ void *DilateStepOperation::initializeTileData(rcti *rect) for (x = 0; x < bwidth + 5 * half_window; x++) { buf[x] = -FLT_MAX; } - for (x = xmin; x < xmax; ++x) { + for (x = xmin; x < xmax; x++) { buf[x - rect->xmin + window - 1] = buffer[(y * width + x)]; } @@ -516,7 +516,7 @@ void *ErodeStepOperation::initializeTileData(rcti *rect) for (x = 0; x < bwidth + 5 * half_window; x++) { buf[x] = FLT_MAX; } - for (x = xmin; x < xmax; ++x) { + for (x = xmin; x < xmax; x++) { buf[x - rect->xmin + window - 1] = buffer[(y * width + x)]; } diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp index 59a397ab32d..1b590c0c392 100644 --- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp @@ -72,7 +72,7 @@ void DirectionalBlurOperation::executePixel(float output[4], int x, int y, void float lsc = this->m_sc; float lrot = this->m_rot; /* blur the image */ - for (int i = 0; i < iterations; ++i) { + for (int i = 0; i < iterations; i++) { const float cs = cosf(lrot), ss = sinf(lrot); const float isc = 1.0f / (1.0f + lsc); diff --git a/source/blender/compositor/operations/COM_DisplaceOperation.cpp b/source/blender/compositor/operations/COM_DisplaceOperation.cpp index 3efc566cb4e..b775bfdee4c 100644 --- a/source/blender/compositor/operations/COM_DisplaceOperation.cpp +++ b/source/blender/compositor/operations/COM_DisplaceOperation.cpp @@ -111,12 +111,12 @@ void DisplaceOperation::pixelTransform(const float xy[2], float r_uv[2], float r if (read_displacement(xy[0] + epsilon[0], xy[1], xs, ys, xy, uv[0], uv[1])) { r_deriv[0][0] += uv[0] - r_uv[0]; r_deriv[1][0] += uv[1] - r_uv[1]; - ++num; + num++; } if (read_displacement(xy[0] - epsilon[0], xy[1], xs, ys, xy, uv[0], uv[1])) { r_deriv[0][0] += r_uv[0] - uv[0]; r_deriv[1][0] += r_uv[1] - uv[1]; - ++num; + num++; } if (num > 0) { float numinv = 1.0f / (float)num; @@ -128,12 +128,12 @@ void DisplaceOperation::pixelTransform(const float xy[2], float r_uv[2], float r if (read_displacement(xy[0], xy[1] + epsilon[1], xs, ys, xy, uv[0], uv[1])) { r_deriv[0][1] += uv[0] - r_uv[0]; r_deriv[1][1] += uv[1] - r_uv[1]; - ++num; + num++; } if (read_displacement(xy[0], xy[1] - epsilon[1], xs, ys, xy, uv[0], uv[1])) { r_deriv[0][1] += r_uv[0] - uv[0]; r_deriv[1][1] += r_uv[1] - uv[1]; - ++num; + num++; } if (num > 0) { float numinv = 1.0f / (float)num; diff --git a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp index 2c12091c458..3058a5990c6 100644 --- a/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp @@ -89,18 +89,18 @@ void *FastGaussianBlurOperation::initializeTileData(rcti *rect) this->m_sy = this->m_data.sizey * this->m_size / 2.0f; if ((this->m_sx == this->m_sy) && (this->m_sx > 0.0f)) { - for (c = 0; c < COM_NUM_CHANNELS_COLOR; ++c) { + for (c = 0; c < COM_NUM_CHANNELS_COLOR; c++) { IIR_gauss(copy, this->m_sx, c, 3); } } else { if (this->m_sx > 0.0f) { - for (c = 0; c < COM_NUM_CHANNELS_COLOR; ++c) { + for (c = 0; c < COM_NUM_CHANNELS_COLOR; c++) { IIR_gauss(copy, this->m_sx, c, 1); } } if (this->m_sy > 0.0f) { - for (c = 0; c < COM_NUM_CHANNELS_COLOR; ++c) { + for (c = 0; c < COM_NUM_CHANNELS_COLOR; c++) { IIR_gauss(copy, this->m_sy, c, 2); } } @@ -216,16 +216,16 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, W = (double *)MEM_callocN(sz * sizeof(double), "IIR_gauss W buf"); if (xy & 1) { // H int offset; - for (y = 0; y < src_height; ++y) { + for (y = 0; y < src_height; y++) { const int yx = y * src_width; offset = yx * num_channels + chan; - for (x = 0; x < src_width; ++x) { + for (x = 0; x < src_width; x++) { X[x] = buffer[offset]; offset += num_channels; } YVV(src_width); offset = yx * num_channels + chan; - for (x = 0; x < src_width; ++x) { + for (x = 0; x < src_width; x++) { buffer[offset] = Y[x]; offset += num_channels; } @@ -235,15 +235,15 @@ void FastGaussianBlurOperation::IIR_gauss(MemoryBuffer *src, int offset; const int add = src_width * num_channels; - for (x = 0; x < src_width; ++x) { + for (x = 0; x < src_width; x++) { offset = x * num_channels + chan; - for (y = 0; y < src_height; ++y) { + for (y = 0; y < src_height; y++) { X[y] = buffer[offset]; offset += add; } YVV(src_height); offset = x * num_channels + chan; - for (y = 0; y < src_height; ++y) { + for (y = 0; y < src_height; y++) { buffer[offset] = Y[y]; offset += add; } diff --git a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp index 30a6a05ed2c..b43b94af06a 100644 --- a/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp +++ b/source/blender/compositor/operations/COM_GlareFogGlowOperation.cpp @@ -61,7 +61,7 @@ static void FHT(fREAL *data, unsigned int M, unsigned int inverse) int i, j = 0; unsigned int Nh = len >> 1; - for (i = 1; i < (len - 1); ++i) { + for (i = 1; i < (len - 1); i++) { j = revbin_upd(j, Nh); if (j > i) { t1 = data[i]; @@ -117,7 +117,7 @@ static void FHT(fREAL *data, unsigned int M, unsigned int inverse) if (inverse) { fREAL sc = (fREAL)1 / (fREAL)len; - for (k = 0; k < len; ++k) { + for (k = 0; k < len; k++) { data[k] *= sc; } } @@ -136,14 +136,14 @@ static void FHT2D( // rows (forward transform skips 0 pad data) maxy = inverse ? Ny : nzp; - for (j = 0; j < maxy; ++j) { + for (j = 0; j < maxy; j++) { FHT(&data[Nx * j], Mx, inverse); } // transpose data if (Nx == Ny) { // square - for (j = 0; j < Ny; ++j) { - for (i = j + 1; i < Nx; ++i) { + for (j = 0; j < Ny; j++) { + for (i = j + 1; i < Nx; i++) { unsigned int op = i + (j << Mx), np = j + (i << My); SWAP(fREAL, data[op], data[np]); } @@ -171,7 +171,7 @@ static void FHT2D( SWAP(unsigned int, Mx, My); // now columns == transposed rows - for (j = 0; j < Ny; ++j) { + for (j = 0; j < Ny; j++) { FHT(&data[Nx * j], Mx, inverse); } @@ -421,9 +421,9 @@ void GlareFogGlowOperation::generateGlare(float *data, scale = 0.25f * sqrtf((float)(sz * sz)); - for (y = 0; y < sz; ++y) { + for (y = 0; y < sz; y++) { v = 2.0f * (y / (float)sz) - 1.0f; - for (x = 0; x < sz; ++x) { + for (x = 0; x < sz; x++) { u = 2.0f * (x / (float)sz) - 1.0f; r = (u * u + v * v) * scale; d = -sqrtf(sqrtf(sqrtf(r))) * 9.0f; diff --git a/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp b/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp index 951dec9281e..4fccb62e3df 100644 --- a/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp +++ b/source/blender/compositor/operations/COM_GlareStreaksOperation.cpp @@ -41,7 +41,7 @@ void GlareStreaksOperation::generateGlare(float *data, for (a = 0.0f; a < DEG2RADF(360.0f) && (!breaked); a += ang) { const float an = a + settings->angle_ofs; const float vx = cos((double)an), vy = sin((double)an); - for (n = 0; n < settings->iter && (!breaked); ++n) { + for (n = 0; n < settings->iter && (!breaked); n++) { const float p4 = pow(4.0, (double)n); const float vxp = vx * p4, vyp = vy * p4; const float wt = pow((double)settings->fade, (double)p4); @@ -50,8 +50,8 @@ void GlareStreaksOperation::generateGlare(float *data, (double)n + 1); // colormodulation amount relative to current pass float *tdstcol = tdst->getBuffer(); - for (y = 0; y < tsrc->getHeight() && (!breaked); ++y) { - for (x = 0; x < tsrc->getWidth(); ++x, tdstcol += 4) { + for (y = 0; y < tsrc->getHeight() && (!breaked); y++) { + for (x = 0; x < tsrc->getWidth(); x++, tdstcol += 4) { // first pass no offset, always same for every pass, exact copy, // otherwise results in uneven brightness, only need once if (n == 0) { diff --git a/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp b/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp index 300d122589f..83dd90ef08b 100644 --- a/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_KeyingBlurOperation.cpp @@ -51,7 +51,7 @@ void KeyingBlurOperation::executePixel(float output[4], int x, int y, void *data if (this->m_axis == 0) { const int start = max(0, x - this->m_size + 1), end = min(bufferWidth, x + this->m_size); - for (int cx = start; cx < end; ++cx) { + for (int cx = start; cx < end; cx++) { int bufferIndex = (y * bufferWidth + cx); average += buffer[bufferIndex]; count++; @@ -60,7 +60,7 @@ void KeyingBlurOperation::executePixel(float output[4], int x, int y, void *data else { const int start = max(0, y - this->m_size + 1), end = min(inputBuffer->getHeight(), y + this->m_size); - for (int cy = start; cy < end; ++cy) { + for (int cy = start; cy < end; cy++) { int bufferIndex = (cy * bufferWidth + x); average += buffer[bufferIndex]; count++; diff --git a/source/blender/compositor/operations/COM_KeyingClipOperation.cpp b/source/blender/compositor/operations/COM_KeyingClipOperation.cpp index b11bd54a190..eafd1e671f8 100644 --- a/source/blender/compositor/operations/COM_KeyingClipOperation.cpp +++ b/source/blender/compositor/operations/COM_KeyingClipOperation.cpp @@ -71,8 +71,8 @@ void KeyingClipOperation::executePixel(float output[4], int x, int y, void *data ok = true; } - for (int cx = start_x; ok == false && cx <= end_x; ++cx) { - for (int cy = start_y; ok == false && cy <= end_y; ++cy) { + for (int cx = start_x; ok == false && cx <= end_x; cx++) { + for (int cy = start_y; ok == false && cy <= end_y; cy++) { if (UNLIKELY(cx == x && cy == y)) { continue; } diff --git a/source/blender/compositor/operations/COM_MapUVOperation.cpp b/source/blender/compositor/operations/COM_MapUVOperation.cpp index 21d432b9222..de55c9fb4b8 100644 --- a/source/blender/compositor/operations/COM_MapUVOperation.cpp +++ b/source/blender/compositor/operations/COM_MapUVOperation.cpp @@ -117,12 +117,12 @@ void MapUVOperation::pixelTransform(const float xy[2], if (read_uv(xy[0] + epsilon[0], xy[1], uv[0], uv[1], alpha)) { r_deriv[0][0] += uv[0] - r_uv[0]; r_deriv[1][0] += uv[1] - r_uv[1]; - ++num; + num++; } if (read_uv(xy[0] - epsilon[0], xy[1], uv[0], uv[1], alpha)) { r_deriv[0][0] += r_uv[0] - uv[0]; r_deriv[1][0] += r_uv[1] - uv[1]; - ++num; + num++; } if (num > 0) { float numinv = 1.0f / (float)num; @@ -134,12 +134,12 @@ void MapUVOperation::pixelTransform(const float xy[2], if (read_uv(xy[0], xy[1] + epsilon[1], uv[0], uv[1], alpha)) { r_deriv[0][1] += uv[0] - r_uv[0]; r_deriv[1][1] += uv[1] - r_uv[1]; - ++num; + num++; } if (read_uv(xy[0], xy[1] - epsilon[1], uv[0], uv[1], alpha)) { r_deriv[0][1] += r_uv[0] - uv[0]; r_deriv[1][1] += r_uv[1] - uv[1]; - ++num; + num++; } if (num > 0) { float numinv = 1.0f / (float)num; diff --git a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp index 9d1be09de0e..444af5c4cf7 100644 --- a/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileMultiViewOperation.cpp @@ -183,7 +183,7 @@ void *OutputOpenExrMultiLayerMultiViewOperation::get_handle(const char *filename IMB_exr_add_view(exrhandle, srv->name); - for (unsigned int i = 0; i < this->m_layers.size(); ++i) { + for (unsigned int i = 0; i < this->m_layers.size(); i++) { add_exr_channels(exrhandle, this->m_layers[i].name, this->m_layers[i].datatype, @@ -229,7 +229,7 @@ void OutputOpenExrMultiLayerMultiViewOperation::deinitExecution() exrhandle = this->get_handle(filename); - for (unsigned int i = 0; i < this->m_layers.size(); ++i) { + for (unsigned int i = 0; i < this->m_layers.size(); i++) { add_exr_channels(exrhandle, this->m_layers[i].name, this->m_layers[i].datatype, @@ -239,7 +239,7 @@ void OutputOpenExrMultiLayerMultiViewOperation::deinitExecution() this->m_layers[i].outputBuffer); } - for (unsigned int i = 0; i < this->m_layers.size(); ++i) { + for (unsigned int i = 0; i < this->m_layers.size(); i++) { /* memory can only be freed after we write all views to the file */ this->m_layers[i].outputBuffer = NULL; this->m_layers[i].imageInput = NULL; @@ -250,7 +250,7 @@ void OutputOpenExrMultiLayerMultiViewOperation::deinitExecution() IMB_exr_write_channels(exrhandle); /* free buffer memory for all the views */ - for (unsigned int i = 0; i < this->m_layers.size(); ++i) { + for (unsigned int i = 0; i < this->m_layers.size(); i++) { free_exr_channels( exrhandle, this->m_rd, this->m_layers[i].name, this->m_layers[i].datatype); } diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.cpp b/source/blender/compositor/operations/COM_OutputFileOperation.cpp index 79e3b2f1108..c06994d7cdb 100644 --- a/source/blender/compositor/operations/COM_OutputFileOperation.cpp +++ b/source/blender/compositor/operations/COM_OutputFileOperation.cpp @@ -162,7 +162,7 @@ static void write_buffer_rect(rcti *rect, for (x = x1; x < x2 && (!breaked); x++) { reader->readSampled(color, x, y, COM_PS_NEAREST); - for (i = 0; i < size; ++i) { + for (i = 0; i < size; i++) { buffer[offset + i] = color[i]; } offset += size; @@ -298,7 +298,7 @@ void OutputOpenExrMultiLayerOperation::add_layer(const char *name, void OutputOpenExrMultiLayerOperation::initExecution() { - for (unsigned int i = 0; i < this->m_layers.size(); ++i) { + for (unsigned int i = 0; i < this->m_layers.size(); i++) { if (this->m_layers[i].use_layer) { SocketReader *reader = getInputSocketReader(i); this->m_layers[i].imageInput = reader; @@ -310,7 +310,7 @@ void OutputOpenExrMultiLayerOperation::initExecution() void OutputOpenExrMultiLayerOperation::executeRegion(rcti *rect, unsigned int /*tileNumber*/) { - for (unsigned int i = 0; i < this->m_layers.size(); ++i) { + for (unsigned int i = 0; i < this->m_layers.size(); i++) { OutputOpenExrLayer &layer = this->m_layers[i]; if (layer.imageInput) { write_buffer_rect(rect, @@ -343,7 +343,7 @@ void OutputOpenExrMultiLayerOperation::deinitExecution() suffix); BLI_make_existing_file(filename); - for (unsigned int i = 0; i < this->m_layers.size(); ++i) { + for (unsigned int i = 0; i < this->m_layers.size(); i++) { OutputOpenExrLayer &layer = this->m_layers[i]; if (!layer.imageInput) { continue; /* skip unconnected sockets */ @@ -369,7 +369,7 @@ void OutputOpenExrMultiLayerOperation::deinitExecution() } IMB_exr_close(exrhandle); - for (unsigned int i = 0; i < this->m_layers.size(); ++i) { + for (unsigned int i = 0; i < this->m_layers.size(); i++) { if (this->m_layers[i].outputBuffer) { MEM_freeN(this->m_layers[i].outputBuffer); this->m_layers[i].outputBuffer = NULL; diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp index 313be2f5ecf..676601d82da 100644 --- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp @@ -60,7 +60,7 @@ static bool check_corners(float corners[4][2]) static void readCornersFromSockets(rcti *rect, SocketReader *readers[4], float corners[4][2]) { - for (int i = 0; i < 4; ++i) { + for (int i = 0; i < 4; i++) { float result[4] = {0.0f, 0.0f, 0.0f, 0.0f}; readers[i]->readSampled(result, rect->xmin, rect->ymin, COM_PS_NEAREST); corners[i][0] = result[0]; @@ -208,7 +208,7 @@ void *PlaneCornerPinWarpImageOperation::initializeTileData(rcti *rect) bool PlaneCornerPinWarpImageOperation::determineDependingAreaOfInterest( rcti *input, ReadBufferOperation *readOperation, rcti *output) { - for (int i = 0; i < 4; ++i) { + for (int i = 0; i < 4; i++) { if (getInputOperation(i + 1)->determineDependingAreaOfInterest(input, readOperation, output)) { return true; } diff --git a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp index ef7dfbd4116..78a83391ed1 100644 --- a/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneDistortCommonOperation.cpp @@ -105,7 +105,7 @@ void PlaneDistortWarpImageOperation::executePixelSampled(float output[4], } else { zero_v4(output); - for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) { + for (int sample = 0; sample < this->m_motion_blur_samples; sample++) { float color[4]; warpCoord(x, y, this->m_samples[sample].perspectiveMatrix, uv, deriv); m_pixelReader->readFiltered(color, uv[0], uv[1], deriv[0], deriv[1]); @@ -121,7 +121,7 @@ bool PlaneDistortWarpImageOperation::determineDependingAreaOfInterest( float min[2], max[2]; INIT_MINMAX2(min, max); - for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) { + for (int sample = 0; sample < this->m_motion_blur_samples; sample++) { float UVs[4][2]; float deriv[2][2]; MotionSample *sample_data = &this->m_samples[sample]; @@ -208,9 +208,9 @@ void PlaneDistortMaskOperation::executePixelSampled(float output[4], output[0] = (float)inside_counter / this->m_osa; } else { - for (int motion_sample = 0; motion_sample < this->m_motion_blur_samples; ++motion_sample) { + for (int motion_sample = 0; motion_sample < this->m_motion_blur_samples; motion_sample++) { MotionSample *sample_data = &this->m_samples[motion_sample]; - for (int osa_sample = 0; osa_sample < this->m_osa; ++osa_sample) { + for (int osa_sample = 0; osa_sample < this->m_osa; osa_sample++) { point[0] = x + this->m_jitter[osa_sample][0]; point[1] = y + this->m_jitter[osa_sample][1]; if (isect_point_tri_v2(point, diff --git a/source/blender/compositor/operations/COM_PlaneTrackOperation.cpp b/source/blender/compositor/operations/COM_PlaneTrackOperation.cpp index c2fe41eea1d..cbf5a25fa31 100644 --- a/source/blender/compositor/operations/COM_PlaneTrackOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneTrackOperation.cpp @@ -93,7 +93,7 @@ void PlaneTrackMaskOperation::initExecution() const float frame = (float)this->m_framenumber - this->m_motion_blur_shutter; const float frame_step = (this->m_motion_blur_shutter * 2.0f) / this->m_motion_blur_samples; float frame_iter = frame; - for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) { + for (int sample = 0; sample < this->m_motion_blur_samples; sample++) { readCornersFromTrack(corners, frame_iter); calculateCorners(corners, true, sample); frame_iter += frame_step; @@ -116,7 +116,7 @@ void PlaneTrackWarpImageOperation::initExecution() const float frame = (float)this->m_framenumber - this->m_motion_blur_shutter; const float frame_step = (this->m_motion_blur_shutter * 2.0f) / this->m_motion_blur_samples; float frame_iter = frame; - for (int sample = 0; sample < this->m_motion_blur_samples; ++sample) { + for (int sample = 0; sample < this->m_motion_blur_samples; sample++) { readCornersFromTrack(corners, frame_iter); calculateCorners(corners, true, sample); frame_iter += frame_step; diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp index 738f7ed31ba..94224ac77a6 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp @@ -148,7 +148,7 @@ void ScreenLensDistortionOperation::accumulate(MemoryBuffer *buffer, float k4 = m_k4[a]; float dk4 = m_dk4[a]; - for (float z = 0; z < ds; ++z) { + for (float z = 0; z < ds; z++) { float tz = (z + (m_jitter ? BLI_rng_get_float(m_rng) : 0.5f)) * sd; float t = 1.0f - (k4 + tz * dk4) * r_sq; |