Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-03-19 00:07:59 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-03-19 00:19:43 +0400
commitca6d76a915b6ddeac61b10b3046b54adc8ca5d9c (patch)
treefb492385905a58c00db86732a66af28b28f33c1d /source/blender/compositor/intern/COM_MemoryBuffer.cpp
parentdf25dbf917ffd4d13d6ce736d4eb06a4579aeb22 (diff)
Code cleanup: double/float
Diffstat (limited to 'source/blender/compositor/intern/COM_MemoryBuffer.cpp')
-rw-r--r--source/blender/compositor/intern/COM_MemoryBuffer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
index 7d8511540f7..65cd74a971f 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.cpp
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
@@ -218,8 +218,8 @@ static void ellipse_bounds(float A, float B, float C, float F, float &xmax, floa
{
float denom = 4.0f * A * C - B * B;
if (denom > 0.0f && A != 0.0f && C != 0.0f) {
- xmax = sqrt(F) / (2.0f * A) * (sqrt(F * (4.0f * A - B * B / C)) + B * B * sqrt(F / (C * denom)));
- ymax = sqrt(F) / (2.0f * C) * (sqrt(F * (4.0f * C - B * B / A)) + B * B * sqrt(F / (A * denom)));
+ xmax = sqrtf(F) / (2.0f * A) * (sqrtf(F * (4.0f * A - B * B / C)) + B * B * sqrtf(F / (C * denom)));
+ ymax = sqrtf(F) / (2.0f * C) * (sqrtf(F * (4.0f * C - B * B / A)) + B * B * sqrtf(F / (A * denom)));
}
else {
xmax = 0.0f;
@@ -272,7 +272,7 @@ void MemoryBuffer::readEWA(float result[4], const float uv[2], const float deriv
int U0 = (int)u;
int V0 = (int)v;
/* pixel offset for interpolation */
- float ufac = u - floor(u), vfac = v - floor(v);
+ float ufac = u - floorf(u), vfac = v - floorf(v);
/* filter size */
int u1 = (int)(u - ue);
int u2 = (int)(u + ue);