From fea920d608c15ba095e5c2e5a55d4ec358e0a8e2 Mon Sep 17 00:00:00 2001 From: mniip Date: Mon, 2 Sep 2013 18:03:43 +0400 Subject: [PATCH] fix fixedRatio when VideoBuffer::Resize'ing, fixes #121 --- src/graphics/Graphics.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/graphics/Graphics.cpp b/src/graphics/Graphics.cpp index d4e29567b..aa0082186 100644 --- a/src/graphics/Graphics.cpp +++ b/src/graphics/Graphics.cpp @@ -67,13 +67,10 @@ void VideoBuffer::Resize(int width, int height, bool resample, bool fixedRatio) else if(fixedRatio) { //Force proportions - float scaleFactor = 1.0f; - if(Height > newHeight) - scaleFactor = ((float)newHeight)/((float)Height); - if(Width > newWidth) - scaleFactor = ((float)newWidth)/((float)Width); - newWidth = ((float)Width)*scaleFactor; - newHeight = ((float)Height)*scaleFactor; + if(newWidth*Height > newHeight*Width) // same as nW/W > nH/H + newWidth = (int)(Width * (newHeight/(float)Height)); + else + newHeight = (int)(Height * (newWidth/(float)Width)); } if(resample) newBuffer = Graphics::resample_img(Buffer, Width, Height, newWidth, newHeight);