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

Merge pull request #39 from jaburns/master

Browse Source 
Fixed mutability mismatch in calls to rust-sdl2's Surface::from_ll
This commit is contained in:
Tony Aldridge
2015-04-17 08:54:07 +01:00
parent ad9d19479b 7bbc4cbde5
commit 91e5cff2b4
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2_image/ffi.rs
+22 -22
View File
@@ -34,16 +34,16 @@ pub fn IMG_Quit();
// surface afterwards by calling:
// SDL_SetColorKey(image, SDL_RLEACCEL, image->format->colorkey);
pub fn IMG_LoadTyped_RW(src: *const SDL_RWops, freesrc: c_int,
fmt: *const c_char) -> *const SDL_Surface;
fmt: *const c_char) -> *mut SDL_Surface;
// Convenience functions
pub fn IMG_Load(file: *const c_char) -> *const SDL_Surface;
pub fn IMG_Load_RW(src: *const SDL_RWops, freesrc: c_int) -> *const SDL_Surface;
pub fn IMG_Load(file: *const c_char) -> *mut SDL_Surface;
pub fn IMG_Load_RW(src: *const SDL_RWops, freesrc: c_int) -> *mut SDL_Surface;
// Load an image directly into a render texture.
// Requires SDL2
pub fn IMG_LoadTexture(renderer: *const SDL_Renderer,
file: *const c_char) -> *const SDL_Texture;
file: *const c_char) -> *mut SDL_Texture;
pub fn IMG_LoadTexture_RW(renderer: *const SDL_Renderer, src: *const SDL_RWops,
freesrc: c_int) -> *const SDL_Texture;
pub fn IMG_LoadTextureTyped_RW(renderer: *const SDL_Renderer, src: *const SDL_RWops,
@@ -66,26 +66,26 @@ pub fn IMG_isXV(src: *const SDL_RWops) -> c_int;
pub fn IMG_isWEBP(src: *const SDL_RWops) -> c_int;
// Individual loading functions
pub fn IMG_LoadICO_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadCUR_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadBMP_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadGIF_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadJPG_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadLBM_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadPCX_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadPNG_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadPNM_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadTGA_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadTIF_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadXCF_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadXPM_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadXV_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_LoadWEBP_RW(src: *const SDL_RWops) -> *const SDL_Surface;
pub fn IMG_ReadXPMFromArray(xpm: *const *const c_char) -> *const SDL_Surface;
pub fn IMG_LoadICO_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadCUR_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadBMP_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadGIF_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadJPG_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadLBM_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadPCX_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadPNG_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadPNM_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadTGA_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadTIF_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadXCF_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadXPM_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadXV_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_LoadWEBP_RW(src: *const SDL_RWops) -> *mut SDL_Surface;
pub fn IMG_ReadXPMFromArray(xpm: *const *const c_char) -> *mut SDL_Surface;
// Individual saving functions
pub fn IMG_SavePNG(surface: *const SDL_Surface, file: *const c_char) -> c_int;
pub fn IMG_SavePNG_RW(surface: *const SDL_Surface, dst: *const SDL_RWops,
pub fn IMG_SavePNG(surface: *mut SDL_Surface, file: *const c_char) -> c_int;
pub fn IMG_SavePNG_RW(surface: *mut SDL_Surface, dst: *const SDL_RWops,
freedst: c_int) -> c_int;
} // extern "C"
src/sdl2_image/lib.rs
+6 -6
View File
@@ -72,7 +72,7 @@ impl<'a> LoadSurface for Surface<'a> {
//! Loads an SDL Surface from a file
unsafe {
let raw = ffi::IMG_Load(CString::new(filename.to_str().unwrap()).unwrap().as_ptr());
if raw == ptr::null() {
if raw == ptr::null_mut() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
@@ -84,7 +84,7 @@ impl<'a> LoadSurface for Surface<'a> {
//! Loads an SDL Surface from XPM data
unsafe {
let raw = ffi::IMG_ReadXPMFromArray(xpm as *const *const c_char);
if raw == ptr::null() {
if raw == ptr::null_mut() {
Err(get_error())
} else {
Ok(Surface::from_ll(raw, true))
@@ -130,7 +130,7 @@ impl<'a> LoadTexture for Renderer<'a> {
//! Loads an SDL Texture from a file
unsafe {
let raw = ffi::IMG_LoadTexture(self.raw(), CString::new(filename.to_str().unwrap()).unwrap().as_ptr());
if raw == ptr::null() {
if raw == ptr::null_mut() {
Err(get_error())
} else {
Ok(Texture::from_ll(self, raw))
@@ -156,13 +156,13 @@ pub fn quit() {
pub fn get_linked_version() -> Version {
//! Returns the version of the dynamically linked SDL_image library
unsafe {
Version::from_ll(ffi::IMG_Linked_Version())
Version::from_ll(*ffi::IMG_Linked_Version())
}
}
#[inline]
fn to_surface_result<'a>(raw: *const sys::surface::SDL_Surface) -> SdlResult<Surface<'a>> {
if raw == ptr::null() {
fn to_surface_result<'a>(raw: *mut sys::surface::SDL_Surface) -> SdlResult<Surface<'a>> {
if raw == ptr::null_mut() {
Err(get_error())
} else {
unsafe { Ok(Surface::from_ll(raw, true)) }