From 36596f65fd4631e7dd89fde816e450ae26c5bcc9 Mon Sep 17 00:00:00 2001 From: Jari Karppinen Date: Tue, 21 May 2019 10:08:08 +0300 Subject: Replace strtod with locale-independent float parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-3317 Change-Id: I8998ff2ef61d0efdf4cffcbf71cf825308830617 Reviewed-by: Miikka Heikkinen Reviewed-by: Antti Määttä --- src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h index 9268e6dc..eec2cf3b 100644 --- a/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h +++ b/src/Authoring/QT3DSDM/Systems/Qt3DSDMWStrOpsImpl.h @@ -187,8 +187,10 @@ struct WStrOps } bool StrTo(const char8_t *buffer, QT3DSF32 &item) { - item = (QT3DSF32)strtod(buffer, NULL); - return true; + static QLocale c(QLocale::C); + bool ok; + item = c.toFloat(buffer, &ok); + return ok; } }; @@ -201,8 +203,10 @@ struct WStrOps } bool StrTo(const char8_t *buffer, QT3DSF64 &item) { - item = strtod(buffer, NULL); - return true; + static QLocale c(QLocale::C); + bool ok; + item = c.toDouble(buffer, &ok); + return ok; } }; #define QT3DS_WCHAR_T_None L"None" -- cgit v1.2.3