From 2115232a16d81d28dbdb8042ed8e9316858514c6 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Fri, 4 Sep 2020 20:59:13 +0200 Subject: Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix No functional changes --- source/blender/compositor/intern/COM_ExecutionGroup.h | 10 +++++----- source/blender/compositor/intern/COM_Node.cpp | 4 ++-- source/blender/compositor/intern/COM_NodeGraph.cpp | 10 ++++------ source/blender/compositor/intern/COM_NodeGraph.h | 2 +- source/blender/compositor/nodes/COM_ImageNode.h | 2 +- source/blender/compositor/nodes/COM_KeyingNode.h | 2 +- source/blender/compositor/operations/COM_BlurBaseOperation.h | 2 +- .../compositor/operations/COM_DoubleEdgeMaskOperation.h | 2 +- source/blender/compositor/operations/COM_ReadBufferOperation.h | 2 +- source/blender/compositor/operations/COM_WrapOperation.h | 2 +- 10 files changed, 18 insertions(+), 20 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index f0dca4e9b34..dd079415d09 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -227,12 +227,12 @@ class ExecutionGroup { * \note Check if a certain area is available, when not available this are will be checked. * \note This method is called from other ExecutionGroup's. * \param graph: - * \param rect: + * \param area: * \return [true:false] * true: package(s) are scheduled * false: scheduling is deferred (depending workpackages are scheduled) */ - bool scheduleAreaWhenPossible(ExecutionSystem *graph, rcti *rect); + bool scheduleAreaWhenPossible(ExecutionSystem *graph, rcti *area); /** * \brief add a chunk to the WorkScheduler. @@ -336,7 +336,7 @@ class ExecutionGroup { * \brief compose multiple chunks into a single chunk * \return Memorybuffer *consolidated chunk */ - MemoryBuffer *constructConsolidatedMemoryBuffer(MemoryProxy *memoryProxy, rcti *output); + MemoryBuffer *constructConsolidatedMemoryBuffer(MemoryProxy *memoryProxy, rcti *rect); /** * \brief initExecution is called just before the execution of the whole graph will be done. @@ -395,9 +395,9 @@ class ExecutionGroup { * After determining the order of the chunks the chunks will be scheduled * * \see ViewerOperation - * \param system: + * \param graph: */ - void execute(ExecutionSystem *system); + void execute(ExecutionSystem *graph); /** * \brief this method determines the MemoryProxy's where this execution group depends on. diff --git a/source/blender/compositor/intern/COM_Node.cpp b/source/blender/compositor/intern/COM_Node.cpp index 31535c5851f..30ebd7e0d4b 100644 --- a/source/blender/compositor/intern/COM_Node.cpp +++ b/source/blender/compositor/intern/COM_Node.cpp @@ -130,12 +130,12 @@ bNodeSocket *Node::getEditorInputSocket(int editorNodeInputSocketIndex) } return NULL; } -bNodeSocket *Node::getEditorOutputSocket(int editorNodeInputSocketIndex) +bNodeSocket *Node::getEditorOutputSocket(int editorNodeOutputSocketIndex) { bNodeSocket *bSock = (bNodeSocket *)this->getbNode()->outputs.first; int index = 0; while (bSock != NULL) { - if (index == editorNodeInputSocketIndex) { + if (index == editorNodeOutputSocketIndex) { return bSock; } index++; diff --git a/source/blender/compositor/intern/COM_NodeGraph.cpp b/source/blender/compositor/intern/COM_NodeGraph.cpp index cb27fa21b4d..01dd662ad11 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.cpp +++ b/source/blender/compositor/intern/COM_NodeGraph.cpp @@ -54,10 +54,9 @@ void NodeGraph::from_bNodeTree(const CompositorContext &context, bNodeTree *tree add_bNodeTree(context, 0, tree, NODE_INSTANCE_KEY_BASE); } -bNodeSocket *NodeGraph::find_b_node_input(bNode *b_group_node, const char *identifier) +bNodeSocket *NodeGraph::find_b_node_input(bNode *b_node, const char *identifier) { - for (bNodeSocket *b_sock = (bNodeSocket *)b_group_node->inputs.first; b_sock; - b_sock = b_sock->next) { + for (bNodeSocket *b_sock = (bNodeSocket *)b_node->inputs.first; b_sock; b_sock = b_sock->next) { if (STREQ(b_sock->identifier, identifier)) { return b_sock; } @@ -65,10 +64,9 @@ bNodeSocket *NodeGraph::find_b_node_input(bNode *b_group_node, const char *ident return NULL; } -bNodeSocket *NodeGraph::find_b_node_output(bNode *b_group_node, const char *identifier) +bNodeSocket *NodeGraph::find_b_node_output(bNode *b_node, const char *identifier) { - for (bNodeSocket *b_sock = (bNodeSocket *)b_group_node->outputs.first; b_sock; - b_sock = b_sock->next) { + for (bNodeSocket *b_sock = (bNodeSocket *)b_node->outputs.first; b_sock; b_sock = b_sock->next) { if (STREQ(b_sock->identifier, identifier)) { return b_sock; } diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index 7cbd45bd0b5..7252d546fce 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -105,7 +105,7 @@ class NodeGraph { NodeInputs find_inputs(const NodeRange &node_range, bNodeSocket *b_socket); NodeOutput *find_output(const NodeRange &node_range, bNodeSocket *b_socket); - void add_bNodeLink(const NodeRange &node_range, bNodeLink *bNodeLink); + void add_bNodeLink(const NodeRange &node_range, bNodeLink *b_nodelink); /* **** Special proxy node type conversions **** */ /* These nodes are not represented in the node graph themselves, diff --git a/source/blender/compositor/nodes/COM_ImageNode.h b/source/blender/compositor/nodes/COM_ImageNode.h index 9481ef4f7b1..1a811fe855d 100644 --- a/source/blender/compositor/nodes/COM_ImageNode.h +++ b/source/blender/compositor/nodes/COM_ImageNode.h @@ -37,7 +37,7 @@ class ImageNode : public Node { ImageUser *user, int framenumber, int outputsocketIndex, - int passtype, + int passindex, int view, DataType datatype) const; diff --git a/source/blender/compositor/nodes/COM_KeyingNode.h b/source/blender/compositor/nodes/COM_KeyingNode.h index cfb1f2e6ddf..6920d2af09d 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.h +++ b/source/blender/compositor/nodes/COM_KeyingNode.h @@ -42,7 +42,7 @@ class KeyingNode : public Node { int distance) const; NodeOperationOutput *setupDespill(NodeConverter &converter, NodeOperationOutput *despillInput, - NodeInput *inputSrceen, + NodeInput *inputScreen, float factor, float colorBalance) const; NodeOperationOutput *setupClip(NodeConverter &converter, diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.h b/source/blender/compositor/operations/COM_BlurBaseOperation.h index e4ac8b3c874..c452b2e4ea1 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.h +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.h @@ -33,7 +33,7 @@ class BlurBaseOperation : public NodeOperation, public QualityStepHelper { BlurBaseOperation(DataType data_type); float *make_gausstab(float rad, int size); #ifdef __SSE2__ - __m128 *convert_gausstab_sse(const float *gaustab, int size); + __m128 *convert_gausstab_sse(const float *gausstab, int size); #endif float *make_dist_fac_inverse(float rad, int size, int falloff); diff --git a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h index 0c77e83daec..befbf9453a8 100644 --- a/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h +++ b/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h @@ -34,7 +34,7 @@ class DoubleEdgeMaskOperation : public NodeOperation { public: DoubleEdgeMaskOperation(); - void doDoubleEdgeMask(float *inner, float *outer, float *res); + void doDoubleEdgeMask(float *imask, float *omask, float *res); /** * the inner loop of this program */ diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h index e59cb5449d6..2ada33906ef 100644 --- a/source/blender/compositor/operations/COM_ReadBufferOperation.h +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h @@ -30,7 +30,7 @@ class ReadBufferOperation : public NodeOperation { MemoryBuffer *m_buffer; public: - ReadBufferOperation(DataType datetype); + ReadBufferOperation(DataType datatype); void setMemoryProxy(MemoryProxy *memoryProxy) { this->m_memoryProxy = memoryProxy; diff --git a/source/blender/compositor/operations/COM_WrapOperation.h b/source/blender/compositor/operations/COM_WrapOperation.h index d1acfb10f25..a72b90e7e94 100644 --- a/source/blender/compositor/operations/COM_WrapOperation.h +++ b/source/blender/compositor/operations/COM_WrapOperation.h @@ -25,7 +25,7 @@ class WrapOperation : public ReadBufferOperation { int m_wrappingType; public: - WrapOperation(DataType datetype); + WrapOperation(DataType datatype); bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); -- cgit v1.2.3