summaryrefslogtreecommitdiffstats
path: root/native/src/image.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-11-05 01:53:24 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2022-11-05 01:53:24 +0100
commitbc5986c7c69efd206b900e8d923d3df3a225f6cc (patch)
tree00fd02ea216ad6b43b7b80d932fbf4181c15d481 /native/src/image.rs
parent6ce12fc0c60adbd169676ee985e8529831633a76 (diff)
downloadiced-bc5986c7c69efd206b900e8d923d3df3a225f6cc.tar.gz
iced-bc5986c7c69efd206b900e8d923d3df3a225f6cc.tar.bz2
iced-bc5986c7c69efd206b900e8d923d3df3a225f6cc.zip
Unify methods by leveraging `Into<Cow>` in `image` and `svg`
Diffstat (limited to 'native/src/image.rs')
-rw-r--r--native/src/image.rs28
1 files changed, 5 insertions, 23 deletions
diff --git a/native/src/image.rs b/native/src/image.rs
index 41e41aa4..b849ef84 100644
--- a/native/src/image.rs
+++ b/native/src/image.rs
@@ -26,26 +26,15 @@ impl Handle {
/// pixels.
///
/// This is useful if you have already decoded your image.
- pub fn from_pixels(width: u32, height: u32, pixels: Vec<u8>) -> Handle {
- Self::from_data(Data::Pixels {
- width,
- height,
- pixels: Cow::Owned(pixels),
- })
- }
-
- /// Like [`Handle::from_pixels`], but from static pixel data.
- ///
- /// Useful for images included in binary, for instance with [`include_bytes!`].
- pub fn from_static_pixels(
+ pub fn from_pixels(
width: u32,
height: u32,
- pixels: &'static [u8],
+ pixels: impl Into<Cow<'static, [u8]>>,
) -> Handle {
Self::from_data(Data::Pixels {
width,
height,
- pixels: Cow::Borrowed(pixels),
+ pixels: pixels.into(),
})
}
@@ -55,15 +44,8 @@ impl Handle {
///
/// This is useful if you already have your image loaded in-memory, maybe
/// because you downloaded or generated it procedurally.
- pub fn from_memory(bytes: Vec<u8>) -> Handle {
- Self::from_data(Data::Bytes(Cow::Owned(bytes)))
- }
-
- /// Like [`Handle::from_memory`], but from static image data.
- ///
- /// Useful for images included in binary, for instance with [`include_bytes!`].
- pub fn from_static_memory(bytes: &'static [u8]) -> Handle {
- Self::from_data(Data::Bytes(Cow::Borrowed(bytes)))
+ pub fn from_memory(bytes: impl Into<Cow<'static, [u8]>>) -> Handle {
+ Self::from_data(Data::Bytes(bytes.into()))
}
fn from_data(data: Data) -> Handle {