mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-28 18:29:49 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #159 from mniip/stamps

Browse Source 
fix resizing in VideoBuffer::Resize, fixes #121
This commit is contained in:
jacob1
2013-09-02 08:03:55 -07:00
parent f1145f31f5 fea920d608
commit 1b9d852fc6
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/graphics/Graphics.cpp
View File

@@ -67,13 +67,10 @@ void VideoBuffer::Resize(int width, int height, bool resample, bool fixedRatio)
else if(fixedRatio) else if(fixedRatio)
{ {
//Force proportions //Force proportions
float scaleFactor = 1.0f; if(newWidth*Height > newHeight*Width) // same as nW/W > nH/H
if(Height > newHeight) newWidth = (int)(Width * (newHeight/(float)Height));
scaleFactor = ((float)newHeight)/((float)Height); else
if(Width > newWidth) newHeight = (int)(Height * (newWidth/(float)Width));
scaleFactor = ((float)newWidth)/((float)Width);
newWidth = ((float)Width)*scaleFactor;
newHeight = ((float)Height)*scaleFactor;
} }
if(resample) if(resample)
newBuffer = Graphics::resample_img(Buffer, Width, Height, newWidth, newHeight); newBuffer = Graphics::resample_img(Buffer, Width, Height, newWidth, newHeight);