From 46b9e5fde794f74ad3f21a2d431288382b7cd4e0 Mon Sep 17 00:00:00 2001
From: Andelf <andelf@gmail.com>
Date: Thu, 3 Apr 2014 11:28:44 +0800
Subject: [PATCH] fix SDL_version type error

---
 src/sdl2_image/ffi.rs |  8 ++++----
 src/sdl2_image/lib.rs | 13 +++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/sdl2_image/ffi.rs b/src/sdl2_image/ffi.rs
index 7cff36f7..d20e3b91 100644
--- a/src/sdl2_image/ffi.rs
+++ b/src/sdl2_image/ffi.rs
@@ -1,6 +1,6 @@
 extern crate sdl2;
 
-use std::libc::{c_int, c_char};
+use std::libc::{c_int, c_char, uint8_t};
 use sdl2::surface::ll::SDL_Surface;
 use sdl2::rwops::ll::SDL_RWops;
 use sdl2::render::ll::SDL_Texture;
@@ -13,9 +13,9 @@ pub static IMG_INIT_TIF: IMG_InitFlags = 0x00000004;
 pub static IMG_INIT_WEBP: IMG_InitFlags = 0x00000008;
 
 pub struct SDL_version {
-    pub major: int,
-    pub minor: int,
-    pub patch: int,
+    pub major: uint8_t,
+    pub minor: uint8_t,
+    pub patch: uint8_t,
 }
 
 extern "C" {
diff --git a/src/sdl2_image/lib.rs b/src/sdl2_image/lib.rs
index aa445bb4..f8402ad2 100644
--- a/src/sdl2_image/lib.rs
+++ b/src/sdl2_image/lib.rs
@@ -9,6 +9,7 @@ extern crate sdl2;
 
 use std::libc::{c_int, c_char};
 use std::ptr;
+use std::fmt;
 use sdl2::surface::Surface;
 use sdl2::render::Texture;
 use sdl2::render::Renderer;
@@ -53,13 +54,13 @@ pub enum InitFlag {
 /// The version of the libSDL.so that you are linked to
 #[deriving(Eq, Clone)]
 pub struct SDLImageVersion {
-    major: int,
-    minor: int,
-    patch: int,
+    pub major: int,
+    pub minor: int,
+    pub patch: int,
 }
 
-impl ::std::fmt::Show for SDLImageVersion {
-    fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
+impl fmt::Show for SDLImageVersion {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f.buf, "{}.{}.{}", self.major, self.minor, self.patch)
     }
 }
@@ -69,7 +70,7 @@ impl SDLImageVersion {
         //! Converts a raw *SDL_version to SDLImageVersion
         unsafe {
             let v = *sv;
-            SDLImageVersion{ major: v.major, minor: v.minor, patch: v.patch }
+            SDLImageVersion{ major: v.major as int, minor: v.minor as int, patch: v.patch as int }
         }
     }
 }