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

Support RGB WebP images (#5586) 

Current WebP loader assumes all WebP images to be RGBA, which is the
case if the image is animated (that's what `image` crate assumes at
least). Static images can instead choose to exclude its alpha channel,
though it seems to be more of a default choice to include it, even if
it's not being utilized. Currently, loading a static RGB WebP image will
cause a panic when `ColorImage::from_rgba_unmultiplied` gets called in
the loader
```
thread 'main' panicked at /home/aely/.cargo/git/checkouts/egui-226fc7cdd51201c1/f87219d/crates/epaint/src/image.rs:97:9:
assertion `left == right` failed
  left: 29184
 right: 21888
```
This commit is contained in:
Aely 2025-01-07 09:35:58 +02:00 committed by GitHub
parent 52060c0c41
commit 7cb8187ac8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/egui_extras/src/loaders/webp_loader.rs
View File

@ -5,7 +5,7 @@ use egui::{
mutex::Mutex, mutex::Mutex,
ColorImage, FrameDurations, Id, ColorImage, FrameDurations, Id,
}; };
use image::{codecs::webp::WebPDecoder, AnimationDecoder as _, ImageDecoder, Rgba}; use image::{codecs::webp::WebPDecoder, AnimationDecoder as _, ColorType, ImageDecoder, Rgba};
use std::{io::Cursor, mem::size_of, sync::Arc, time::Duration}; use std::{io::Cursor, mem::size_of, sync::Arc, time::Duration};
#[derive(Clone)] #[derive(Clone)]
@ -48,6 +48,17 @@ impl WebP {
frame_durations: FrameDurations::new(durations), frame_durations: FrameDurations::new(durations),
})) }))
} else { } else {
// color_type() of WebPDecoder only returns Rgb8/Rgba8 variants of ColorType
let create_image = match decoder.color_type() {
ColorType::Rgb8 => ColorImage::from_rgb,
ColorType::Rgba8 => ColorImage::from_rgba_unmultiplied,
unreachable => {
return Err(format!(
"Unreachable WebP color type, expected Rgb8/Rgba8, got {unreachable:?}"
))
}
};
let (width, height) = decoder.dimensions(); let (width, height) = decoder.dimensions();
let size = decoder.total_bytes() as usize; let size = decoder.total_bytes() as usize;
@ -56,10 +67,10 @@ impl WebP {
.read_image(&mut data) .read_image(&mut data)
.map_err(|error| format!("WebP image read failure ({error})"))?; .map_err(|error| format!("WebP image read failure ({error})"))?;
let image = Ok(Self::Static(Arc::new(create_image(
ColorImage::from_rgba_unmultiplied([width as usize, height as usize], &data); [width as usize, height as usize],
&data,
Ok(Self::Static(Arc::new(image))) ))))
} }
} }