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 #162 from seemk/pattern_match_fix

Browse Source 
Removed undefined behaviour from pattern matching
This commit is contained in:
Tony Aldridge
2014-08-05 09:00:17 +01:00
parent 182791820a 262eed55ad
commit feddc845ec
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2/render.rs
+8 -8
View File
@@ -520,11 +520,11 @@ impl<S> Renderer<S> {
self.raw,
texture.raw,
match src {
Some(rect) => mem::transmute(&rect),
Some(ref rect) => mem::transmute(rect),
None => ptr::null()
},
match dst {
Some(rect) => mem::transmute(&rect),
Some(ref rect) => mem::transmute(rect),
None => ptr::null()
}
)
@@ -541,16 +541,16 @@ impl<S> Renderer<S> {
self.raw,
texture.raw,
match src {
Some(rect) => mem::transmute(&rect),
Some(ref rect) => mem::transmute(rect),
None => ptr::null()
},
match dst {
Some(rect) => mem::transmute(&rect),
Some(ref rect) => mem::transmute(rect),
None => ptr::null()
},
angle as c_double,
match center {
Some(point) => mem::transmute(&point),
Some(ref point) => mem::transmute(point),
None => ptr::null()
},
FromPrimitive::from_i64(flip as i64).unwrap()
@@ -564,7 +564,7 @@ impl<S> Renderer<S> {
pub fn read_pixels(&self, rect: Option<Rect>, format: pixels::PixelFormatFlag) -> SdlResult<CVec<u8>> {
unsafe {
let (actual_rect, w, h) = match rect {
Some(rect) => (mem::transmute(&rect), rect.w as uint, rect.h as uint),
Some(ref rect) => (mem::transmute(rect), rect.w as uint, rect.h as uint),
None => {
let (w, h) = try!(self.get_output_size());
(ptr::null(), w as uint, h as uint)
@@ -687,7 +687,7 @@ impl Texture {
pub fn update(&self, rect: Option<Rect>, pixel_data: &[u8], pitch: int) -> SdlResult<()> {
let ret = unsafe {
let actual_rect = match rect {
Some(rect) => mem::transmute(&rect),
Some(ref rect) => mem::transmute(rect),
None => ptr::null()
};
@@ -702,7 +702,7 @@ impl Texture {
let q = try!(self.query());
unsafe {
let actual_rect = match rect {
Some(rect) => mem::transmute(&rect),
Some(ref rect) => mem::transmute(rect),
None => ptr::null()
};