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

Auto merge of #23979 - Eijebong:deps-deps-deps, r=jdm

Browse source 
Update webrender, image, png and raqote

This will avoid duping png because of the raqote backend

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23979)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-08-16 21:08:58 -04:00 • committed by GitHub
commit 4094a26183
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 36 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ports/glutin/Cargo.toml
View file

@ -64,7 +64,7 @@ webxr-api = { git = "https://github.com/servo/webxr", features = ["ipc"] }
webxr = { git = "https://github.com/servo/webxr", features = ["ipc", "glwindow", "headless"] }
[target.'cfg(any(target_os = "linux", target_os = "windows"))'.dependencies]
image = "0.21"
image = "0.22"
[target.'cfg(any(target_os = "linux", target_os = "macos"))'.dependencies]
osmesa-sys = "0.1.2"

2
ports/glutin/headed_window.rs
View file

@ -675,7 +675,7 @@ fn load_icon(icon_bytes: &[u8]) -> Icon {
let (width, height) = image.dimensions();
let mut rgba = Vec::with_capacity((width * height) as usize * 4);
for (_, _, pixel) in image.pixels() {
rgba.extend_from_slice(&pixel.to_rgba().data);
rgba.extend_from_slice(&pixel.to_rgba().0);
}
(rgba, width, height)
};