rust/lib-hedgewars-engine/src/render/gear.rs
changeset 16084 36862a9ec59b
parent 15924 9502611bffc1
--- a/rust/lib-hedgewars-engine/src/render/gear.rs	Mon Feb 03 16:32:44 2025 +0100
+++ b/rust/lib-hedgewars-engine/src/render/gear.rs	Mon Feb 03 16:52:05 2025 +0100
@@ -131,7 +131,7 @@
                 .expect(&format!("Could not store sprite {:?}", sprite));
             let (texture_index, rect) = atlas.get_rect(index).unwrap();
 
-            let mut pixels = vec![255u8; size.area() * 4].into_boxed_slice();
+            let mut pixels = vec![255u8; size.area() as usize * 4].into_boxed_slice();
             load_sprite_pixels(path.as_path(), &mut pixels).expect("Unable to load Graphics");
 
             texture.update(
@@ -258,18 +258,20 @@
 
 fn load_sprite_pixels(path: &Path, buffer: &mut [u8]) -> io::Result<Size> {
     let decoder = Decoder::new(BufReader::new(File::open(path)?));
-    let (info, mut reader) = decoder.read_info()?;
+    let mut reader = decoder.read_info()?;
+    let info = reader.info();
 
-    let size = Size::new(info.width as usize, info.height as usize);
+    let size = Size::new(info.width, info.height);
     reader.next_frame(buffer)?;
     Ok(size)
 }
 
 fn load_sprite_size(path: &Path) -> io::Result<Size> {
     let decoder = Decoder::new(BufReader::new(File::open(path)?));
-    let (info, mut reader) = decoder.read_info()?;
+    let mut reader = decoder.read_info()?;
+    let info = reader.info();
 
-    let size = Size::new(info.width as usize, info.height as usize);
+    let size = Size::new(info.width, info.height);
     Ok(size)
 }