From 570cc70772d78703053956ce57b20c6c4ed74c95 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 15 Jun 2012 18:42:03 +0000 Subject: style cleanup: compositor operations --- source/blender/compositor/operations/COM_ColorSpillOperation.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/compositor/operations/COM_ColorSpillOperation.cpp') diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.cpp b/source/blender/compositor/operations/COM_ColorSpillOperation.cpp index 9b57d64eb40..1a534d778c0 100644 --- a/source/blender/compositor/operations/COM_ColorSpillOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorSpillOperation.cpp @@ -22,9 +22,9 @@ #include "COM_ColorSpillOperation.h" #include "BLI_math.h" -#define avg(a,b) ((a+b)/2) +#define AVG(a, b) ((a + b) / 2) -ColorSpillOperation::ColorSpillOperation(): NodeOperation() +ColorSpillOperation::ColorSpillOperation() : NodeOperation() { addInputSocket(COM_DT_COLOR); addInputSocket(COM_DT_VALUE); @@ -104,11 +104,11 @@ void ColorSpillOperation::executePixel(float *outputValue, float x, float y, Pix } float ColorSpillOperation::calculateMapValue(float fac, float *input) { - return fac * (input[this->spillChannel]-(this->settings->limscale*input[this->settings->limchan])); + return fac * (input[this->spillChannel] - (this->settings->limscale * input[this->settings->limchan])); } float ColorSpillAverageOperation::calculateMapValue(float fac, float *input) { - return fac * (input[this->spillChannel]-(this->settings->limscale*avg(input[this->channel2], input[this->channel3]))); + return fac * (input[this->spillChannel] - (this->settings->limscale * AVG(input[this->channel2], input[this->channel3]))); } -- cgit v1.2.3