forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix extensionless image loading panic (#13005)

Browse Source 
Remake of #12938 targeting main
This commit is contained in:
Victor 2024-04-17 17:13:33 +02:00 committed by GitHub
parent cab1c5702a
commit 11afe16079
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/bevy_render/src/texture/image_loader.rs
View File

@ -91,13 +91,14 @@ impl AssetLoader for ImageLoader {
settings: &'a ImageLoaderSettings, settings: &'a ImageLoaderSettings,
load_context: &'a mut LoadContext<'_>, load_context: &'a mut LoadContext<'_>,
) -> Result<Image, Self::Error> { ) -> Result<Image, Self::Error> {
// use the file extension for the image type
let ext = load_context.path().extension().unwrap().to_str().unwrap();
let mut bytes = Vec::new(); let mut bytes = Vec::new();
reader.read_to_end(&mut bytes).await?; reader.read_to_end(&mut bytes).await?;
let image_type = match settings.format { let image_type = match settings.format {
ImageFormatSetting::FromExtension => ImageType::Extension(ext), ImageFormatSetting::FromExtension => {
// use the file extension for the image type
let ext = load_context.path().extension().unwrap().to_str().unwrap();
ImageType::Extension(ext)
}
ImageFormatSetting::Format(format) => ImageType::Format(format), ImageFormatSetting::Format(format) => ImageType::Format(format),
}; };
Ok(Image::from_buffer( Ok(Image::from_buffer(