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

StringArray fix + additional unit tests. AudioFormatManager tweak for iOS. Minor clean-ups.

Browse source
This commit is contained in:
jules 2011-09-29 14:51:42 +01:00
parent ce0b4bdb9c
commit 07b73e4071
14 changed files with 91 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@ struct HSB
return Colour (hue, saturation, brightness, original.getAlpha());
}
static PixelARGB convertHSBtoRGB (float h, float s, float v, const uint8 alpha) noexcept
static PixelARGB toRGB (float h, float s, float v, const uint8 alpha) noexcept
{
v = jlimit (0.0f, 255.0f, v * 255.0f);
const uint8 intV = (uint8) roundToInt (v);
@ -178,7 +178,7 @@ Colour Colour::fromRGBAFloat (const uint8 red, const uint8 green, const uint8 bl
}
Colour::Colour (const float hue, const float saturation, const float brightness, const float alpha) noexcept
: argb (HSB::convertHSBtoRGB (hue, saturation, brightness, ColourHelpers::floatToUInt8 (alpha)))
: argb (HSB::toRGB (hue, saturation, brightness, ColourHelpers::floatToUInt8 (alpha)))
{
}
@ -188,7 +188,7 @@ Colour Colour::fromHSV (const float hue, const float saturation, const float bri
}
Colour::Colour (const float hue, const float saturation, const float brightness, const uint8 alpha) noexcept
: argb (HSB::convertHSBtoRGB (hue, saturation, brightness, alpha))
: argb (HSB::toRGB (hue, saturation, brightness, alpha))
{
}

12
modules/juce_graphics/colour/juce_FillType.cpp
View file

@ -78,14 +78,12 @@ FillType::FillType (FillType&& other) noexcept
FillType& FillType::operator= (FillType&& other) noexcept
{
if (this != &other)
{
colour = other.colour;
gradient = other.gradient.release();
image = static_cast <Image&&> (other.image);
transform = other.transform;
}
jassert (this != &other); // hopefully the compiler should make this situation impossible!
colour = other.colour;
gradient = other.gradient.release();
image = static_cast <Image&&> (other.image);
transform = other.transform;
return *this;
}
#endif