code cleanup: use math functions for curve compo code.

1 files changed, 8 insertions, 11 deletions

diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
index 44784837301..ff2cf96d0ad 100644
--- a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
+++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp
@@ -76,17 +76,16 @@ void ColorCurveOperation::executePixel(float output[4], float x, float y, PixelS
 	this->m_inputFacProgram->read(fac, x, y, sampler);
 	this->m_inputImageProgram->read(image, x, y, sampler);
 
-	if (*fac >= 1.0f)
+	if (*fac >= 1.0f) {
 		curvemapping_evaluate_premulRGBF(workingCopy, output, image);
+	}
 	else if (*fac <= 0.0f) {
 		copy_v3_v3(output, image);
 	}
 	else {
-		float col[4], mfac = 1.0f - *fac;
+		float col[4];
 		curvemapping_evaluate_premulRGBF(workingCopy, col, image);
-		output[0] = mfac * image[0] + *fac * col[0];
-		output[1] = mfac * image[1] + *fac * col[1];
-		output[2] = mfac * image[2] + *fac * col[2];
+		interp_v3_v3v3(output, image, col, *fac);
 	}
 	output[3] = image[3];
 	MEM_freeN(workingCopy);
@@ -131,21 +130,19 @@ void ConstantLevelColorCurveOperation::executePixel(float output[4], float x, fl
 	float fac[4];
 	float image[4];
 
-
 	this->m_inputFacProgram->read(fac, x, y, sampler);
 	this->m_inputImageProgram->read(image, x, y, sampler);
 
-	if (*fac >= 1.0f)
+	if (*fac >= 1.0f) {
 		curvemapping_evaluate_premulRGBF(this->m_curveMapping, output, image);
+	}
 	else if (*fac <= 0.0f) {
 		copy_v3_v3(output, image);
 	}
 	else {
-		float col[4], mfac = 1.0f - *fac;
+		float col[4];
 		curvemapping_evaluate_premulRGBF(this->m_curveMapping, col, image);
-		output[0] = mfac * image[0] + *fac * col[0];
-		output[1] = mfac * image[1] + *fac * col[1];
-		output[2] = mfac * image[2] + *fac * col[2];
+		interp_v3_v3v3(output, image, col, *fac);
 	}
 	output[3] = image[3];
 }