skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[egui_extra] Allow loading multi-mime formats using the image_loader (#5769) 

Hi ! 

I'm using egui and egui_extra to build a demo tool for a crate I'm
building. In this crate I load favicons from a lot of websites, and I
have some failures on some .ico files. After tracking this thing down, I
guess there is two issues (kinda), in the image crate,
'image/vnd.microsoft.icon' isn't recognized as the valid mime for an ico
image (I created a [PR](https://github.com/image-rs/image/pull/2434)),
and the code to detect if a given mime type is compatible with the image
crate decoders in this crate do not support multi-mime type formats.


[ImageFormat::to_mime_type](85f2412d55/src/image.rs (L216C12-L216C24))
is only returning one mime for a given format (which is fine), we
compare the result of this method to guess if the format is
valid/enabled. Retriveing the correct format using
[ImageFormat::from_mime_type](85f2412d55/src/image.rs (L166))
would allow more mime to be considered valid since multiple mime can
match the same format.

The same applies to the extension detection, which I also modified to
stay consistent

Thanks
This commit is contained in:
Nicolas Gomez 2025-03-20 11:02:24 +01:00 committed by GitHub
parent d0bd525b5d
commit 1545dec7a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/egui_extras/src/loaders/image_loader.rs
View File

@ -29,10 +29,7 @@ fn is_supported_uri(uri: &str) -> bool {
}; };
// Uses only the enabled image crate features // Uses only the enabled image crate features
ImageFormat::all() ImageFormat::from_extension(ext).is_some_and(|format| format.reading_enabled())
.filter(ImageFormat::reading_enabled)
.flat_map(ImageFormat::extensions_str)
.any(|format_ext| ext == *format_ext)
} }
fn is_supported_mime(mime: &str) -> bool { fn is_supported_mime(mime: &str) -> bool {
@ -52,10 +49,7 @@ fn is_supported_mime(mime: &str) -> bool {
} }
// Uses only the enabled image crate features // Uses only the enabled image crate features
ImageFormat::all() ImageFormat::from_mime_type(mime).is_some_and(|format| format.reading_enabled())
.filter(ImageFormat::reading_enabled)
.map(|fmt| fmt.to_mime_type())
.any(|format_mime| mime == format_mime)
} }
impl ImageLoader for ImageCrateLoader { impl ImageLoader for ImageCrateLoader {