thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed use of max

Browse source
This commit is contained in:
Joel Teichroeb 2011-05-23 13:40:57 -07:00
parent b94fcbd554
commit 085ba51da2
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/grim/gfx_opengl.cpp
View file

@ -791,8 +791,9 @@ void GfxOpenGL::createFont(Font *font) {
int size = 0;
for (int i = 0; i < 256; ++i) {
int width = font->getCharDataWidth(i), height = font->getCharDataHeight(i);
int m = max(width, height);
size = max(m, size);
int m = width > height ? width : height;
if (m < size)
size = m;
}
assert(size < 64);
if (size < 8)