anvil: Don't use type alias for min-ver of image

Smithay · Dec 10, 2024 · ad6c3b5 · ad6c3b5
1 parent 9f93eed
commit ad6c3b5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/anvil/Cargo.toml b/anvil/Cargo.toml
@@ -9,7 +9,7 @@ version = "0.0.1"
 [dependencies]
 bitflags = "2.2.1"
 fps_ticker = {version = "1.0.0", optional = true}
-image = {version = "0.25.1", default-features = false, optional = true}
+image = {version = "0.25.1", default-features = false, optional = true, features = ["png"]}
 rand = "0.8"
 tracing = { version = "0.1.37", features = ["max_level_trace", "release_max_level_debug"] }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }

diff --git a/anvil/src/udev.rs b/anvil/src/udev.rs
@@ -380,8 +380,9 @@ pub fn run_udev() {
 
     #[cfg(feature = "debug")]
     {
+        #[allow(deprecated)]
         let fps_image =
-            image::ImageReader::with_format(std::io::Cursor::new(FPS_NUMBERS_PNG), image::ImageFormat::Png)
+            image::io::Reader::with_format(std::io::Cursor::new(FPS_NUMBERS_PNG), image::ImageFormat::Png)
                 .decode()
                 .unwrap();
         let fps_texture = renderer

diff --git a/anvil/src/winit.rs b/anvil/src/winit.rs
@@ -126,8 +126,9 @@ pub fn run_winit() {
     output.set_preferred(mode);
 
     #[cfg(feature = "debug")]
+    #[allow(deprecated)]
     let fps_image =
-        image::ImageReader::with_format(std::io::Cursor::new(FPS_NUMBERS_PNG), image::ImageFormat::Png)
+        image::io::Reader::with_format(std::io::Cursor::new(FPS_NUMBERS_PNG), image::ImageFormat::Png)
             .decode()
             .unwrap();
     #[cfg(feature = "debug")]

diff --git a/anvil/src/x11.rs b/anvil/src/x11.rs
@@ -205,8 +205,9 @@ pub fn run_x11() {
     };
 
     #[cfg(feature = "debug")]
+    #[allow(deprecated)]
     let fps_image =
-        image::ImageReader::with_format(std::io::Cursor::new(FPS_NUMBERS_PNG), image::ImageFormat::Png)
+        image::io::Reader::with_format(std::io::Cursor::new(FPS_NUMBERS_PNG), image::ImageFormat::Png)
             .decode()
             .unwrap();
     #[cfg(feature = "debug")]