Changeset 9639 for ps

Timestamp:

06/19/11 21:51:53 (14 years ago)

Author:

philip

Message:

Avoid potentially dangerous locale-dependent atof functions

Location:

ps/trunk/source/tools/atlas

Files:

• AtlasObject/AtlasObject.h (modified) (1 diff)
• AtlasObject/AtlasObjectImpl.cpp (modified) (1 diff)
• AtlasUI/ScenarioEditor/Sections/Player/Player.cpp (modified) (1 diff)

ps/trunk/source/tools/atlas/AtlasObject/AtlasObject.h

@@ -137 +137 @@
     operator const wchar_t* () const;
 
+    // Return the floating point value of this object
+    double getDouble() const;
+
     // Check whether the object contains anything (even if those things are empty)
     bool defined() const { return (bool)p; }

ps/trunk/source/tools/atlas/AtlasObject/AtlasObjectImpl.cpp

@@ -129 +129 @@
 }
 
+double AtObj::getDouble() const
+{
+    double val = 0;
+    if (p)
+    {
+        std::wstringstream s;
+        s << p->value;
+        s >> val;
+    }
+    return val;
+}
+
 void AtObj::add(const char* key, AtObj& data)
 {

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp

@@ -626 +626 @@
             sCameraInfo info;
             AtObj camPos = *player["StartingCamera"]["Position"];
-            info.pX = wxAtof(*camPos["x"]);
-            info.pY = wxAtof(*camPos["y"]);
-            info.pZ = wxAtof(*camPos["z"]);
+            info.pX = (float)(*camPos["x"]).getDouble();
+            info.pY = (float)(*camPos["y"]).getDouble();
+            info.pZ = (float)(*camPos["z"]).getDouble();
             AtObj camRot = *player["StartingCamera"]["Rotation"];
-            info.rX = wxAtof(*camRot["x"]);
-            info.rY = wxAtof(*camRot["y"]);
-            info.rZ = wxAtof(*camRot["z"]);
+            info.rX = (float)(*camRot["x"]).getDouble();
+            info.rY = (float)(*camRot["y"]).getDouble();
+            info.rZ = (float)(*camRot["z"]).getDouble();
             
             controls.page->SetCamera(info, true);