diff --git a/Source/Core/Core/HW/VideoInterface.cpp b/Source/Core/Core/HW/VideoInterface.cpp index b2c0512a4e..e62e29af38 100644 --- a/Source/Core/Core/HW/VideoInterface.cpp +++ b/Source/Core/Core/HW/VideoInterface.cpp @@ -477,11 +477,11 @@ float GetAspectRatio(bool wide) { if (wide) { - return 16.0f/9.0f; + return 16.0f / 9.0f; } else { - return 4.0f/3.0f; + return 4.0f / 3.0f; } } return ((float)width / (float)height) * pixelAR; diff --git a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp index 8921be9130..f9f798f262 100644 --- a/Source/Core/VideoBackends/D3D/FramebufferManager.cpp +++ b/Source/Core/VideoBackends/D3D/FramebufferManager.cpp @@ -56,11 +56,11 @@ FramebufferManager::FramebufferManager() { m_target_width = Renderer::GetTargetWidth(); m_target_height = Renderer::GetTargetHeight(); - if(m_target_height < 1) + if (m_target_height < 1) { m_target_height = 1; } - if(m_target_width < 1) + if (m_target_width < 1) { m_target_width = 1; } diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index 77ba795d48..e116a38443 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -46,7 +46,6 @@ #include "VideoCommon/VideoConfig.h" #include "VideoCommon/XFMemory.h" - // TODO: Move these out of here. int frameCount; int OSDChoice; @@ -478,17 +477,18 @@ void Renderer::UpdateDrawRectangle(int backbuffer_width, int backbuffer_height) // The rendering window aspect ratio as a proportion of the 4:3 or 16:9 ratio float Ratio; switch (g_ActiveConfig.iAspectRatio) - { - case ASPECT_ANALOG_WIDE: - Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(true); - break; - case ASPECT_ANALOG: - Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(false); - break; - default: - Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(g_aspect_wide); - break; + { + case ASPECT_ANALOG_WIDE: + Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(true); + break; + case ASPECT_ANALOG: + Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(false); + break; + default: + Ratio = (WinWidth / WinHeight) / VideoInterface::GetAspectRatio(g_aspect_wide); + break; } + if (g_ActiveConfig.iAspectRatio != ASPECT_STRETCH) { if (Ratio > 1.0f) diff --git a/Source/Core/VideoCommon/RenderBase.h b/Source/Core/VideoCommon/RenderBase.h index f5ffcc8579..c717483d1e 100644 --- a/Source/Core/VideoCommon/RenderBase.h +++ b/Source/Core/VideoCommon/RenderBase.h @@ -40,7 +40,6 @@ extern int OSDChoice; extern bool bLastFrameDumped; - // Renderer really isn't a very good name for this class - it's more like "Misc". // The long term goal is to get rid of this class and replace it with others that make // more sense. @@ -137,7 +136,6 @@ public: static Common::Event s_screenshotCompleted; - protected: static void CalculateTargetScale(int x, int y, int* scaledX, int* scaledY);