diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 11:37:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-26 11:38:55 +0300 |
commit | 3699ab1843c399b784cb6327a6c888db81e9e6e0 (patch) | |
tree | ba0ac6054ee1c291484e3965fbb70e07934d7a01 /source/blender/compositor/operations/COM_ColorSpillOperation.cpp | |
parent | df9f4c2e4f69c74291813c66580e9c763d76de3e (diff) |
Fix T45711: Color spill average algorithm broken
Thanks to @kevindietrich for finding the cause!
Diffstat (limited to 'source/blender/compositor/operations/COM_ColorSpillOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_ColorSpillOperation.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/source/blender/compositor/operations/COM_ColorSpillOperation.cpp b/source/blender/compositor/operations/COM_ColorSpillOperation.cpp index 873ec72d9e9..0769e5d0b01 100644 --- a/source/blender/compositor/operations/COM_ColorSpillOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorSpillOperation.cpp @@ -33,6 +33,7 @@ ColorSpillOperation::ColorSpillOperation() : NodeOperation() this->m_inputImageReader = NULL; this->m_inputFacReader = NULL; this->m_spillChannel = 1; // GREEN + this->m_spillMethod = 0; } void ColorSpillOperation::initExecution() @@ -91,7 +92,17 @@ void ColorSpillOperation::executePixelSampled(float output[4], float x, float y, this->m_inputFacReader->readSampled(fac, x, y, sampler); this->m_inputImageReader->readSampled(input, x, y, sampler); float rfac = min(1.0f, fac[0]); - float map = calculateMapValue(rfac, input); + float map; + + switch (this->m_spillMethod) { + case 0: /* simple */ + map = rfac * (input[this->m_spillChannel] - (this->m_settings->limscale * input[this->m_settings->limchan])); + break; + default: /* average */ + map = rfac * (input[this->m_spillChannel] - (this->m_settings->limscale * AVG(input[this->m_channel2], input[this->m_channel3]))); + break; + } + if (map > 0.0f) { output[0] = input[0] + this->m_rmut * (this->m_settings->uspillr * map); output[1] = input[1] + this->m_gmut * (this->m_settings->uspillg * map); @@ -102,13 +113,3 @@ void ColorSpillOperation::executePixelSampled(float output[4], float x, float y, copy_v4_v4(output, input); } } -float ColorSpillOperation::calculateMapValue(float fac, float *input) -{ - return fac * (input[this->m_spillChannel] - (this->m_settings->limscale * input[this->m_settings->limchan])); -} - - -float ColorSpillAverageOperation::calculateMapValue(float fac, float *input) -{ - return fac * (input[this->m_spillChannel] - (this->m_settings->limscale * AVG(input[this->m_channel2], input[this->m_channel3]))); -} |