summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2015-12-14 18:52:49 -0800
committerLei Zhang <thestig@chromium.org>2015-12-14 18:52:49 -0800
commitd4606455ef9be6f1e242c9fc72821a8c221d4a40 (patch)
treea8f560ff15006f83f08a6fc3557c560937ac1a20 /core
parent412e908082a361d0fd9591eab939e96a882212f1 (diff)
downloadpdfium-d4606455ef9be6f1e242c9fc72821a8c221d4a40.tar.xz
Merge to XFA: Fix Windows build failure due to double vs float mismatch.
TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1525853003 . (cherry picked from commit 4d4c61ea4e39135b126879dd6d7bc99a59a3a843) Review URL: https://codereview.chromium.org/1524023002 .
Diffstat (limited to 'core')
-rw-r--r--core/src/fxcrt/fx_basic_wstring.cpp2
1 files changed, 1 insertions, 1 deletions
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) {