From 6ce12fc0c60adbd169676ee985e8529831633a76 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Mon, 3 Oct 2022 15:53:39 -0700 Subject: Use `Cow<'static, [u8]>` in image/svg, add constructors taking &[u8]` This should resolve https://github.com/iced-rs/iced/issues/580 by providing a way to use an image included with `include_bytes!` without needing to copy it to a `Vec` to create an image handle. It would be nice if these methods could also be `const`, but that isn't possible due to the hashing being done. This is technically a breaking change since `Handle::data()` is public. But if that is used, it's most likely in used somewhere that only relies on the type derefing to `&[u8]`. --- native/src/svg.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'native/src/svg.rs') diff --git a/native/src/svg.rs b/native/src/svg.rs index f86fec5b..c89eed3f 100644 --- a/native/src/svg.rs +++ b/native/src/svg.rs @@ -1,6 +1,7 @@ //! Load and draw vector graphics. use crate::{Hasher, Rectangle}; +use std::borrow::Cow; use std::hash::{Hash, Hasher as _}; use std::path::PathBuf; use std::sync::Arc; @@ -25,7 +26,14 @@ impl Handle { /// This is useful if you already have your SVG data in-memory, maybe /// because you downloaded or generated it procedurally. pub fn from_memory(bytes: impl Into>) -> Handle { - Self::from_data(Data::Bytes(bytes.into())) + Self::from_data(Data::Bytes(Cow::Owned(bytes.into()))) + } + + /// 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))) } fn from_data(data: Data) -> Handle { @@ -64,7 +72,7 @@ pub enum Data { /// In-memory data /// /// Can contain an SVG string or a gzip compressed data. - Bytes(Vec), + Bytes(Cow<'static, [u8]>), } impl std::fmt::Debug for Data { -- cgit