Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-15 22:42:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-15 22:42:03 +0400
commit570cc70772d78703053956ce57b20c6c4ed74c95 (patch)
treeb4c5db0392384251f1b1ccefc17c959d3e742977 /source/blender/compositor/operations/COM_MixHueOperation.cpp
parent8fd2267e56d3d0b6bb860800eb8059bcbfa0b501 (diff)
style cleanup: compositor operations
Diffstat (limited to 'source/blender/compositor/operations/COM_MixHueOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_MixHueOperation.cpp18
1 files changed, 9 insertions, 9 deletions
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];
}