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

Converted OpenGL version number code to using osg::asciiToFloat to avoid issues with conversion using locale senstive atof function

Browse Source
This commit is contained in:
Robert Osfield
2008-11-24 13:19:01 +00:00
parent bf8c3cc07e
commit fccd05b290
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/osg/GL2Extensions.cpp
View File

@@ -22,6 +22,7 @@
#include <osg/ref_ptr>
#include <osg/GL2Extensions>
#include <osg/GLExtensions>
#include <osg/Math>
using namespace osg;
@@ -325,7 +326,7 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
return;
}
_glVersion = atof( version );
_glVersion = asciiToFloat( version );
_glslLanguageVersion = 0.0f;
_isShaderObjectsSupported = osg::isGLExtensionSupported(contextID,"GL_ARB_shader_objects");
@@ -341,7 +342,7 @@ void GL2Extensions::setupGL2Extensions(unsigned int contextID)
while(glGetError() != GL_NO_ERROR) {} // reset error flag
const char* langVerStr = (const char*)glGetString(GL_SHADING_LANGUAGE_VERSION);
if( (glGetError() == GL_NO_ERROR) && langVerStr )
_glslLanguageVersion = atof( langVerStr );
_glslLanguageVersion = asciiToFloat( langVerStr );
else
_glslLanguageVersion = 1.0f;
}