encounter/rust-sdl2
0
0
Fork 0
mirror of https://github.com/encounter/rust-sdl2.git synced 2026-07-10 21:18:41 -07:00
Code Issues Packages Projects Releases Wiki Activity

bump version: fix compile error under sdl2 0.6.0

Browse Source
This commit is contained in:
andelf
2015-07-23 17:35:57 +08:00
parent f616f3186f
commit d030d299c8
4 changed files with 23 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+3 -3
View File
@@ -2,7 +2,7 @@
name = "sdl2_ttf"
description = "SDL2_ttf bindings for Rust"
repository = "https://github.com/andelf/rust-sdl2_ttf"
version = "0.5.0"
version = "0.6.0"
license = "MIT"
readme = "README.md"
authors = ["ShuYu Wang <andelf@gmail.com>"]
@@ -14,8 +14,8 @@ path = "src/sdl2_ttf/lib.rs"
[dependencies]
bitflags = "0.2"
sdl2 = "0.5"
sdl2-sys = "0.5"
sdl2 = "0.6"
sdl2-sys = "0.6"
libc = "0.1"
# [dependencies.sdl2]
src/demo/video.rs → examples/demo.rs
View File
src/demo/main.rs
-23
View File
@@ -1,23 +0,0 @@
#![crate_type = "bin"]
extern crate sdl2;
extern crate sdl2_ttf;
use std::env;
use std::path::Path;
mod video;
fn main() {
let args: Vec<_> = env::args().collect();
println!("linked sdl2_ttf: {}", sdl2_ttf::get_linked_version());
if args.len() < 2 {
println!("Usage: ./demo font.[ttf|ttc|fon]")
} else {
let path: &Path = Path::new(&args[1]);
video::main(path);
}
}
src/sdl2_ttf/lib.rs
+20 -20
View File
@@ -358,10 +358,10 @@ impl Font {
unsafe {
let ctext = CString::new(text).unwrap().as_ptr();
let raw = ffi::TTF_RenderText_Solid(self.raw, ctext, color_to_c_color(fg));
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
Ok(Surface::from_ll(raw))
}
}
}
@@ -371,10 +371,10 @@ impl Font {
unsafe {
let ctext = CString::new(text.as_bytes()).unwrap();
let raw = ffi::TTF_RenderUTF8_Solid(self.raw, ctext.as_ptr(), color_to_c_color(fg));
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
Ok(Surface::from_ll(raw))
}
}
}
@@ -383,10 +383,10 @@ impl Font {
//! Draw a UNICODE glyph in solid mode.
unsafe {
let raw = ffi::TTF_RenderGlyph_Solid(self.raw, ch as u16, color_to_c_color(fg));
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
Ok(Surface::from_ll(raw))
}
}
}
@@ -396,10 +396,10 @@ impl Font {
unsafe {
let ctext = CString::new(text).unwrap().as_ptr();
let raw = ffi::TTF_RenderText_Shaded(self.raw, ctext, color_to_c_color(fg), color_to_c_color(bg));
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
Ok(Surface::from_ll(raw))
}
}
}
@@ -409,10 +409,10 @@ impl Font {
unsafe {
let ctext = CString::new(text.as_bytes()).unwrap();
let raw = ffi::TTF_RenderUTF8_Shaded(self.raw, ctext.as_ptr(), color_to_c_color(fg), color_to_c_color(bg));
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
Ok(Surface::from_ll(raw))
}
}
}
@@ -421,10 +421,10 @@ impl Font {
//! Draw a UNICODE glyph in shaded mode.
unsafe {
let raw = ffi::TTF_RenderGlyph_Shaded(self.raw, ch as u16, color_to_c_color(fg), color_to_c_color(bg));
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
Ok(Surface::from_ll(raw))
}
}
}
@@ -434,10 +434,10 @@ impl Font {
unsafe {
let ctext = CString::new(text).unwrap().as_ptr();
let raw = ffi::TTF_RenderText_Blended(self.raw, ctext, color_to_c_color(fg));
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
Ok(Surface::from_ll(raw))
}
}
}
@@ -447,10 +447,10 @@ impl Font {
unsafe {
let ctext = CString::new(text.as_bytes()).unwrap();
let raw = ffi::TTF_RenderUTF8_Blended(self.raw, ctext.as_ptr(), color_to_c_color(fg));
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
Ok(Surface::from_ll(raw))
}
}
}
@@ -459,10 +459,10 @@ impl Font {
//! Draw a UNICODE glyph in blended mode.
unsafe {
let raw = ffi::TTF_RenderGlyph_Blended(self.raw, ch as u16, color_to_c_color(fg));
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
Ok(Surface::from_ll(raw))
}
}
}
@@ -482,7 +482,7 @@ impl<'a> LoaderRWops for RWops<'a> {
let raw = unsafe {
ffi::TTF_OpenFontRW(self.raw(), 0, ptsize as c_int)
};
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Font::from_ll(raw, true))
@@ -492,7 +492,7 @@ impl<'a> LoaderRWops for RWops<'a> {
let raw = unsafe {
ffi::TTF_OpenFontIndexRW(self.raw(), 0, ptsize as c_int, index as c_long)
};
if raw.is_null() {
if (raw as *mut ()).is_null() {
Err(get_error())
} else {
Ok(Font::from_ll(raw, true))