From 93ef9d1dc914c005ff979cf95762e8bd899cd471 Mon Sep 17 00:00:00 2001
From: Laurens Voerman <l.voerman@rug.nl>
Date: Fri, 27 Oct 2017 09:41:28 +0200
Subject: [PATCH] use osg::maximum, not std::max

---
 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 09c166cf6..17776780c 100644
--- a/src/osgText/Glyph.cpp
+++ b/src/osgText/Glyph.cpp
@@ -88,7 +88,7 @@ int GlyphTexture::getTexelMargin(const Glyph* glyph)
     int height = glyph->t();
     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;
 
     return margin;