Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Specify capacity in CanvasData::read_pixels

Browse source
This commit is contained in:
Anthony Ramine 2018-09-16 22:07:18 +02:00
parent 21e992bf40
commit 9f7b746430
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/canvas/canvas_data.rs
View file

@ -613,9 +613,8 @@ impl<'a> CanvasData<'a> {
let canvas_rect = Rect::new(Point2D::new(0i32, 0i32), canvas_size); let canvas_rect = Rect::new(Point2D::new(0i32, 0i32), canvas_size);
let src_read_rect = canvas_rect.intersection(&read_rect).unwrap_or(Rect::zero()); let src_read_rect = canvas_rect.intersection(&read_rect).unwrap_or(Rect::zero());
let mut image_data = vec![];
if src_read_rect.is_empty() || canvas_size.width <= 0 && canvas_size.height <= 0 { if src_read_rect.is_empty() || canvas_size.width <= 0 && canvas_size.height <= 0 {
return image_data; return vec![];
} }
let data_surface = self.drawtarget.snapshot().get_data_surface(); let data_surface = self.drawtarget.snapshot().get_data_surface();
@ -624,6 +623,9 @@ impl<'a> CanvasData<'a> {
//start offset of the copyable rectangle //start offset of the copyable rectangle
let mut src = (src_read_rect.origin.y * stride + src_read_rect.origin.x * 4) as usize; let mut src = (src_read_rect.origin.y * stride + src_read_rect.origin.x * 4) as usize;
let mut image_data = Vec::with_capacity(
(src_read_rect.size.width * src_read_rect.size.height * 4) as usize,
);
//copy the data to the destination vector //copy the data to the destination vector
for _ in 0..src_read_rect.size.height { for _ in 0..src_read_rect.size.height {
let row = &src_data[src .. src + (4 * src_read_rect.size.width) as usize]; let row = &src_data[src .. src + (4 * src_read_rect.size.width) as usize];