Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
- freetype-sys 0.7
- glium 0.22
  • Loading branch information
stephaneyfx committed Jul 15, 2018
1 parent 3839ea2 commit 03f949a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "glium_text"
version = "0.12.0"
version = "0.13.0"
authors = ["Pierre Krieger <[email protected]>"]
description = "Text drawing with glium and freetype"
documentation = "https://docs.rs/glium_text"
Expand All @@ -9,16 +9,16 @@ keywords = ["text", "opengl"]
license = "MIT"

[dependencies]
freetype-sys = "0.6"
freetype-sys = "0.7"
libc = "0.2"

[dependencies.glium]
version = "0.21"
version = "0.22"
default-features = false

[dev-dependencies]
cgmath = "0.16"

[dev-dependencies.glium]
version = "0.21"
version = "0.22"
features = ["glutin"]
4 changes: 2 additions & 2 deletions examples/hello_world.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use glium::glutin::{ControlFlow, Event, self, WindowEvent};

fn main() {
let mut event_loop = glutin::EventsLoop::new();
let window = glutin::WindowBuilder::new().with_dimensions(1024, 768);
let window = glutin::WindowBuilder::new().with_dimensions((1024, 768).into());
let context = glutin::ContextBuilder::new();
let display = glium::Display::new(window, context, &event_loop).unwrap();
let system = glium_text::TextSystem::new(&display);
Expand All @@ -34,7 +34,7 @@ fn main() {
target.finish().unwrap();

match event {
Event::WindowEvent {event: WindowEvent::Closed, ..} => ControlFlow::Break,
Event::WindowEvent {event: WindowEvent::CloseRequested, ..} => ControlFlow::Break,
_ => ControlFlow::Continue,
}
});
Expand Down
4 changes: 2 additions & 2 deletions examples/user_text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fn main() {
use std::fs::File;

let mut event_loop = glutin::EventsLoop::new();
let window = glutin::WindowBuilder::new().with_dimensions(1024, 768);
let window = glutin::WindowBuilder::new().with_dimensions((1024, 768).into());
let context = glutin::ContextBuilder::new();
let display = glium::Display::new(window, context, &event_loop).unwrap();
let system = glium_text::TextSystem::new(&display);
Expand Down Expand Up @@ -51,7 +51,7 @@ fn main() {
WindowEvent::ReceivedCharacter('\r') => buffer.clear(),
WindowEvent::ReceivedCharacter(c) if c as u32 == 8 => { buffer.pop(); },
WindowEvent::ReceivedCharacter(chr) => buffer.push(chr),
WindowEvent::Closed => return ControlFlow::Break,
WindowEvent::CloseRequested => return ControlFlow::Break,
_ => ()
}
}
Expand Down

0 comments on commit 03f949a

Please sign in to comment.