rename axis_primary_v3() to max_axis_v3() to avoid confusion with axis_dominant_v3(). also add min_axis_v3().

2 files changed, 12 insertions, 11 deletions

diff --git a/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp b/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
index 73bc5fb2701..01f5c032730 100644
--- a/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
+++ b/source/blender/compositor/operations/COM_KeyingDespillOperation.cpp
@@ -61,7 +61,7 @@ void KeyingDespillOperation::executePixel(float output[4], float x, float y, Pix
 	this->m_pixelReader->read(pixelColor, x, y, sampler);
 	this->m_screenReader->read(screenColor, x, y, sampler);
 
-	const int screen_primary_channel = axis_primary_v3(screenColor);
+	const int screen_primary_channel = max_axis_v3(screenColor);
 	const int other_1 = (screen_primary_channel + 1) % 3;
 	const int other_2 = (screen_primary_channel + 2) % 3;
 
@@ -75,7 +75,8 @@ void KeyingDespillOperation::executePixel(float output[4], float x, float y, Pix
 
 	copy_v4_v4(output, pixelColor);
 
-	if (this->m_despillFactor * amount > 0) {
-		output[screen_primary_channel] = pixelColor[screen_primary_channel] - this->m_despillFactor * amount;
+	const float amount_despill = this->m_despillFactor * amount;
+	if (amount_despill > 0.0f) {
+		output[screen_primary_channel] = pixelColor[screen_primary_channel] - amount_despill;
 	}
 }
diff --git a/source/blender/compositor/operations/COM_KeyingOperation.cpp b/source/blender/compositor/operations/COM_KeyingOperation.cpp
index dcb15eda638..baeacb56744 100644
--- a/source/blender/compositor/operations/COM_KeyingOperation.cpp
+++ b/source/blender/compositor/operations/COM_KeyingOperation.cpp
@@ -28,15 +28,15 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 
-static float get_pixel_saturation(float pixelColor[4], float screen_balance, int primary_channel)
+static float get_pixel_saturation(const float pixelColor[4], float screen_balance, int primary_channel)
 {
-	int other_1 = (primary_channel + 1) % 3;
-	int other_2 = (primary_channel + 2) % 3;
+	const int other_1 = (primary_channel + 1) % 3;
+	const int other_2 = (primary_channel + 2) % 3;
 
-	int min_channel = min(other_1, other_2);
-	int max_channel = max(other_1, other_2);
+	const int min_channel = min(other_1, other_2);
+	const int max_channel = max(other_1, other_2);
 
-	float val = screen_balance * pixelColor[min_channel] + (1.0f - screen_balance) * pixelColor[max_channel];
+	const float val = screen_balance * pixelColor[min_channel] + (1.0f - screen_balance) * pixelColor[max_channel];
 
 	return (pixelColor[primary_channel] - val) * fabsf(1.0f - val);
 }
@@ -73,13 +73,13 @@ void KeyingOperation::executePixel(float output[4], float x, float y, PixelSampl
 	this->m_pixelReader->read(pixelColor, x, y, sampler);
 	this->m_screenReader->read(screenColor, x, y, sampler);
 
-	const int primary_channel = axis_primary_v3(screenColor);
+	const int primary_channel = max_axis_v3(screenColor);
 
 	if (pixelColor[primary_channel] > 1.0f) {
 		/* overexposure doesn't happen on screen itself and usually happens
 		 * on light sources in the shot, this need to be checked separately
 		 * because saturation and falloff calculation is based on the fact
-		 * that pixels are not overexposured
+		 * that pixels are not overexposed
 		 */
 		output[0] = 1.0f;
 	}