From 4d4c61ea4e39135b126879dd6d7bc99a59a3a843 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 14 Dec 2015 18:43:58 -0800 Subject: Fix Windows build failure due to double vs float mismatch. TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1525853003 . --- core/src/fxcrt/fx_basic_wstring.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp index 119de66b84..dd26f595f2 100644 --- a/core/src/fxcrt/fx_basic_wstring.cpp +++ b/core/src/fxcrt/fx_basic_wstring.cpp @@ -989,7 +989,7 @@ int CFX_WideString::GetInteger() const { return m_pData ? FXSYS_wtoi(m_pData->m_String) : 0; } FX_FLOAT CFX_WideString::GetFloat() const { - return m_pData ? FX_wtof(m_pData->m_String, m_pData->m_nDataLength) : 0.0; + return m_pData ? FX_wtof(m_pData->m_String, m_pData->m_nDataLength) : 0.0f; } static CFX_ByteString _DefMap_GetByteString(CFX_CharMap* pCharMap, const CFX_WideString& widestr) { -- cgit v1.2.3