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 #294 from nukep/master

Browse Source 
Fix conflict with #288 and #290
This commit is contained in:
Tony Aldridge
2015-01-26 13:26:17 +00:00
parent 4076dc948c 9444e10666
commit 9aa6cde046
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2/render.rs
+2 -2
View File
@@ -197,7 +197,7 @@ impl Renderer {
}
pub fn get_blend_mode(&self) -> SdlResult<BlendMode> {
let blend: c_uint = 0;
let blend = 0;
let result = unsafe { ll::SDL_GetRenderDrawBlendMode(self.raw, &blend) == 0 };
if result {
Ok(FromPrimitive::from_i64(blend as i64).unwrap())
@@ -590,7 +590,7 @@ impl Texture {
}
pub fn get_blend_mode(&self) -> SdlResult<BlendMode> {
let blend: c_uint = 0;
let blend = 0;
let result = unsafe { ll::SDL_GetTextureBlendMode(self.raw, &blend) == 0 };
if result {
Ok(FromPrimitive::from_i64(blend as i64).unwrap())