diff options
author | 2021-02-13 16:18:40 +0100 | |
---|---|---|
committer | 2021-02-13 16:18:40 +0100 | |
commit | 4de164dcc7bc3524c8b20f9c734bc1a4ae4c83bc (patch) | |
tree | 849fcf5f863ff9067d22b38104137b58bfa54720 /wgpu/src/image/raster.rs | |
parent | 9f5c2eb0c43daa61b19769322cf3692b29e0ac0f (diff) | |
parent | e1b1227f0c2214b0ade4004b7985a137e7d56890 (diff) | |
download | iced-4de164dcc7bc3524c8b20f9c734bc1a4ae4c83bc.tar.gz iced-4de164dcc7bc3524c8b20f9c734bc1a4ae4c83bc.tar.bz2 iced-4de164dcc7bc3524c8b20f9c734bc1a4ae4c83bc.zip |
Merge pull request #392 from unrelentingtech/image-debloat
Add image format options to reduce code bloat
Diffstat (limited to 'wgpu/src/image/raster.rs')
-rw-r--r-- | wgpu/src/image/raster.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs index 25607dab..d5c62545 100644 --- a/wgpu/src/image/raster.rs +++ b/wgpu/src/image/raster.rs @@ -4,7 +4,7 @@ use std::collections::{HashMap, HashSet}; #[derive(Debug)] pub enum Memory { - Host(::image::ImageBuffer<::image::Bgra<u8>, Vec<u8>>), + Host(::image_rs::ImageBuffer<::image_rs::Bgra<u8>, Vec<u8>>), Device(atlas::Entry), NotFound, Invalid, @@ -42,14 +42,14 @@ impl Cache { let memory = match handle.data() { image::Data::Path(path) => { - if let Ok(image) = ::image::open(path) { + if let Ok(image) = ::image_rs::open(path) { Memory::Host(image.to_bgra8()) } else { Memory::NotFound } } image::Data::Bytes(bytes) => { - if let Ok(image) = ::image::load_from_memory(&bytes) { + if let Ok(image) = ::image_rs::load_from_memory(&bytes) { Memory::Host(image.to_bgra8()) } else { Memory::Invalid @@ -60,7 +60,7 @@ impl Cache { height, pixels, } => { - if let Some(image) = ::image::ImageBuffer::from_vec( + if let Some(image) = ::image_rs::ImageBuffer::from_vec( *width, *height, pixels.to_vec(), |