Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

avm1: Fix performance regression in BitmapData::pixels_rgba #4919

Merged
merged 1 commit into from
Jul 24, 2021
Merged

avm1: Fix performance regression in BitmapData::pixels_rgba #4919

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions core/src/avm1/object/bitmap_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,21 @@ impl BitmapData {
}

pub fn pixels_rgba(&self) -> Vec<u8> {
self.pixels
.iter()
.flat_map(|p| [p.red(), p.green(), p.blue(), p.alpha()])
.collect()
// TODO: This could have been implemented as follows:
//
// self.pixels
// .iter()
// .flat_map(|p| [p.red(), p.green(), p.blue(), p.alpha()])
// .collect()
//
// But currently Rust emits suboptimal code in that case. For now we use
// `Vec::with_capacity` manually to avoid unnecessary re-allocations.

let mut output = Vec::with_capacity(self.pixels.len() * 4);
for p in &self.pixels {
output.extend_from_slice(&[p.red(), p.green(), p.blue(), p.alpha()])
}
output
}

pub fn width(&self) -> u32 {
Expand Down