zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 14:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed possible erroneous comparison, also fixed a couple compiler warnings in the process

Browse source
This commit is contained in:
Rachael Alexanderson 2017-10-10 07:23:05 -04:00
parent fc0ae896b2
commit 7d67d5e998
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/r_videoscale.cpp
View file

@ -80,7 +80,7 @@ int ViewportScaledWidth(int width, int height)
if (isOutOfBounds(vid_scalemode)) if (isOutOfBounds(vid_scalemode))
vid_scalemode = 0; vid_scalemode = 0;
if (vid_cropaspect && height > 0) if (vid_cropaspect && height > 0)
width = (width/height > ActiveRatio(width, height)) ? height * ActiveRatio(width, height) : width; width = ((float)width/height > ActiveRatio(width, height)) ? (int)(height * ActiveRatio(width, height)) : width;
return vScaleTable[vid_scalemode].GetScaledWidth((int)((float)width * vid_scalefactor)); return vScaleTable[vid_scalemode].GetScaledWidth((int)((float)width * vid_scalefactor));
} }
@ -89,7 +89,7 @@ int ViewportScaledHeight(int width, int height)
if (isOutOfBounds(vid_scalemode)) if (isOutOfBounds(vid_scalemode))
vid_scalemode = 0; vid_scalemode = 0;
if (vid_cropaspect && height > 0) if (vid_cropaspect && height > 0)
height = (width/height < ActiveRatio(width, height)) ? width / ActiveRatio(width, height) : height; height = ((float)width/height < ActiveRatio(width, height)) ? (int)(width / ActiveRatio(width, height)) : height;
return vScaleTable[vid_scalemode].GetScaledHeight((int)((float)height * vid_scalefactor)); return vScaleTable[vid_scalemode].GetScaledHeight((int)((float)height * vid_scalefactor));
} }