diff --git a/core/src/backend/render.rs b/core/src/backend/render.rs index 621d524a5..c4e36d030 100644 --- a/core/src/backend/render.rs +++ b/core/src/backend/render.rs @@ -551,15 +551,15 @@ pub fn decode_png(data: &[u8]) -> Result { 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. diff --git a/render/canvas/src/lib.rs b/render/canvas/src/lib.rs index 4f1c6f80e..ea7f82e4f 100644 --- a/render/canvas/src/lib.rs +++ b/render/canvas/src/lib.rs @@ -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 } };