From: Jean-Baptiste Mardelle Date: Wed, 17 Feb 2016 22:20:48 +0000 (+0100) Subject: Fix initialisation on locale with comma as numerical separator X-Git-Tag: 1.3.2~2 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=fc1e9e9f7f047e348a34fd691ceda0cd383e9d4f Fix initialisation on locale with comma as numerical separator --- diff --git a/init.cpp b/init.cpp index b9e68ab..2bade83 100644 --- a/init.cpp +++ b/init.cpp @@ -379,7 +379,10 @@ double get_glsl_version() // Now we have something on the form X.YY. We convert it to a float, and hope // that if it's inexact (e.g. 1.30), atof() will round the same way the // compiler will. - float glsl_version = atof(glsl_version_str); + std::istringstream locale_convert(glsl_version_str); + locale_convert.imbue(std::locale("C")); + double glsl_version; + locale_convert >> glsl_version; free(glsl_version_str); return glsl_version;