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 --- .../compositor/operations/COM_MixHueOperation.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/compositor/operations/COM_MixHueOperation.cpp') diff --git a/source/blender/compositor/operations/COM_MixHueOperation.cpp b/source/blender/compositor/operations/COM_MixHueOperation.cpp index d97109c244c..05d02805ebc 100644 --- a/source/blender/compositor/operations/COM_MixHueOperation.cpp +++ b/source/blender/compositor/operations/COM_MixHueOperation.cpp @@ -26,7 +26,7 @@ extern "C" { #include "BLI_math.h" } -MixHueOperation::MixHueOperation(): MixBaseOperation() +MixHueOperation::MixHueOperation() : MixBaseOperation() { /* pass */ } @@ -46,16 +46,16 @@ void MixHueOperation::executePixel(float *outputValue, float x, float y, PixelSa } float valuem = 1.0f - value; - float colH,colS,colV; + float colH, colS, colV; rgb_to_hsv(inputColor2[0], inputColor2[1], inputColor2[2], &colH, &colS, &colV); - if (colS!=0.0f) { - float rH,rS,rV; - float tmpr,tmpg,tmpb; + if (colS != 0.0f) { + float rH, rS, rV; + float tmpr, tmpg, tmpb; rgb_to_hsv(inputColor1[0], inputColor1[1], inputColor1[2], &rH, &rS, &rV); - hsv_to_rgb(colH , rS, rV, &tmpr, &tmpg, &tmpb); - outputValue[0] = valuem*(inputColor1[0]) + value*tmpr; - outputValue[1] = valuem*(inputColor1[1]) + value*tmpg; - outputValue[2] = valuem*(inputColor1[2]) + value*tmpb; + hsv_to_rgb(colH, rS, rV, &tmpr, &tmpg, &tmpb); + outputValue[0] = valuem * (inputColor1[0]) + value * tmpr; + outputValue[1] = valuem * (inputColor1[1]) + value * tmpg; + outputValue[2] = valuem * (inputColor1[2]) + value * tmpb; } outputValue[3] = inputColor1[3]; } -- cgit v1.2.3