From 76c45c77314c1fc490f55ce84caebc8cbb8e214b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Thu, 21 Nov 2013 11:00:50 +0000
Subject: [PATCH] Changed std::max to osg::minimum to addres build error under
 VS2013.

---
 src/osgText/Glyph.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osgText/Glyph.cpp b/src/osgText/Glyph.cpp
index 93501fa6a..439427a86 100644
--- 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;