Update image, glutin, and jni crates.

From rust-windowing#277.
tmfink · Mar 27, 2020 · 9723fa4 · 9723fa4
1 parent b6762ce
commit 9723fa4
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 100 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/demo/android/rust/Cargo.toml b/demo/android/rust/Cargo.toml
@@ -10,7 +10,7 @@ crate_type = ["cdylib"]
 [dependencies]
 egl = "0.2"
 gl = "0.14"
-jni = "0.14"
+jni = "0.15"
 lazy_static = "1.3"
 
 [dependencies.pathfinder_demo]

diff --git a/demo/common/Cargo.toml b/demo/common/Cargo.toml
@@ -14,9 +14,9 @@ rayon = "1.0"
 usvg = "0.9"
 
 [dependencies.image]
-version = "0.22"
+version = "0.23"
 default-features = false
-features = ["png_codec"]
+features = ["png"]
 
 [dependencies.log]
 version = "0.4"

diff --git a/demo/common/src/renderer.rs b/demo/common/src/renderer.rs
@@ -288,7 +288,7 @@ impl<W> DemoApp<W> where W: Window {
             &pixels,
             drawable_size.x() as u32,
             drawable_size.y() as u32,
-            ColorType::RGBA(8),
+            ColorType::Rgba8,
         )
         .unwrap();
     }

diff --git a/demo/magicleap/Cargo.toml b/demo/magicleap/Cargo.toml
@@ -11,7 +11,7 @@ usvg = "0.9"
 egl = "0.2"
 log = "0.4"
 smallvec = "1.2"
-glutin = { version = "0.22", optional = true }
+glutin = { version = "0.23", optional = true }
 crossbeam-channel = "0.4"
 
 [lib]

diff --git a/examples/canvas_glutin_minimal/Cargo.toml b/examples/canvas_glutin_minimal/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 gl = "0.14"
-glutin = "0.22"
+glutin = "0.23"
 
 [dependencies.pathfinder_canvas]
 path = "../../canvas"

diff --git a/gpu/Cargo.toml b/gpu/Cargo.toml
@@ -9,9 +9,9 @@ bitflags = "1.0"
 half = "1.4"
 
 [dependencies.image]
-version = "0.22"
+version = "0.23"
 default-features = false
-features = ["png_codec"]
+features = ["png"]
 
 [dependencies.pathfinder_color]
 path = "../color"

diff --git a/gpu/src/lib.rs b/gpu/src/lib.rs
@@ -96,7 +96,7 @@ pub trait Device: Sized {
 
     fn create_texture_from_png(&self, resources: &dyn ResourceLoader, name: &str) -> Self::Texture {
         let data = resources.slurp(&format!("textures/{}.png", name)).unwrap();
-        let image = image::load_from_memory_with_format(&data, ImageFormat::PNG)
+        let image = image::load_from_memory_with_format(&data, ImageFormat::Png)
             .unwrap()
             .to_luma();
         let size = Vector2I::new(image.width() as i32, image.height() as i32);

diff --git a/utils/area-lut/Cargo.toml b/utils/area-lut/Cargo.toml
@@ -6,4 +6,4 @@ authors = ["Patrick Walton <[email protected]>"]
 [dependencies]
 clap = "2.30"
 euclid = "0.20"
-image = "0.22"
+image = "0.23"
diff --git a/utils/gamma-lut/Cargo.toml b/utils/gamma-lut/Cargo.toml
@@ -6,4 +6,4 @@ authors = ["Patrick Walton <[email protected]>"]
 [dependencies]
 clap = "2.27"
 log = "0.4"
-image = "0.22"
+image = "0.23"
diff --git a/utils/gamma-lut/src/main.rs b/utils/gamma-lut/src/main.rs
@@ -12,7 +12,7 @@ mod gamma_lut;
 
 use clap::{App, Arg};
 use gamma_lut::GammaLut;
-use image::{ImageBuffer, ImageLuma8, Luma};
+use image::{DynamicImage, ImageBuffer, Luma};
 
 const CONTRAST: f32 = 0.0;
 const GAMMA: f32 = 0.0;
@@ -57,5 +57,5 @@ pub fn main() {
 
     let output_path = matches.value_of("OUTPUT-PATH").unwrap();
 
-    ImageLuma8(image).save(output_path).unwrap();
+    DynamicImage::ImageLuma8(image).save(output_path).unwrap();
 }
diff --git a/webgl/Cargo.toml b/webgl/Cargo.toml
@@ -9,9 +9,9 @@ wasm-bindgen = "*"
 log = "0.4.8"
 
 [dependencies.image]
-version = "0.21"
+version = "0.23"
 default-features = false
-features = ["png_codec"]
+features = ["png"]
 
 [dependencies.pathfinder_geometry]
 path = "../geometry"