mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-15 00:24:19 +00:00
Code Activity

Colour: Avoid divisions by zero

Browse source
This commit is contained in:
reuk 2021-06-16 11:45:50 +01:00
parent c3ab3eb77f
commit f0c02529ef
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
modules/juce_graphics/colour/juce_Colour.cpp
View file

@ -44,7 +44,7 @@ namespace ColourHelpers
float hue = 0.0f;
if (hi > 0)
if (hi > 0 && ! approximatelyEqual (hi, lo))
{
auto invDiff = 1.0f / (float) (hi - lo);
@ -77,15 +77,21 @@ namespace ColourHelpers
auto hi = jmax (r, g, b);
auto lo = jmin (r, g, b);
if (hi > 0)
{
lightness = ((float) (hi + lo) / 2.0f) / 255.0f;
if (hi < 0)
return;
if (lightness > 0.0f)
hue = getHue (col);
lightness = ((float) (hi + lo) / 2.0f) / 255.0f;
saturation = ((float) (hi - lo) / 255.0f) / (1.0f - std::abs ((2.0f * lightness) - 1.0f));
}
if (lightness < 0.0f)
return;
hue = getHue (col);
if (1.0f < lightness)
return;
auto denominator = 1.0f - std::abs ((2.0f * lightness) - 1.0f);
saturation = ((float) (hi - lo) / 255.0f) / denominator;
}
Colour toColour (Colour original) const noexcept
@ -454,6 +460,7 @@ Colour Colour::withMultipliedLightness (float amount) const noexcept
//==============================================================================
Colour Colour::brighter (float amount) const noexcept
{
jassert (0.0f <= amount && amount <= 1.0f);
amount = 1.0f / (1.0f + amount);
return Colour ((uint8) (255 - (amount * (255 - getRed()))),
@ -464,6 +471,7 @@ Colour Colour::brighter (float amount) const noexcept
Colour Colour::darker (float amount) const noexcept
{
jassert (0.0f <= amount && amount <= 1.0f);
amount = 1.0f / (1.0f + amount);
return Colour ((uint8) (amount * getRed()),