Merge pull request #5 from andelf/master

switch to use sdl2::version::Version

src/sdl2_image/ffi.rs

@@ -1,10 +1,11 @@
 extern crate sdl2;
 
-use libc::{c_int, c_char, uint8_t};
+use libc::{c_int, c_char};
 use sdl2::surface::ll::SDL_Surface;
 use sdl2::rwops::ll::SDL_RWops;
 use sdl2::render::ll::SDL_Texture;
 use sdl2::render::ll::SDL_Renderer;
+use sdl2::version::ll::SDL_version;
 
 pub type IMG_InitFlags = c_int;
 pub static IMG_INIT_JPG: IMG_InitFlags = 0x00000001;
@@ -12,12 +13,6 @@ pub static IMG_INIT_PNG: IMG_InitFlags = 0x00000002;
 pub static IMG_INIT_TIF: IMG_InitFlags = 0x00000004;
 pub static IMG_INIT_WEBP: IMG_InitFlags = 0x00000008;
 
-pub struct SDL_version {
-    pub major: uint8_t,
-    pub minor: uint8_t,
-    pub patch: uint8_t,
-}
-
 extern "C" {
 
 // This function gets the version of the dynamically linked SDL_image library.

src/sdl2_image/lib.rs

@@ -10,11 +10,11 @@ extern crate libc;
 
 use libc::{c_int, c_char};
 use std::ptr;
-use std::fmt;
 use sdl2::surface::Surface;
 use sdl2::render::Texture;
 use sdl2::render::Renderer;
 use sdl2::rwops::RWops;
+use sdl2::version::Version;
 use sdl2::get_error;
 
 // Setup linking for all targets.
@@ -53,30 +53,6 @@ pub enum InitFlag {
     InitWebp = ffi::IMG_INIT_WEBP as int,
 }
 
-/// The version of the libSDL.so that you are linked to
-#[deriving(Eq, Clone)]
-pub struct SDLImageVersion {
-    pub major: int,
-    pub minor: int,
-    pub patch: int,
-}
-
-impl fmt::Show for SDLImageVersion {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f.buf, "{}.{}.{}", self.major, self.minor, self.patch)
-    }
-}
-
-impl SDLImageVersion {
-    fn from_sdl_version(sv: *ffi::SDL_version) -> SDLImageVersion {
-        //! Converts a raw *SDL_version to SDLImageVersion
-        unsafe {
-            let v = *sv;
-            SDLImageVersion{ major: v.major as int, minor: v.minor as int, patch: v.patch as int }
-        }
-    }
-}
-
 /// Static method extensions for creating Surfaces
 pub trait LoadSurface {
     // Self is only returned here to type hint to the compiler.
@@ -190,10 +166,10 @@ pub fn quit() {
     unsafe { ffi::IMG_Quit(); }
 }
 
-pub fn get_linked_version() -> SDLImageVersion {
+pub fn get_linked_version() -> Version {
     //! Returns the version of the dynamically linked SDL_image library
     unsafe {
-        SDLImageVersion::from_sdl_version(ffi::IMG_Linked_Version())
+        Version::from_ll(ffi::IMG_Linked_Version())
     }
 }