Merge pull request #40 from jiangyang/master

update to use sdl2 0.4;update demo

Cargo.toml

@@ -13,9 +13,9 @@ path = "src/sdl2_image/lib.rs"
 
 [dependencies]
 bitflags = "0.1.1"
-sdl2 = "0.2.1"
-sdl2-sys = "0.2.1"
 libc = "0.1.6"
+sdl2 = "0.4"
+sdl2-sys = "0.4"
 
 [[bin]]
 name = "demo"

src/demo/video.rs

@@ -1,30 +1,20 @@
 use std::path::Path;
-use sdl2::{self, INIT_VIDEO};
-use sdl2::video::{Window, WindowPos, OPENGL};
-use sdl2::render::{Renderer, RenderDriverIndex, ACCELERATED};
+use sdl2;
 use sdl2_image::{self, LoadTexture, INIT_PNG, INIT_JPG};
 use sdl2::event::Event;
 use sdl2::keycode::KeyCode;
 
 pub fn main(png: &Path) {
 
-    let context = sdl2::init(INIT_VIDEO).unwrap();
+    let mut context = sdl2::init().video().unwrap();
     sdl2_image::init(INIT_PNG | INIT_JPG);
+    let window = context.window("rust-sdl2 demo: Video", 800, 600)
+      .position_centered()
+      .opengl()
+      .build()
+      .unwrap();
 
-    let window = Window::new(
-          &context,
-          "rust-sdl2 demo: Video",
-          WindowPos::PosCentered,
-          WindowPos::PosCentered,
-          800,
-          600,
-          OPENGL).unwrap();
-
-    let mut renderer = Renderer::from_window(
-          window,
-          RenderDriverIndex::Auto,
-          ACCELERATED).unwrap();
-
+    let mut renderer = window.renderer().accelerated().build().unwrap();
     let mut texture = renderer.load_texture(png).unwrap();
 
     // Draws and shows the loaded texture.
@@ -32,9 +22,8 @@ pub fn main(png: &Path) {
     drawer.copy(&mut texture, None, None);
     drawer.present();
 
-    let mut event_pump = context.event_pump();
     'mainloop: loop {
-        for event in event_pump.poll_iter() {
+        for event in context.event_pump().poll_iter() {
             match event {
                 Event::Quit{..} |
                 Event::KeyDown {keycode: KeyCode::Escape, ..} =>

src/sdl2_image/lib.rs

@@ -207,7 +207,7 @@ pub trait ImageRWops {
     fn is_webp(&self) -> bool;
 }
 
-impl ImageRWops for RWops {
+impl<'a> ImageRWops for RWops<'a> {
     fn load(&self) -> SdlResult<Surface> {
         let raw = unsafe {
             ffi::IMG_Load_RW(self.raw(), 0)