From d2996f3ed86e14ece846f595bc7d3133ce106eb3 Mon Sep 17 00:00:00 2001 From: Sebastian Dröge Date: Sun, 20 Nov 2022 17:30:11 +0200 Subject: image: Allow any kind of data that implements `AsRef<[u8]>` for the image data It's not required anywhere for it to be a plain slice or a `Vec` and this makes it possible to use data allocated in a different way without copying. --- examples/pokedex/src/main.rs | 2 +- native/src/image.rs | 71 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/examples/pokedex/src/main.rs b/examples/pokedex/src/main.rs index 748acae0..1873b674 100644 --- a/examples/pokedex/src/main.rs +++ b/examples/pokedex/src/main.rs @@ -193,7 +193,7 @@ impl Pokemon { { let bytes = reqwest::get(&url).await?.bytes().await?; - Ok(image::Handle::from_memory(bytes.as_ref().to_vec())) + Ok(image::Handle::from_memory(bytes)) } #[cfg(target_arch = "wasm32")] diff --git a/native/src/image.rs b/native/src/image.rs index 5d2843c9..6d5d3a08 100644 --- a/native/src/image.rs +++ b/native/src/image.rs @@ -1,7 +1,6 @@ //! Load and draw raster graphics. use crate::{Hasher, Rectangle, Size}; -use std::borrow::Cow; use std::hash::{Hash, Hasher as _}; use std::path::PathBuf; use std::sync::Arc; @@ -29,12 +28,12 @@ impl Handle { pub fn from_pixels( width: u32, height: u32, - pixels: impl Into>, + pixels: impl AsRef<[u8]> + Clone + Send + Sync + 'static, ) -> Handle { Self::from_data(Data::Rgba { width, height, - pixels: pixels.into(), + pixels: ImageBytes::new(pixels), }) } @@ -44,8 +43,10 @@ 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: impl Into>) -> Handle { - Self::from_data(Data::Bytes(bytes.into())) + pub fn from_memory( + bytes: impl AsRef<[u8]> + Clone + Send + Sync + 'static, + ) -> Handle { + Self::from_data(Data::Bytes(ImageBytes::new(bytes))) } fn from_data(data: Data) -> Handle { @@ -84,6 +85,62 @@ impl Hash for Handle { } } +/// Wrapper around raw image data. +/// +/// Behaves like a `&[u8]`. +pub struct ImageBytes(Box); + +trait ImageBytesTrait: AsRef<[u8]> + Send + Sync + 'static { + fn clone_boxed(&self) -> Box; +} + +impl + Clone + Send + Sync + 'static> ImageBytesTrait for T { + fn clone_boxed(&self) -> Box { + Box::new(self.clone()) + } +} + +impl ImageBytes { + /// Creates a new `ImageBytes` around `data`. + pub fn new( + data: impl AsRef<[u8]> + Clone + Send + Sync + 'static, + ) -> ImageBytes { + Self(Box::new(data)) + } +} + +impl Clone for ImageBytes { + fn clone(&self) -> Self { + ImageBytes(self.0.clone_boxed()) + } +} + +impl std::fmt::Debug for ImageBytes { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + self.0.as_ref().as_ref().fmt(f) + } +} + +impl std::hash::Hash for ImageBytes { + fn hash(&self, state: &mut H) { + self.0.as_ref().as_ref().hash(state); + } +} + +impl AsRef<[u8]> for ImageBytes { + fn as_ref(&self) -> &[u8] { + self.0.as_ref().as_ref() + } +} + +impl std::ops::Deref for ImageBytes { + type Target = [u8]; + + fn deref(&self) -> &[u8] { + self.0.as_ref().as_ref() + } +} + /// The data of a raster image. #[derive(Clone, Hash)] pub enum Data { @@ -91,7 +148,7 @@ pub enum Data { Path(PathBuf), /// In-memory data - Bytes(Cow<'static, [u8]>), + Bytes(ImageBytes), /// Decoded image pixels in RGBA format. Rgba { @@ -100,7 +157,7 @@ pub enum Data { /// The height of the image. height: u32, /// The pixels. - pixels: Cow<'static, [u8]>, + pixels: ImageBytes, }, } -- cgit From d7c83080f20d252b8dfb18a85345912af5df84ca Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 17 Feb 2023 14:37:15 +0100 Subject: Wrap image `Bytes` with `Arc` instead of `Data` --- native/src/image.rs | 53 ++++++++++++++++++----------------------------------- 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/native/src/image.rs b/native/src/image.rs index 6d5d3a08..4c5e926b 100644 --- a/native/src/image.rs +++ b/native/src/image.rs @@ -9,7 +9,7 @@ use std::sync::Arc; #[derive(Debug, Clone)] pub struct Handle { id: u64, - data: Arc, + data: Data, } impl Handle { @@ -33,7 +33,7 @@ impl Handle { Self::from_data(Data::Rgba { width, height, - pixels: ImageBytes::new(pixels), + pixels: Bytes::new(pixels), }) } @@ -46,7 +46,7 @@ impl Handle { pub fn from_memory( bytes: impl AsRef<[u8]> + Clone + Send + Sync + 'static, ) -> Handle { - Self::from_data(Data::Bytes(ImageBytes::new(bytes))) + Self::from_data(Data::Bytes(Bytes::new(bytes))) } fn from_data(data: Data) -> Handle { @@ -55,7 +55,7 @@ impl Handle { Handle { id: hasher.finish(), - data: Arc::new(data), + data, } } @@ -85,55 +85,38 @@ impl Hash for Handle { } } -/// Wrapper around raw image data. +/// A wrapper around raw image data. /// -/// Behaves like a `&[u8]`. -pub struct ImageBytes(Box); +/// It behaves like a `&[u8]`. +#[derive(Clone)] +pub struct Bytes(Arc + Send + Sync + 'static>); -trait ImageBytesTrait: AsRef<[u8]> + Send + Sync + 'static { - fn clone_boxed(&self) -> Box; -} - -impl + Clone + Send + Sync + 'static> ImageBytesTrait for T { - fn clone_boxed(&self) -> Box { - Box::new(self.clone()) - } -} - -impl ImageBytes { - /// Creates a new `ImageBytes` around `data`. - pub fn new( - data: impl AsRef<[u8]> + Clone + Send + Sync + 'static, - ) -> ImageBytes { - Self(Box::new(data)) - } -} - -impl Clone for ImageBytes { - fn clone(&self) -> Self { - ImageBytes(self.0.clone_boxed()) +impl Bytes { + /// Creates new [`Bytes`] around `data`. + pub fn new(data: impl AsRef<[u8]> + Clone + Send + Sync + 'static) -> Self { + Self(Arc::new(data)) } } -impl std::fmt::Debug for ImageBytes { +impl std::fmt::Debug for Bytes { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { self.0.as_ref().as_ref().fmt(f) } } -impl std::hash::Hash for ImageBytes { +impl std::hash::Hash for Bytes { fn hash(&self, state: &mut H) { self.0.as_ref().as_ref().hash(state); } } -impl AsRef<[u8]> for ImageBytes { +impl AsRef<[u8]> for Bytes { fn as_ref(&self) -> &[u8] { self.0.as_ref().as_ref() } } -impl std::ops::Deref for ImageBytes { +impl std::ops::Deref for Bytes { type Target = [u8]; fn deref(&self) -> &[u8] { @@ -148,7 +131,7 @@ pub enum Data { Path(PathBuf), /// In-memory data - Bytes(ImageBytes), + Bytes(Bytes), /// Decoded image pixels in RGBA format. Rgba { @@ -157,7 +140,7 @@ pub enum Data { /// The height of the image. height: u32, /// The pixels. - pixels: ImageBytes, + pixels: Bytes, }, } -- cgit