FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use osg::maximum, not std::max

Browse Source
This commit is contained in:
Laurens Voerman 2017-10-27 09:41:28 +02:00
parent 1126812f8f
commit 93ef9d1dc9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgText/Glyph.cpp
View File

@ -88,7 +88,7 @@ int GlyphTexture::getTexelMargin(const Glyph* glyph)
int height = glyph->t(); int height = glyph->t();
int effect_margin = getEffectMargin(glyph); int effect_margin = getEffectMargin(glyph);
int max_dimension = std::max(width, height) + 2 * effect_margin; int max_dimension = osg::maximum(width, height) + 2 * effect_margin;
int margin = osg::maximum(max_dimension/4, 2) + effect_margin; int margin = osg::maximum(max_dimension/4, 2) + effect_margin;
return margin; return margin;