diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-14 14:43:42 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 19:05:58 +0000 |
| commit | 05df075154a832fcb476e1dfcfb865722d0ea898 (patch) | |
| tree | b8b771b62adae74d5d5ee561db75d10de3a848bf /core/fxcrt/fx_extension.cpp | |
| parent | 6b94f01d1c8ad386d497428c7397b1a99614aeba (diff) | |
| download | pdfium-05df075154a832fcb476e1dfcfb865722d0ea898.tar.xz | |
Replace FX_FLOAT with underlying float type.
Change-Id: I158b7d80b0ec28b742a9f2d5a96f3dde7fb3ab56
Reviewed-on: https://pdfium-review.googlesource.com/3031
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'core/fxcrt/fx_extension.cpp')
| -rw-r--r-- | core/fxcrt/fx_extension.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/core/fxcrt/fx_extension.cpp b/core/fxcrt/fx_extension.cpp index 0b7197ec7c..28c46c93f6 100644 --- a/core/fxcrt/fx_extension.cpp +++ b/core/fxcrt/fx_extension.cpp @@ -423,13 +423,13 @@ CFX_RetainPtr<IFX_MemoryStream> IFX_MemoryStream::Create(bool bConsecutive) { return pdfium::MakeRetain<CFX_MemoryStream>(bConsecutive); } -FX_FLOAT FXSYS_tan(FX_FLOAT a) { - return (FX_FLOAT)tan(a); +float FXSYS_tan(float a) { + return (float)tan(a); } -FX_FLOAT FXSYS_logb(FX_FLOAT b, FX_FLOAT x) { +float FXSYS_logb(float b, float x) { return FXSYS_log(x) / FXSYS_log(b); } -FX_FLOAT FXSYS_strtof(const char* pcsStr, int32_t iLength, int32_t* pUsedLen) { +float FXSYS_strtof(const char* pcsStr, int32_t iLength, int32_t* pUsedLen) { ASSERT(pcsStr); if (iLength < 0) { iLength = (int32_t)FXSYS_strlen(pcsStr); @@ -438,9 +438,7 @@ FX_FLOAT FXSYS_strtof(const char* pcsStr, int32_t iLength, int32_t* pUsedLen) { CFX_WideString::FromLocal(CFX_ByteStringC(pcsStr, iLength)); return FXSYS_wcstof(ws.c_str(), iLength, pUsedLen); } -FX_FLOAT FXSYS_wcstof(const wchar_t* pwsStr, - int32_t iLength, - int32_t* pUsedLen) { +float FXSYS_wcstof(const wchar_t* pwsStr, int32_t iLength, int32_t* pUsedLen) { ASSERT(pwsStr); if (iLength < 0) { iLength = (int32_t)FXSYS_wcslen(pwsStr); @@ -457,7 +455,7 @@ FX_FLOAT FXSYS_wcstof(const wchar_t* pwsStr, iUsedLen++; break; } - FX_FLOAT fValue = 0.0f; + float fValue = 0.0f; while (iUsedLen < iLength) { wchar_t wch = pwsStr[iUsedLen]; if (wch >= L'0' && wch <= L'9') { @@ -468,7 +466,7 @@ FX_FLOAT FXSYS_wcstof(const wchar_t* pwsStr, iUsedLen++; } if (iUsedLen < iLength && pwsStr[iUsedLen] == L'.') { - FX_FLOAT fPrecise = 0.1f; + float fPrecise = 0.1f; while (++iUsedLen < iLength) { wchar_t wch = pwsStr[iUsedLen]; if (wch >= L'0' && wch <= L'9') { |