diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-08-23 20:17:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-23 20:17:47 +0400 |
| commit | 65dbeabdc6a89506df40222c52a1fc1db8c19e39 (patch) | |
| tree | 94c6a4d1ff4b0ea0a6f54a4e4a937308a8f53af7 /source/blender/compositor/operations | |
| parent | c9d5f32270b70f8951f738e63da11b54685f8899 (diff) | |
style cleanup: indentation, also quiet double promotion warnings for despeckle node.
Diffstat (limited to 'source/blender/compositor/operations')
| -rw-r--r-- | source/blender/compositor/operations/COM_DespeckleOperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_DespeckleOperation.cpp b/source/blender/compositor/operations/COM_DespeckleOperation.cpp index 8a18e4e2330..599f54720f2 100644 --- a/source/blender/compositor/operations/COM_DespeckleOperation.cpp +++ b/source/blender/compositor/operations/COM_DespeckleOperation.cpp @@ -78,8 +78,8 @@ void DespeckleOperation::executePixel(float output[4], int x, int y, void *data) this->m_inputOperation->read(color_org, x2, y2, NULL); -#define TOT_DIV_ONE 1.0 -#define TOT_DIV_CNR M_SQRT1_2 +#define TOT_DIV_ONE 1.0f +#define TOT_DIV_CNR (float)M_SQRT1_2 #define WTOT (TOT_DIV_ONE * 4 + TOT_DIV_CNR * 4) @@ -110,7 +110,7 @@ void DespeckleOperation::executePixel(float output[4], int x, int y, void *data) this->m_inputOperation->read(in1, x2, y3, NULL); COLOR_ADD(TOT_DIV_ONE) this->m_inputOperation->read(in1, x3, y3, NULL); COLOR_ADD(TOT_DIV_CNR) - mul_v4_fl(color_mid, 1.0f / (4.0f + (4.0f * M_SQRT1_2))); + mul_v4_fl(color_mid, 1.0f / (4.0f + (4.0f * (float)M_SQRT1_2))); //mul_v4_fl(color_mid, 1.0f / w); if ((w != 0.0f) && |