Changed std::max to osg::minimum to addres build error under VS2013.

2013-11-21 11:00:50 +00:00
parent 5efce09451
commit 76c45c7731
1 changed files with 1 additions and 1 deletions
--- a/src/osgText/Glyph.cpp
+++ b/src/osgText/Glyph.cpp
@@ -54,7 +54,7 @@ int GlyphTexture::compare(const osg::StateAttribute& rhs) const

 bool GlyphTexture::getSpaceForGlyph(Glyph* glyph, int& posX, int& posY)
 {
-    int maxAxis = std::max(glyph->s(), glyph->t());
+    int maxAxis = osg::maximum(glyph->s(), glyph->t());
    int margin = _margin + (int)((float)maxAxis * _marginRatio);

    int width = glyph->s()+2*margin;