From e5bc4452522f8378b38922130f9741adb6f0377d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 14 Feb 2015 06:12:53 +0100 Subject: [PATCH] Refactor video_viewport_get_scaled_integer --- gfx/video_viewport.c | 6 ++++-- gfx/video_viewport.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gfx/video_viewport.c b/gfx/video_viewport.c index 4da6402c0c..3e03c59d42 100644 --- a/gfx/video_viewport.c +++ b/gfx/video_viewport.c @@ -148,12 +148,14 @@ void video_viewport_set_config(void) * Gets viewport scaling dimensions based on * scaled integer aspect ratio. **/ -void video_viewport_get_scaled_integer(void *data, +void video_viewport_get_scaled_integer(struct video_viewport *vp, unsigned width, unsigned height, float aspect_ratio, bool keep_aspect) { int padding_x = 0, padding_y = 0; - struct video_viewport *vp = (struct video_viewport*)data; + + if (!vp) + return; if (g_settings.video.aspect_ratio_idx == ASPECT_RATIO_CUSTOM) { diff --git a/gfx/video_viewport.h b/gfx/video_viewport.h index db7fa6d8f6..bbdc9b5b52 100644 --- a/gfx/video_viewport.h +++ b/gfx/video_viewport.h @@ -133,7 +133,7 @@ void video_viewport_set_config(void); * Gets viewport scaling dimensions based on * scaled integer aspect ratio. **/ -void video_viewport_get_scaled_integer(void *data, +void video_viewport_get_scaled_integer(struct video_viewport *vp, unsigned width, unsigned height, float aspect_ratio, bool keep_aspect);