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.

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

Sync changes from mozilla-central #3735

Merged
merged 11 commits into from Aug 15, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Bug 1573039 - Part 1: Update image to 0.22. r=emilio

  • Loading branch information
Eijebong authored and moz-gfx committed Aug 13, 2019
commit 27a46983b566f654fbf29806e67158eb4cdf93c3

Some generated files are not rendered by default. Learn more.

@@ -32,13 +32,13 @@ cstr = "0.1.2"
euclid = { version = "0.20.0", features = ["serde"] }
fxhash = "0.2.1"
gleam = "0.6.17"
image_loader = { optional = true, version = "0.21", package = "image", default-features = false, features = ["png_codec"] }
image_loader = { optional = true, version = "0.22", package = "image", default-features = false, features = ["png_codec"] }
lazy_static = "1"
log = "0.4"
malloc_size_of_derive = "0.1"
num-traits = "0.2"
plane-split = "0.14.1"
png = { optional = true, version = "0.14" }
png = { optional = true, version = "0.15" }
rayon = "1"
ron = { optional = true, version = "0.1.7" }
serde = { optional = true, version = "1.0", features = ["serde_derive"] }
@@ -103,7 +103,7 @@ impl CaptureConfig {
pub fn save_png(
path: PathBuf, size: DeviceIntSize, format: ImageFormat, data: &[u8],
) {
use png::{BitDepth, ColorType, Encoder, HasParameters};
use png::{BitDepth, ColorType, Encoder};
use std::io::BufWriter;

let color_type = match format {
@@ -121,9 +121,8 @@ impl CaptureConfig {
};
let w = BufWriter::new(File::create(path).unwrap());
let mut enc = Encoder::new(w, size.width as u32, size.height as u32);
enc
.set(color_type)
.set(BitDepth::Eight);
enc.set_color(color_type);
enc.set_depth(BitDepth::Eight);
enc
.write_header()
.unwrap()
@@ -15,7 +15,7 @@ euclid = "0.20"
gleam = "0.6.2"
glutin = "0.21"
app_units = "0.7"
image = "0.21"
image = "0.22"
clap = { version = "2", features = ["yaml"] }
lazy_static = "1"
log = "0.4"
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.