From 724fbadf9e917a85c298acb4bbcd227beac356fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20du=20Garreau?= <bdgdlm@outlook.com>
Date: Thu, 6 May 2021 17:49:25 +0200
Subject: [PATCH] Guess image format from file extension

---
 common/src/assets.rs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/src/assets.rs b/common/src/assets.rs
index 737810da46..8d7fed412e 100644
--- a/common/src/assets.rs
+++ b/common/src/assets.rs
@@ -98,8 +98,13 @@ impl Image {
 
 pub struct ImageLoader;
 impl Loader<Image> for ImageLoader {
-    fn load(content: Cow<[u8]>, _: &str) -> Result<Image, BoxedError> {
-        let image = image::load_from_memory(&content)?;
+    fn load(content: Cow<[u8]>, ext: &str) -> Result<Image, BoxedError> {
+        let format = match ext {
+            "png" => image::ImageFormat::Png,
+            "jpg" => image::ImageFormat::Jpeg,
+            _ => return Err("unknown image format".into()),
+        };
+        let image = image::load_from_memory_with_format(&content, format)?;
         Ok(Image(Arc::new(image)))
     }
 }