[Bf-blender-cvs] [b171fd7] master: Code cleanup: int/float and float/double conversions
Sergey Sharybin
noreply at git.blender.org
Tue Oct 14 15:36:48 CEST 2014
Commit: b171fd7483c54675096b7a16c7197bc89aa9f112
Author: Sergey Sharybin
Date: Tue Oct 14 15:36:21 2014 +0200
Branches: master
https://developer.blender.org/rBb171fd7483c54675096b7a16c7197bc89aa9f112
Code cleanup: int/float and float/double conversions
===================================================================
M source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
===================================================================
diff --git a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
index 3f5d413..962a95e 100644
--- a/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_DirectionalBlurOperation.cpp
@@ -69,8 +69,8 @@ void DirectionalBlurOperation::initExecution()
void DirectionalBlurOperation::executePixel(float output[4], int x, int y, void *data)
{
const int iterations = pow(2.0f, this->m_data->iter);
- float col[4] = {0, 0, 0, 0};
- float col2[4] = {0, 0, 0, 0};
+ float col[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+ float col2[4] = {0.0f, 0.0f, 0.0f, 0.0f};
this->m_inputProgram->readSampled(col2, x, y, COM_PS_BILINEAR);
float ltx = this->m_tx;
float lty = this->m_ty;
@@ -78,7 +78,7 @@ void DirectionalBlurOperation::executePixel(float output[4], int x, int y, void
float lrot = this->m_rot;
/* blur the image */
for (int i = 0; i < iterations; ++i) {
- const float cs = cos(lrot), ss = sin(lrot);
+ const float cs = cosf(lrot), ss = sinf(lrot);
const float isc = 1.0f / (1.0f + lsc);
const float v = isc * (y - this->m_center_y_pix) + lty;
More information about the Bf-blender-cvs
mailing list