code cleanup: reduce float/double promotion

1 files changed, 20 insertions, 20 deletions

diff --git a/source/blender/compositor/operations/COM_BokehImageOperation.cpp b/source/blender/compositor/operations/COM_BokehImageOperation.cpp
index 0279b9a5bdf..a0297b12961 100644
--- a/source/blender/compositor/operations/COM_BokehImageOperation.cpp
+++ b/source/blender/compositor/operations/COM_BokehImageOperation.cpp
@@ -34,25 +34,25 @@ void BokehImageOperation::initExecution()
 	this->centerY = getHeight() / 2;
 	this->center[0] = this->centerX;
 	this->center[1] = this->centerY;
-	this->inverseRounding = 1.0-this->data->rounding;
+	this->inverseRounding = 1.0f - this->data->rounding;
 	this->circularDistance = getWidth()/2;
-	this->flapRad = (M_PI*2)/this->data->flaps;
-	this->flapRadAdd = (this->data->angle/360.0)*M_PI*2;
-	while (this->flapRadAdd<0.0f) {
-		this->flapRadAdd+=M_PI*2;
+	this->flapRad = (float)(M_PI * 2) / this->data->flaps;
+	this->flapRadAdd = (this->data->angle / 360.0f) * (float)(M_PI * 2.0);
+	while (this->flapRadAdd < 0.0f) {
+		this->flapRadAdd += (float)(M_PI * 2.0);
 	}
-	while (this->flapRadAdd>M_PI) {
-		this->flapRadAdd-=M_PI*2;
+	while (this->flapRadAdd > (float)M_PI) {
+		this->flapRadAdd -= (float)(M_PI * 2.0);
 	}
 }
 void BokehImageOperation::detemineStartPointOfFlap(float r[2], int flapNumber, float distance)
 {
-	r[0] = sin(flapRad*flapNumber + flapRadAdd)*distance+centerX;
-	r[1] = cos(flapRad*flapNumber + flapRadAdd)*distance+centerY;
+	r[0] = sinf(flapRad * flapNumber + flapRadAdd) * distance + centerX;
+	r[1] = cosf(flapRad * flapNumber + flapRadAdd) * distance + centerY;
 }
 float BokehImageOperation::isInsideBokeh(float distance, float x, float y)
 {
-	float insideBokeh = 0.0;
+	float insideBokeh = 0.0f;
 	const float deltaX = x - centerX;
 	const float deltaY = y - centerY;
 	float closestPoint[2];
@@ -63,7 +63,7 @@ float BokehImageOperation::isInsideBokeh(float distance, float x, float y)
 	point[1] = y;
 
 	const float distanceToCenter = len_v2v2(point, center);
-	const float bearing = (atan2f(deltaX, deltaY) + (M_PI*2));
+	const float bearing = (atan2f(deltaX, deltaY) + (float)(M_PI * 2.0));
 	int flapNumber = (int)((bearing-flapRadAdd)/flapRad);
 
 	detemineStartPointOfFlap(lineP1, flapNumber, distance);
@@ -73,16 +73,16 @@ float BokehImageOperation::isInsideBokeh(float distance, float x, float y)
 	const float distanceLineToCenter = len_v2v2(center, closestPoint);
 	const float distanceRoundingToCenter = inverseRounding*distanceLineToCenter+this->data->rounding*distance;
 
-	const float catadioptricDistanceToCenter = distanceRoundingToCenter*this->data->catadioptric;
-	if (distanceRoundingToCenter>=distanceToCenter && catadioptricDistanceToCenter<=distanceToCenter) {
-		if (distanceRoundingToCenter-distanceToCenter<1.0) {
+	const float catadioptricDistanceToCenter = distanceRoundingToCenter * this->data->catadioptric;
+	if (distanceRoundingToCenter>=distanceToCenter && catadioptricDistanceToCenter <= distanceToCenter) {
+		if (distanceRoundingToCenter - distanceToCenter < 1.0f) {
 			insideBokeh = (distanceRoundingToCenter-distanceToCenter);
 		}
-		else if (this->data->catadioptric != 0.0 && distanceToCenter-catadioptricDistanceToCenter<1.0) {
-			insideBokeh = (distanceToCenter-catadioptricDistanceToCenter);
+		else if (this->data->catadioptric != 0.0f && distanceToCenter - catadioptricDistanceToCenter < 1.0f) {
+			insideBokeh = (distanceToCenter - catadioptricDistanceToCenter);
 		}
 		else {
-			insideBokeh = 1.0;
+			insideBokeh = 1.0f;
 		}
 	}
 	return insideBokeh;
@@ -90,11 +90,11 @@ float BokehImageOperation::isInsideBokeh(float distance, float x, float y)
 void BokehImageOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[])
 {
 	float shift = this->data->lensshift;
-	float shift2 = shift/2.0f;
+	float shift2 = shift / 2.0f;
 	float distance = this->circularDistance;
 	float insideBokehMax = isInsideBokeh(distance, x, y);
-	float insideBokehMed = isInsideBokeh(distance-fabs(shift2*distance), x, y);
-	float insideBokehMin = isInsideBokeh(distance-fabs(shift*distance), x, y);
+	float insideBokehMed = isInsideBokeh(distance - fabsf(shift2 * distance), x, y);
+	float insideBokehMin = isInsideBokeh(distance - fabsf(shift * distance), x, y);
 	if (shift<0) {
 		color[0] = insideBokehMax;
 		color[1] = insideBokehMed;