From 9444e1066623906b1101f5060efafc26c73e280e Mon Sep 17 00:00:00 2001 From: Dan Spencer Date: Mon, 26 Jan 2015 03:45:27 -0700 Subject: [PATCH] Fix conflict with #288 and #290 --- src/sdl2/render.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sdl2/render.rs b/src/sdl2/render.rs index 66b04ead..479d3f95 100644 --- a/src/sdl2/render.rs +++ b/src/sdl2/render.rs @@ -197,7 +197,7 @@ impl Renderer { } pub fn get_blend_mode(&self) -> SdlResult { - 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 { - 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())