[Bf-blender-cvs] [ca6d76a] master: Code cleanup: double/float

[Campbell Barton]

Commit: ca6d76a915b6ddeac61b10b3046b54adc8ca5d9c
Author: Campbell Barton
Date:   Wed Mar 19 07:07:59 2014 +1100
https://developer.blender.org/rBca6d76a915b6ddeac61b10b3046b54adc8ca5d9c

Code cleanup: double/float

===================================================================

M	source/blender/bmesh/operators/bmo_connect.c
M	source/blender/compositor/intern/COM_MemoryBuffer.cpp

===================================================================

diff --git a/source/blender/bmesh/operators/bmo_connect.c b/source/blender/bmesh/operators/bmo_connect.c
index 6e2bc0d..315a644 100644
--- a/source/blender/bmesh/operators/bmo_connect.c
+++ b/source/blender/bmesh/operators/bmo_connect.c
@@ -106,6 +106,7 @@ static int bm_face_connect_verts(BMesh *bm, BMFace *f)
 		}
 		else {
 			f_new = NULL;
+			l_new = NULL;
 		}
 
 		f = f_new;
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.cpp b/source/blender/compositor/intern/COM_MemoryBuffer.cpp
index 7d85115..65cd74a 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);