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

Fix type of format field in video::DisplayMode

Browse Source
This commit is contained in:
Jonas Platte
2017-01-17 14:48:28 +01:00
committed by Cobrand
parent b3ee9b2f04
commit dd299c421a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sdl2/video.rs
+5 -5
View File
@@ -7,7 +7,7 @@ use std::error::Error;
use rect::Rect;
use render::RendererBuilder;
use surface::SurfaceRef;
use pixels;
use pixels::PixelFormatEnum;
use VideoSubsystem;
use EventPump;
use num::FromPrimitive;
@@ -355,14 +355,14 @@ pub mod gl_attr {
#[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
pub struct DisplayMode {
pub format: u32,
pub format: PixelFormatEnum,
pub w: i32,
pub h: i32,
pub refresh_rate: i32
}
impl DisplayMode {
pub fn new(format: u32, w: i32, h: i32, refresh_rate: i32) -> DisplayMode {
pub fn new(format: PixelFormatEnum, w: i32, h: i32, refresh_rate: i32) -> DisplayMode {
DisplayMode {
format: format,
w: w,
@@ -373,7 +373,7 @@ impl DisplayMode {
pub fn from_ll(raw: &ll::SDL_DisplayMode) -> DisplayMode {
DisplayMode::new(
raw.format as u32,
PixelFormatEnum::from_u32(raw.format as u32).unwrap_or(PixelFormatEnum::Unknown),
raw.w as i32,
raw.h as i32,
raw.refresh_rate as i32
@@ -1019,7 +1019,7 @@ impl WindowRef {
}
}
pub fn window_pixel_format(&self) -> pixels::PixelFormatEnum {
pub fn window_pixel_format(&self) -> PixelFormatEnum {
unsafe{ FromPrimitive::from_u64(ll::SDL_GetWindowPixelFormat(self.raw()) as u64).unwrap() }
}