Changeset 10415 for OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp

Timestamp:

06/25/09 18:07:49 (4 years ago)

Author:

robert

Message:

From Mathias Froehlich, "We are currently getting issues with locale settings and some osg plugins.
Therefore I have changed all the occurances of atof by asciiToFloat or
asciiToDouble.

I believe that it is safe to do so at least for all the plugins.
Included here are also asciiToFloat conversion of environment variables. One
might argue that these should be locale dependent. But IMO these should be
set and interpreted by osg independent of the current locale.
"

Files:

• OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osg/DisplaySettings.cpp

@@ -14 +14 @@
 #include <osg/ArgumentParser>
 #include <osg/ApplicationUsage>
+#include <osg/Math>
 #include <osg/Notify>
 #include <osg/ref_ptr>
@@ -269 +270 @@
     if( (ptr = getenv("OSG_EYE_SEPARATION")) != 0)
     {
-        _eyeSeparation = atof(ptr);
+        _eyeSeparation = osg::asciiToFloat(ptr);
     }
 
     if( (ptr = getenv("OSG_SCREEN_WIDTH")) != 0)
     {
-        _screenWidth = atof(ptr);
+        _screenWidth = osg::asciiToFloat(ptr);
     }
 
     if( (ptr = getenv("OSG_SCREEN_HEIGHT")) != 0)
     {
-        _screenHeight = atof(ptr);
+        _screenHeight = osg::asciiToFloat(ptr);
     }
 
     if( (ptr = getenv("OSG_SCREEN_DISTANCE")) != 0)
     {
-        _screenDistance = atof(ptr);
+        _screenDistance = osg::asciiToFloat(ptr);
     }