[config] parse floats (hopefully) without locale issues

wheaney · Jun 23, 2020 · d845000 · d845000
1 parent 54b3c63
commit d845000
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/config.cpp b/src/config.cpp
@@ -1,6 +1,7 @@
 #include "config.hpp"
 
 #include <sstream>
+#include <locale>
 
 namespace vkBasalt
 {
@@ -125,13 +126,20 @@ namespace vkBasalt
         auto found = options.find(option);
         if (found != options.end())
         {
-            try
+            // TODO find a better float parsing way, std::stof has locale issues
+            std::stringstream ss(found->second);
+            ss.imbue(std::locale("C"));
+            float value;
+            ss >> value;
+            std::string rest;
+            ss >> rest;
+            if (ss.fail() || (!rest.empty() && rest != "f"))
             {
-                result = std::stof(found->second);
+                Logger::warn("invalid float value for: " + option);
             }
-            catch (...)
+            else
             {
-                Logger::warn("invalid float value for: " + option);
+                result = value;
             }
         }
     }