From 74c8641e2c32592430dd5f2ea18a17b5608ee541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Tue, 28 Oct 2025 21:31:15 +0100 Subject: [PATCH] Fix missing feature flags in `graphics::image` --- graphics/src/image.rs | 6 ++++-- wgpu/src/image/raster.rs | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/graphics/src/image.rs b/graphics/src/image.rs index c844aa9e..c9d4e45f 100644 --- a/graphics/src/image.rs +++ b/graphics/src/image.rs @@ -6,8 +6,6 @@ use crate::core::Rectangle; use crate::core::image; use crate::core::svg; -use std::sync::Arc; - /// A raster or vector image. #[allow(missing_docs)] #[derive(Debug, Clone, PartialEq)] @@ -40,6 +38,7 @@ impl Image { } /// An image buffer. +#[cfg(feature = "image")] pub type Buffer = ::image::ImageBuffer<::image::Rgba, image::Bytes>; #[cfg(feature = "image")] @@ -149,7 +148,10 @@ pub fn load(handle: &image::Handle) -> Result { } } +#[cfg(feature = "image")] fn to_error(error: ::image::ImageError) -> image::Error { + use std::sync::Arc; + match error { ::image::ImageError::IoError(error) => { image::Error::Inaccessible(Arc::new(error)) diff --git a/wgpu/src/image/raster.rs b/wgpu/src/image/raster.rs index 5320a3c1..5c4ad3be 100644 --- a/wgpu/src/image/raster.rs +++ b/wgpu/src/image/raster.rs @@ -1,13 +1,12 @@ use crate::core::Size; use crate::core::image; use crate::graphics; -use crate::graphics::image::image_rs; use crate::image::atlas::{self, Atlas}; use rustc_hash::{FxHashMap, FxHashSet}; use std::sync::{Arc, Weak}; -pub type Image = image_rs::ImageBuffer, image::Bytes>; +pub type Image = graphics::image::Buffer; /// Entry in cache corresponding to an image handle #[derive(Debug)]