Changeset 10539

Timestamp:

08/20/09 16:59:29 (4 years ago)

Author:

robert

Message:

From Colin McDonald?, "The bsp & mdl plugins have calls to atof() without including the
associated <stdlib.h> header. This breaks the build on my Solaris setup.

Rather than adding the missing <stdlib.h> include, I have changed the
atof() calls to osg::asciiToDouble(). This is the same as was done
throughout the other plugins recently, for locale independance.

I've attached updates to the svn trunk, the fix is also appropriate for
the 2.8.* branch."

Location:

OpenSceneGraph/trunk/src/osgPlugins

Files:

• bsp/VBSPReader.cpp (modified) (2 diffs)
• mdl/MDLReader.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osgPlugins/bsp/VBSPReader.cpp

@@ -5 +5 @@
 #include <osg/Object>
 #include <osg/Material>
+#include <osg/Math>
 #include <osg/MatrixTransform>
 #include <osg/Node>
@@ -782 +783 @@
                 if (!token.empty())
                 {
-                   alpha = atof(token.c_str());
+                   alpha = osg::asciiToDouble(token.c_str());
                 }
             }

OpenSceneGraph/trunk/src/osgPlugins/mdl/MDLReader.cpp

@@ -5 +5 @@
 #include <osg/Object>
 #include <osg/Material>
+#include <osg/Math>
 #include <osg/MatrixTransform>
 #include <osg/Node>
@@ -355 +356 @@
                 if (!token.empty())
                 {
-                   alpha = atof(token.c_str());
+                   alpha = osg::asciiToDouble(token.c_str());
                 }
             }