diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-15 03:37:19 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-15 03:37:19 +0400 |
commit | 43bb431548436b6b1699f795acd107de0f6b86a8 (patch) | |
tree | f1ab16c6380b85d50fdf6bb978e5f117b0d5d118 /source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp | |
parent | b8905ba0a6731d2aba6f3487be58b338f35df5f7 (diff) | |
parent | b174610a8461348a82454f9050bc0dee7d9ce926 (diff) |
Merge from trunk r49601-r49907
Diffstat (limited to 'source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp index 33e6db22ef4..dfbbef8c56e 100644 --- a/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp @@ -49,7 +49,7 @@ void ColorBalanceASCCDLOperation::initExecution() this->m_inputColorOperation = this->getInputSocketReader(1); } -void ColorBalanceASCCDLOperation::executePixel(float *outputColor, float x, float y, PixelSampler sampler) +void ColorBalanceASCCDLOperation::executePixel(float output[4], float x, float y, PixelSampler sampler) { float inputColor[4]; float value[4]; @@ -61,10 +61,10 @@ void ColorBalanceASCCDLOperation::executePixel(float *outputColor, float x, floa fac = min(1.0f, fac); const float mfac = 1.0f - fac; - outputColor[0] = mfac * inputColor[0] + fac *colorbalance_cdl(inputColor[0], this->m_lift[0], this->m_gamma[0], this->m_gain[0]); - outputColor[1] = mfac * inputColor[1] + fac *colorbalance_cdl(inputColor[1], this->m_lift[1], this->m_gamma[1], this->m_gain[1]); - outputColor[2] = mfac * inputColor[2] + fac *colorbalance_cdl(inputColor[2], this->m_lift[2], this->m_gamma[2], this->m_gain[2]); - outputColor[3] = inputColor[3]; + output[0] = mfac * inputColor[0] + fac *colorbalance_cdl(inputColor[0], this->m_lift[0], this->m_gamma[0], this->m_gain[0]); + output[1] = mfac * inputColor[1] + fac *colorbalance_cdl(inputColor[1], this->m_lift[1], this->m_gamma[1], this->m_gain[1]); + output[2] = mfac * inputColor[2] + fac *colorbalance_cdl(inputColor[2], this->m_lift[2], this->m_gamma[2], this->m_gain[2]); + output[3] = inputColor[3]; } |