Merge pull request #31 from crumblingstatue/master

Update to sdl2 0.15

Author: andelf

Cargo.toml

@@ -14,7 +14,7 @@ path = "src/sdl2_ttf/lib.rs"
 
 [dependencies]
 bitflags = "0.4"
-sdl2 = "0.14.0"
+sdl2 = "0.15.0"
 sdl2-sys = "0.8.0"
 
 # [dependencies.sdl2]

examples/demo.rs

@@ -16,7 +16,7 @@ static SCREEN_HEIGHT : u32 = 600;
 // handle the annoying Rect i32
 macro_rules! rect(
     ($x:expr, $y:expr, $w:expr, $h:expr) => (
-        Rect::new_unwrap($x as i32, $y as i32, $w as u32, $h as u32)
+        Rect::new($x as i32, $y as i32, $w as u32, $h as u32)
     )
 );
 

src/sdl2_ttf/context.rs

@@ -7,11 +7,10 @@ use std::path::Path;
 use sdl2::get_error;
 use sdl2::rwops::RWops;
 use sdl2::version::Version;
-use sdl2::SdlResult;
 
 use font::{
-    internal_load_font, 
-    internal_load_font_at_index, 
+    internal_load_font,
+    internal_load_font_at_index,
     internal_load_font_from_ll,
     Font,
 };
@@ -31,21 +30,21 @@ impl Drop for Sdl2TtfContext {
 
 impl Sdl2TtfContext {
     /// Loads a font from the given file with the given size in points.
-    pub fn load_font(&self, path: &Path, point_size: u16) -> SdlResult<Font> {
+    pub fn load_font(&self, path: &Path, point_size: u16) -> Result<Font, String> {
         internal_load_font(path, point_size)
     }
-    
-    /// Loads the font at the given index of the file, with the given 
-    /// size in points. 
+
+    /// Loads the font at the given index of the file, with the given
+    /// size in points.
     pub fn load_font_at_index(&self, path: &Path, index: u32, point_size: u16)
-            -> SdlResult<Font> {
+            -> Result<Font, String> {
         internal_load_font_at_index(path, index, point_size)
     }
-    
+
     /// Loads a font from the given SDL2 rwops object with the given size in
     /// points.
-    pub fn load_font_from_rwops(&self, rwops: RWops, point_size: u16) 
-            -> SdlResult<Font> {
+    pub fn load_font_from_rwops(&self, rwops: RWops, point_size: u16)
+            -> Result<Font, String> {
         let raw = unsafe {
             ffi::TTF_OpenFontRW(rwops.raw(), 0, point_size as c_int)
         };
@@ -55,13 +54,13 @@ impl Sdl2TtfContext {
             Ok(internal_load_font_from_ll(raw, true))
         }
     }
-    
+
     /// Loads the font at the given index of the SDL2 rwops object with
     /// the given size in points.
-    pub fn load_font_at_index_from_rwops(&self, rwops: RWops, index: u32, 
-            point_size: u16) -> SdlResult<Font> {
+    pub fn load_font_at_index_from_rwops(&self, rwops: RWops, index: u32,
+            point_size: u16) -> Result<Font, String> {
         let raw = unsafe {
-            ffi::TTF_OpenFontIndexRW(rwops.raw(), 0, point_size as c_int, 
+            ffi::TTF_OpenFontIndexRW(rwops.raw(), 0, point_size as c_int,
                 index as c_long)
         };
         if (raw as *mut ()).is_null() {
@@ -117,8 +116,8 @@ impl fmt::Display for InitError {
     }
 }
 
-/// Initializes the truetype font API and returns a context manager which will 
-/// clean up the library once it goes out of scope. 
+/// Initializes the truetype font API and returns a context manager which will
+/// clean up the library once it goes out of scope.
 pub fn init() -> Result<Sdl2TtfContext, InitError> {
     unsafe {
         if ffi::TTF_WasInit() == 1 {
@@ -140,4 +139,4 @@ pub fn has_been_initialized() -> bool {
     unsafe {
         ffi::TTF_WasInit() == 1
     }
-}
+}