Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ arrayvec = { version = "0.7", default-features = false }
bytemuck = { version = "1.12", features = ["aarch64_simd"] }
cfg-if = "1"
log = "0.4"
png = { version = "0.17", optional = true }
png = { version = "0.18", optional = true }
tiny-skia-path = { version = "0.11.4", path = "path", default-features = false }

[features]
Expand Down
7 changes: 5 additions & 2 deletions src/mask.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,13 @@ impl Mask {
std::io::Error::new(std::io::ErrorKind::Other, msg).into()
}

let mut decoder = png::Decoder::new(data);
let mut decoder = png::Decoder::new(std::io::BufReader::new(std::io::Cursor::new(data)));
decoder.set_transformations(png::Transformations::normalize_to_color8());
let mut reader = decoder.read_info()?;
let mut img_data = vec![0; reader.output_buffer_size()];
let output_buffer_size = reader
.output_buffer_size()
.ok_or(png::DecodingError::LimitsExceeded)?;
let mut img_data = vec![0; output_buffer_size];
let info = reader.next_frame(&mut img_data)?;

if info.bit_depth != png::BitDepth::Eight {
Expand Down
7 changes: 5 additions & 2 deletions src/pixmap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,13 @@ impl Pixmap {
std::io::Error::new(std::io::ErrorKind::Other, msg).into()
}

let mut decoder = png::Decoder::new(data);
let mut decoder = png::Decoder::new(std::io::BufReader::new(std::io::Cursor::new(data)));
decoder.set_transformations(png::Transformations::normalize_to_color8());
let mut reader = decoder.read_info()?;
let mut img_data = vec![0; reader.output_buffer_size()];
let output_buffer_size = reader
.output_buffer_size()
.ok_or(png::DecodingError::LimitsExceeded)?;
let mut img_data = vec![0; output_buffer_size];
let info = reader.next_frame(&mut img_data)?;

if info.bit_depth != png::BitDepth::Eight {
Expand Down