From 9f22750422940681dba14839a762c6f8bf02dba6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 4 Jul 2012 20:47:12 +0000 Subject: style cleanup --- source/blender/compositor/nodes/COM_LensDistortionNode.cpp | 3 +-- .../operations/COM_ProjectorLensDistortionOperation.cpp | 4 ++-- .../operations/COM_ScreenLensDistortionOperation.cpp | 4 ++-- .../operations/COM_VariableSizeBokehBlurOperation.cpp | 10 +++++----- .../blender/compositor/operations/COM_WriteBufferOperation.cpp | 8 ++++---- 5 files changed, 14 insertions(+), 15 deletions(-) (limited to 'source/blender/compositor') diff --git a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp index 4870e252b74..3913b4ac2b6 100644 --- a/source/blender/compositor/nodes/COM_LensDistortionNode.cpp +++ b/source/blender/compositor/nodes/COM_LensDistortionNode.cpp @@ -50,8 +50,7 @@ void LensDistortionNode::convertToOperations(ExecutionSystem *graph, CompositorC ScreenLensDistortionOperation *operation = new ScreenLensDistortionOperation(); operation->setbNode(editorNode); operation->setData(data); - if (!(this->getInputSocket(1)->isConnected() || this->getInputSocket(2)->isConnected())) - { + if (!(this->getInputSocket(1)->isConnected() || this->getInputSocket(2)->isConnected())) { // no nodes connected to the distortion and dispersion. We can precalculate some values float distortion = ((const bNodeSocketValueFloat *)this->getInputSocket(1)->getbNodeSocket()->default_value)->value; float dispersion = ((const bNodeSocketValueFloat *)this->getInputSocket(2)->getbNodeSocket()->default_value)->value; diff --git a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp index 74145c52a5d..12674153bc8 100644 --- a/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp @@ -79,10 +79,10 @@ bool ProjectorLensDistortionOperation::determineDependingAreaOfInterest(rcti *in newInput.xmin = input->xmin - this->m_kr2 - 2; newInput.xmax = input->xmax + this->m_kr2 + 2; } else { - newInput.xmin = input->xmin-7; //(0.25f*20*1)+2 == worse case dispersion + newInput.xmin = input->xmin - 7; //(0.25f*20*1)+2 == worse case dispersion newInput.ymin = input->ymin; newInput.ymax = input->ymax; - newInput.xmax = input->xmax+7; //(0.25f*20*1)+2 == worse case dispersion + newInput.xmax = input->xmax + 7; //(0.25f*20*1)+2 == worse case dispersion } return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output); } diff --git a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp index ea8483734d3..c1ad2efc384 100644 --- a/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp +++ b/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp @@ -256,7 +256,7 @@ bool ScreenLensDistortionOperation::determineDependingAreaOfInterest(rcti *input UPDATE_INPUT; determineUV(coords, input->xmax, input->ymin); UPDATE_INPUT; - margin = (ABS(this->m_distortion)+this->m_dispersion)*MARGIN; + margin = (ABS(this->m_distortion) + this->m_dispersion) * MARGIN; } else { @@ -283,7 +283,7 @@ bool ScreenLensDistortionOperation::determineDependingAreaOfInterest(rcti *input UPDATE_INPUT; determineUV(coords, input->xmax, input->ymin, 1.0f, 1.0f); UPDATE_INPUT; - margin=MARGIN; + margin = MARGIN; } #undef UPDATE_INPUT diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp index 46101f6355d..1368476e9b4 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp @@ -74,7 +74,7 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me #ifdef COM_DEFOCUS_SEARCH float search[4]; - this->inputSearchProgram->read(search, x/InverseSearchRadiusOperation::DIVIDER, y/InverseSearchRadiusOperation::DIVIDER, inputBuffers, NULL); + this->inputSearchProgram->read(search, x/InverseSearchRadiusOperation::DIVIDER, y / InverseSearchRadiusOperation::DIVIDER, inputBuffers, NULL); int minx = search[0]; int miny = search[1]; int maxx = search[2]; @@ -168,10 +168,10 @@ bool VariableSizeBokehBlurOperation::determineDependingAreaOfInterest(rcti *inpu } #ifdef COM_DEFOCUS_SEARCH rcti searchInput; - searchInput.xmax = (input->xmax/InverseSearchRadiusOperation::DIVIDER)+1; - searchInput.xmin = (input->xmin/InverseSearchRadiusOperation::DIVIDER)-1; - searchInput.ymax = (input->ymax/InverseSearchRadiusOperation::DIVIDER)+1; - searchInput.ymin = (input->ymin/InverseSearchRadiusOperation::DIVIDER)-1; + searchInput.xmax = (input->xmax / InverseSearchRadiusOperation::DIVIDER) + 1; + searchInput.xmin = (input->xmin / InverseSearchRadiusOperation::DIVIDER) - 1; + searchInput.ymax = (input->ymax / InverseSearchRadiusOperation::DIVIDER) + 1; + searchInput.ymin = (input->ymin / InverseSearchRadiusOperation::DIVIDER) - 1; operation = getInputOperation(4); if (operation->determineDependingAreaOfInterest(&searchInput, readOperation, output) ) { return true; diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp index b8c7478b2f7..191b21b9217 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp @@ -64,7 +64,7 @@ void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me float *buffer = memoryBuffer->getBuffer(); if (this->m_input->isComplex()) { bNode* bnode = this->m_input->getbNode(); - if (bnode&& bnode->original) bnode->original->highlight++; + if (bnode && bnode->original) bnode->original->highlight++; void *data = this->m_input->initializeTileData(rect, memoryBuffers); int x1 = rect->xmin; @@ -90,7 +90,7 @@ void WriteBufferOperation::executeRegion(rcti *rect, unsigned int tileNumber, Me this->m_input->deinitializeTileData(rect, memoryBuffers, data); data = NULL; } - if (bnode&& bnode->original) bnode->original->highlight++; + if (bnode && bnode->original) bnode->original->highlight++; } else { int x1 = rect->xmin; @@ -144,7 +144,7 @@ void WriteBufferOperation::executeOpenCLRegion(OpenCLDevice* device, rcti *rect, clMemToCleanUp->push_back(clOutputBuffer); list *clKernelsToCleanUp = new list(); bNode* bnode = this->m_input->getbNode(); - if (bnode&& bnode->original) bnode->original->highlight++; + if (bnode && bnode->original) bnode->original->highlight++; this->m_input->executeOpenCL(device, outputBuffer, clOutputBuffer, inputMemoryBuffers, clMemToCleanUp, clKernelsToCleanUp); @@ -163,7 +163,7 @@ void WriteBufferOperation::executeOpenCLRegion(OpenCLDevice* device, rcti *rect, this->getMemoryProxy()->getBuffer()->copyContentFrom(outputBuffer); - if (bnode&& bnode->original) bnode->original->highlight++; + if (bnode && bnode->original) bnode->original->highlight++; // STEP 4 -- cgit v1.2.3