wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-27 02:25:28 +03:00
Code Issues Projects Releases Wiki Activity

fix decoding png images without an alpha channel

Browse Source 
refs: #3529
This commit is contained in:
Wez Furlong 2023-04-15 23:59:02 -07:00
parent 8d0b84a5ce
commit 6ec11393d5
No known key found for this signature in database
GPG Key ID: 7A7F66A31EC9B387
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.md
View File

@ -35,6 +35,8 @@ As features stabilize some brief notes about them will accumulate here.
* [`user-var-changed` event](config/lua/window-events/user-var-changed.md) * [`user-var-changed` event](config/lua/window-events/user-var-changed.md)
would incorrectly trigger for every GUI window, rather than just the GUI would incorrectly trigger for every GUI window, rather than just the GUI
window which contained the pane in which the variable was changed. #3524 window which contained the pane in which the variable was changed. #3524
* PNG images without an alpha channel could not be displayed by in the
terminal. #3529.
### 20230408-112425-69ae8472 ### 20230408-112425-69ae8472

27
wezterm-gui/src/glyphcache.rs
View File

@ -1,3 +1,4 @@
use image::{ColorType, DynamicImage};
use super::utilsprites::RenderMetrics; use super::utilsprites::RenderMetrics;
use crate::customglyph::*; use crate::customglyph::*;
use crate::renderstate::RenderContext; use crate::renderstate::RenderContext;
@ -262,11 +263,31 @@ impl FrameDecoder {
let size = decoder.total_bytes() as usize; let size = decoder.total_bytes() as usize;
let mut buf = vec![0u8; size]; let mut buf = vec![0u8; size];
let (width, height) = decoder.dimensions(); let (width, height) = decoder.dimensions();
let color_type = decoder.color_type();
let mut reader = decoder.into_reader().context("PngDecoder into_reader")?; let mut reader = decoder.into_reader().context("PngDecoder into_reader")?;
reader.read(&mut buf)?; reader.read(&mut buf)?;
let buf = image::RgbaImage::from_raw(width, height, buf).ok_or_else(|| {
anyhow::anyhow!("PNG data is inconsistent: {width}x{height}x4 is {} but is we have {size} bytes of data", width*height*4) let buf: image::RgbaImage = match color_type {
})?; ColorType::Rgb8 => DynamicImage::ImageRgb8(
image::RgbImage::from_raw(width, height, buf).ok_or_else(|| {
anyhow::anyhow!(
"PNG {color_type:?} {size} / {width}x{height} = {} \
bytes per pixel",
size / (width * height) as usize
)
})?,
)
.into_rgba8(),
ColorType::Rgba8 => image::RgbaImage::from_raw(width, height, buf)
.ok_or_else(|| {
anyhow::anyhow!(
"PNG {color_type:?} {size} / {width}x{height} = {} \
bytes per pixel",
size / (width * height) as usize
)
})?,
_ => anyhow::bail!("unimplemented PNG conversion from {color_type:?}"),
};
let delay = image::Delay::from_numer_denom_ms(u32::MAX, 1); let delay = image::Delay::from_numer_denom_ms(u32::MAX, 1);
let frame = Frame::from_parts(buf, 0, 0, delay); let frame = Frame::from_parts(buf, 0, 0, delay);
Frames::new(Box::new(std::iter::once(ImageResult::Ok(frame)))) Frames::new(Box::new(std::iter::once(ImageResult::Ok(frame))))