Add additional guarding to color_rgb_to_rgbww (#62220)

This commit is contained in:
J. Nick Koston 2021-12-19 09:44:53 -06:00 committed by GitHub
parent 355f2f25d8
commit d325de7510
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions

View File

@ -450,7 +450,9 @@ def color_rgb_to_rgbww(
w_r, w_g, w_b = color_temperature_to_rgb(color_temp_kelvin)
# Find the ratio of the midpoint white in the input rgb channels
white_level = min(r / w_r, g / w_g, b / w_b if w_b else 0)
white_level = min(
r / w_r if w_r else 0, g / w_g if w_g else 0, b / w_b if w_b else 0
)
# Subtract the white portion from the rgb channels.
rgb = (r - w_r * white_level, g - w_g * white_level, b - w_b * white_level)

View File

@ -401,6 +401,8 @@ def test_color_rgb_to_rgbww():
assert color_util.color_rgb_to_rgbww(64, 64, 64, 154, 370) == (0, 14, 25, 64, 64)
assert color_util.color_rgb_to_rgbww(32, 64, 16, 154, 370) == (9, 64, 0, 38, 38)
assert color_util.color_rgb_to_rgbww(0, 0, 0, 154, 370) == (0, 0, 0, 0, 0)
assert color_util.color_rgb_to_rgbww(0, 0, 0, 0, 100) == (0, 0, 0, 0, 0)
assert color_util.color_rgb_to_rgbww(255, 255, 255, 1, 5) == (103, 69, 0, 255, 255)
def test_color_temperature_to_rgbww():