From bab533e39e24802e5ef88af364505a1006a78206 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 14 Feb 2015 06:16:24 +0100 Subject: [PATCH] Refactor gfx/video_viewport.c --- gfx/video_viewport.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gfx/video_viewport.c b/gfx/video_viewport.c index 3e03c59d42..f3f0d7295e 100644 --- a/gfx/video_viewport.c +++ b/gfx/video_viewport.c @@ -64,8 +64,9 @@ void video_viewport_set_square_pixel(unsigned width, unsigned height) if (width == 0 || height == 0) return; - len = min(width, height); - highest = 1; + len = min(width, height); + highest = 1; + for (i = 1; i < len; i++) { if ((width % i) == 0 && (height % i) == 0) @@ -89,10 +90,9 @@ void video_viewport_set_square_pixel(unsigned width, unsigned height) **/ void video_viewport_set_core(void) { - const struct retro_game_geometry *geom = - (const struct retro_game_geometry*)&g_extern.system.av_info.geometry; + struct retro_game_geometry *geom = &g_extern.system.av_info.geometry; - if (geom->base_width <= 0.0f || geom->base_height <= 0.0f) + if (!geom || geom->base_width <= 0.0f || geom->base_height <= 0.0f) return; /* Fallback to 1:1 pixel ratio if none provided */ @@ -112,11 +112,9 @@ void video_viewport_set_config(void) { if (g_settings.video.aspect_ratio < 0.0f) { - const struct retro_game_geometry *geom = - (const struct retro_game_geometry*) - &g_extern.system.av_info.geometry; + struct retro_game_geometry *geom = &g_extern.system.av_info.geometry; - if (geom->aspect_ratio > 0.0f && g_settings.video.aspect_ratio_auto) + if (geom && geom->aspect_ratio > 0.0f && g_settings.video.aspect_ratio_auto) aspectratio_lut[ASPECT_RATIO_CONFIG].value = geom->aspect_ratio; else {