me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove redundant from_srgba and into_srgba methods

Browse source
This commit is contained in:
Clark Moody 2020-04-01 16:15:29 -05:00
parent 408e9e566f
commit a95d494f70
1 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/src/color.rs
View file

@ -116,24 +116,6 @@ impl Color {
] ]
} }
#[cfg(feature = "palette")]
/// Convert from palette's [`Srgba`] type to a [`Color`]
///
/// [`Srgba`]: ../palette/rgb/type.Srgba.html
/// [`Color`]: struct.Color.html
pub fn from_srgba(srgba: Srgba) -> Color {
Color::new(srgba.red, srgba.green, srgba.blue, srgba.alpha)
}
#[cfg(feature = "palette")]
/// Convert from [`Color`] to palette's [`Srgba`] type
///
/// [`Color`]: struct.Color.html
/// [`Srgba`]: ../palette/rgb/type.Srgba.html
pub fn into_srgba(self) -> Srgba {
Srgba::new(self.r, self.g, self.b, self.a)
}
/// Invert the Color in-place /// Invert the Color in-place
pub fn invert(&mut self) { pub fn invert(&mut self) {
self.r = 1.0f32 - self.r; self.r = 1.0f32 - self.r;
@ -202,8 +184,8 @@ mod tests {
let c2 = Color::from_rgb(0.2, 0.5, 0.3); let c2 = Color::from_rgb(0.2, 0.5, 0.3);
// Convert to linear color for manipulation // Convert to linear color for manipulation
let l1 = c1.into_srgba().into_linear(); let l1 = Srgba::from(c1).into_linear();
let l2 = c2.into_srgba().into_linear(); let l2 = Srgba::from(c2).into_linear();
// Take the lighter of each of the RGB components // Take the lighter of each of the RGB components
let lighter = l1.lighten(l2); let lighter = l1.lighten(l2);