Merge pull request #1453 from ids1024/cow

Use `Cow<'static, [u8]>` in image/svg, add constructors taking &[u8]`
This commit is contained in:
Héctor Ramón 2022-11-05 02:19:13 +01:00 committed by GitHub
commit 7b12991728
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions

View file

@ -1,6 +1,7 @@
//! Load and draw raster graphics. //! Load and draw raster graphics.
use crate::{Hasher, Rectangle}; use crate::{Hasher, Rectangle};
use std::borrow::Cow;
use std::hash::{Hash, Hasher as _}; use std::hash::{Hash, Hasher as _};
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::Arc; use std::sync::Arc;
@ -25,11 +26,15 @@ impl Handle {
/// pixels. /// pixels.
/// ///
/// This is useful if you have already decoded your image. /// This is useful if you have already decoded your image.
pub fn from_pixels(width: u32, height: u32, pixels: Vec<u8>) -> Handle { pub fn from_pixels(
width: u32,
height: u32,
pixels: impl Into<Cow<'static, [u8]>>,
) -> Handle {
Self::from_data(Data::Pixels { Self::from_data(Data::Pixels {
width, width,
height, height,
pixels, pixels: pixels.into(),
}) })
} }
@ -39,8 +44,8 @@ impl Handle {
/// ///
/// This is useful if you already have your image loaded in-memory, maybe /// This is useful if you already have your image loaded in-memory, maybe
/// because you downloaded or generated it procedurally. /// because you downloaded or generated it procedurally.
pub fn from_memory(bytes: Vec<u8>) -> Handle { pub fn from_memory(bytes: impl Into<Cow<'static, [u8]>>) -> Handle {
Self::from_data(Data::Bytes(bytes)) Self::from_data(Data::Bytes(bytes.into()))
} }
fn from_data(data: Data) -> Handle { fn from_data(data: Data) -> Handle {
@ -86,7 +91,7 @@ pub enum Data {
Path(PathBuf), Path(PathBuf),
/// In-memory data /// In-memory data
Bytes(Vec<u8>), Bytes(Cow<'static, [u8]>),
/// Decoded image pixels in BGRA format. /// Decoded image pixels in BGRA format.
Pixels { Pixels {
@ -95,7 +100,7 @@ pub enum Data {
/// The height of the image. /// The height of the image.
height: u32, height: u32,
/// The pixels. /// The pixels.
pixels: Vec<u8>, pixels: Cow<'static, [u8]>,
}, },
} }

View file

@ -1,6 +1,7 @@
//! Load and draw vector graphics. //! Load and draw vector graphics.
use crate::{Hasher, Rectangle}; use crate::{Hasher, Rectangle};
use std::borrow::Cow;
use std::hash::{Hash, Hasher as _}; use std::hash::{Hash, Hasher as _};
use std::path::PathBuf; use std::path::PathBuf;
use std::sync::Arc; use std::sync::Arc;
@ -24,7 +25,7 @@ impl Handle {
/// ///
/// This is useful if you already have your SVG data in-memory, maybe /// This is useful if you already have your SVG data in-memory, maybe
/// because you downloaded or generated it procedurally. /// because you downloaded or generated it procedurally.
pub fn from_memory(bytes: impl Into<Vec<u8>>) -> Handle { pub fn from_memory(bytes: impl Into<Cow<'static, [u8]>>) -> Handle {
Self::from_data(Data::Bytes(bytes.into())) Self::from_data(Data::Bytes(bytes.into()))
} }
@ -64,7 +65,7 @@ pub enum Data {
/// In-memory data /// In-memory data
/// ///
/// Can contain an SVG string or a gzip compressed data. /// Can contain an SVG string or a gzip compressed data.
Bytes(Vec<u8>), Bytes(Cow<'static, [u8]>),
} }
impl std::fmt::Debug for Data { impl std::fmt::Debug for Data {