diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-03-17 17:20:33 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-03-17 17:20:33 +0300 |
| commit | dd38dce7f0ae604396d1e96bc49500369fdedf29 (patch) | |
| tree | 2b32e776f0bb972705d2c884cb6d5ec77deaf714 /source/blender/compositor/operations/COM_CalculateMeanOperation.cpp | |
| parent | 42aac45d7f0e0f43725093e97ebb8175a95aa247 (diff) | |
Part 2 of D1082 by Troy Sobotka, remove our functions that do luma
calculations and use the OCIO one instead.
Diffstat (limited to 'source/blender/compositor/operations/COM_CalculateMeanOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_CalculateMeanOperation.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp b/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp index a2954a20e90..54b0e37c791 100644 --- a/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp +++ b/source/blender/compositor/operations/COM_CalculateMeanOperation.cpp @@ -24,7 +24,9 @@ #include "BLI_math.h" #include "BLI_utildefines.h" - +extern "C" { +#include "IMB_colormanagement.h" +} CalculateMeanOperation::CalculateMeanOperation() : NodeOperation() { @@ -96,7 +98,7 @@ void CalculateMeanOperation::calculateMean(MemoryBuffer *tile) switch (this->m_setting) { case 1: { - sum += rgb_to_bw(&buffer[offset]); + sum += IMB_colormanagement_get_luminance(&buffer[offset]); break; } case 2: |