summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón <hector0193@gmail.com>2023-09-07 03:30:35 +0200
committerLibravatar GitHub <noreply@github.com>2023-09-07 03:30:35 +0200
commitd1822ad8116604590b7e9be51fc0aea4292a0760 (patch)
tree547c601fbcba58409225bc853c27286a2747a99d /src
parentc8fed143eb14d790da0592c5e24c741f6fda101e (diff)
parentd315e27451d46a815d18ed6037547d178413ede7 (diff)
downloadiced-d1822ad8116604590b7e9be51fc0aea4292a0760.tar.gz
iced-d1822ad8116604590b7e9be51fc0aea4292a0760.tar.bz2
iced-d1822ad8116604590b7e9be51fc0aea4292a0760.zip
Merge pull request #2069 from iced-rs/use-workspace-dependencies
Use workspace dependencies and package inheritance
Diffstat (limited to 'src')
-rw-r--r--src/window/icon.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/window/icon.rs b/src/window/icon.rs
index 0fe010ca..0cb206b3 100644
--- a/src/window/icon.rs
+++ b/src/window/icon.rs
@@ -13,7 +13,7 @@ use std::path::Path;
/// This will return an error in case the file is missing at run-time. You may prefer [`Self::from_file_data`] instead.
#[cfg(feature = "image")]
pub fn from_file<P: AsRef<Path>>(icon_path: P) -> Result<Icon, Error> {
- let icon = image_rs::io::Reader::open(icon_path)?.decode()?.to_rgba8();
+ let icon = image::io::Reader::open(icon_path)?.decode()?.to_rgba8();
Ok(icon::from_rgba(icon.to_vec(), icon.width(), icon.height())?)
}
@@ -25,9 +25,10 @@ pub fn from_file<P: AsRef<Path>>(icon_path: P) -> Result<Icon, Error> {
#[cfg(feature = "image")]
pub fn from_file_data(
data: &[u8],
- explicit_format: Option<image_rs::ImageFormat>,
+ explicit_format: Option<image::ImageFormat>,
) -> Result<Icon, Error> {
- let mut icon = image_rs::io::Reader::new(std::io::Cursor::new(data));
+ let mut icon = image::io::Reader::new(std::io::Cursor::new(data));
+
let icon_with_format = match explicit_format {
Some(format) => {
icon.set_format(format);
@@ -59,5 +60,5 @@ pub enum Error {
/// The `image` crate reported an error.
#[cfg(feature = "image")]
#[error("Unable to create icon from a file: {0}")]
- ImageError(#[from] image_rs::error::ImageError),
+ ImageError(#[from] image::error::ImageError),
}