Skip to content

Commit

Permalink
Merge pull request #1453 from ids1024/cow
Browse files Browse the repository at this point in the history
Use `Cow<'static, [u8]>` in image/svg, add constructors taking &[u8]`
  • Loading branch information
hecrj authored Nov 5, 2022
2 parents 1632826 + bc5986c commit 7b12991
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
17 changes: 11 additions & 6 deletions native/src/image.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//! Load and draw raster graphics.
use crate::{Hasher, Rectangle};

use std::borrow::Cow;
use std::hash::{Hash, Hasher as _};
use std::path::PathBuf;
use std::sync::Arc;
Expand All @@ -25,11 +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 {
pub fn from_pixels(
width: u32,
height: u32,
pixels: impl Into<Cow<'static, [u8]>>,
) -> Handle {
Self::from_data(Data::Pixels {
width,
height,
pixels,
pixels: pixels.into(),
})
}

Expand All @@ -39,8 +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(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 {
Expand Down Expand Up @@ -86,7 +91,7 @@ pub enum Data {
Path(PathBuf),

/// In-memory data
Bytes(Vec<u8>),
Bytes(Cow<'static, [u8]>),

/// Decoded image pixels in BGRA format.
Pixels {
Expand All @@ -95,7 +100,7 @@ pub enum Data {
/// The height of the image.
height: u32,
/// The pixels.
pixels: Vec<u8>,
pixels: Cow<'static, [u8]>,
},
}

Expand Down
5 changes: 3 additions & 2 deletions native/src/svg.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -24,7 +25,7 @@ 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<Vec<u8>>) -> Handle {
pub fn from_memory(bytes: impl Into<Cow<'static, [u8]>>) -> Handle {
Self::from_data(Data::Bytes(bytes.into()))
}

Expand Down Expand Up @@ -64,7 +65,7 @@ pub enum Data {
/// In-memory data
///
/// Can contain an SVG string or a gzip compressed data.
Bytes(Vec<u8>),
Bytes(Cow<'static, [u8]>),
}

impl std::fmt::Debug for Data {
Expand Down

0 comments on commit 7b12991

Please sign in to comment.