liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Fix png update

This commit is contained in:
relrelb 2021-08-17 22:34:09 +03:00 committed by relrelb
parent 0e408052b1
commit da7cd453cf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/backend/render.rs
View File

@ -551,15 +551,15 @@ pub fn decode_png(data: &[u8]) -> Result<Bitmap, Error> {
let mut decoder = png::Decoder::new(data);
// EXPAND expands palettized types to RGB.
decoder.set_transformations(Transformations::EXPAND);
let (info, mut reader) = decoder.read_info()?;
let mut reader = decoder.read_info()?;
let mut data = vec![0; info.buffer_size()];
reader.next_frame(&mut data)?;
let mut data = vec![0; reader.output_buffer_size()];
let info = reader.next_frame(&mut data)?;
Ok(Bitmap {
width: info.width,
height: info.height,
data: if info.color_type == ColorType::RGBA {
data: if info.color_type == ColorType::Rgba {
BitmapFormat::Rgba(data)
} else {
// EXPAND expands other types to RGB.

4
render/canvas/src/lib.rs
View File

@ -234,11 +234,11 @@ impl WebCanvasRenderBackend {
let data = match bitmap.data {
BitmapFormat::Rgba(mut data) => {
ruffle_core::backend::render::unmultiply_alpha_rgba(&mut data[..]);
encoder.set_color(png::ColorType::RGBA);
encoder.set_color(png::ColorType::Rgba);
data
}
BitmapFormat::Rgb(data) => {
encoder.set_color(png::ColorType::RGB);
encoder.set_color(png::ColorType::Rgb);
data
}
};