jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix for indexed images not loading anymore

This commit is contained in:
Jaby 2025-02-16 15:37:00 +01:00
parent 7a7b710ca4
commit ac6a46134e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Tools/tim_tool/src/logic/tim.rs
View File

@ -25,10 +25,6 @@ impl TIMInfo {
let mut image_data = SharedPixelBuffer::new(frame_info.width, frame_info.height); let mut image_data = SharedPixelBuffer::new(frame_info.width, frame_info.height);
let mut dst_pixels = image_data.make_mut_slice(); let mut dst_pixels = image_data.make_mut_slice();
if bytes_per_pixel != 3 && bytes_per_pixel != 4 {
return Err(Error::from_text(format!("Image has {} bytes per pixel, but only 3 and 4 bytes per pixel are supported", bytes_per_pixel)));
}
if info.color_type == png::ColorType::Indexed { if info.color_type == png::ColorType::Indexed {
let palette = info.palette.ok_or(Error::from_str("Found indexed PNG without palette"))?; let palette = info.palette.ok_or(Error::from_str("Found indexed PNG without palette"))?;
let mut palette_colors = Vec::new(); let mut palette_colors = Vec::new();
@ -54,8 +50,12 @@ impl TIMInfo {
} }
Ok(TIMInfo{image_data, palette: Some(palette_colors)}) Ok(TIMInfo{image_data, palette: Some(palette_colors)})
} }
else { else {
if bytes_per_pixel != 3 && bytes_per_pixel != 4 {
return Err(Error::from_text(format!("Image has {} bytes per pixel, but only 3 and 4 bytes per pixel are supported", bytes_per_pixel)));
}
let mut byte_iter = buffer.iter(); let mut byte_iter = buffer.iter();
while let Some(color) = make_color(&mut byte_iter, bytes_per_pixel == 4) { while let Some(color) = make_color(&mut byte_iter, bytes_per_pixel == 4) {
match bit_depth { match bit_depth {