diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-13 21:40:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-13 21:40:19 -0700 |
| commit | bd9748d504555f100d34025d76a9e0119986bc3f (patch) | |
| tree | 829a03f0064b6593f6eff9551ed24b862a06006e /xfa/fgas/font | |
| parent | 6e0d67d4f55fc7cb4632f4c5d08cd7565a237d30 (diff) | |
| download | pdfium-bd9748d504555f100d34025d76a9e0119986bc3f.tar.xz | |
Remove implicit cast from CFX_WideString to (const wchar_t*)
BUG=
Review URL: https://codereview.chromium.org/1882043004
Diffstat (limited to 'xfa/fgas/font')
| -rw-r--r-- | xfa/fgas/font/fgas_fontutils.cpp | 2 | ||||
| -rw-r--r-- | xfa/fgas/font/fgas_gefont.cpp | 6 | ||||
| -rw-r--r-- | xfa/fgas/font/fgas_stdfontmgr.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/xfa/fgas/font/fgas_fontutils.cpp b/xfa/fgas/font/fgas_fontutils.cpp index 2e550f7c08..12271fbb64 100644 --- a/xfa/fgas/font/fgas_fontutils.cpp +++ b/xfa/fgas/font/fgas_fontutils.cpp @@ -42,7 +42,7 @@ uint32_t FGAS_GetFontFamilyHash(const FX_WCHAR* pszFontFamily, wsFont += L"Italic"; } wsFont += wCodePage; - return FX_HashCode_String_GetW((const FX_WCHAR*)wsFont, wsFont.GetLength()); + return FX_HashCode_String_GetW(wsFont.c_str(), wsFont.GetLength()); } static const FGAS_FONTUSB g_FXGdiFontUSBTable[] = { {0x0000, 0x007F, 0, 1252}, {0x0080, 0x00FF, 1, 1252}, diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp index 0ef80a3075..ed41076535 100644 --- a/xfa/fgas/font/fgas_gefont.cpp +++ b/xfa/fgas/font/fgas_gefont.cpp @@ -514,11 +514,11 @@ int32_t CFX_GEFont::GetGlyphIndex(FX_WCHAR wUnicode, CFX_WideString wsFamily; GetFamilyName(wsFamily); #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ - IFX_Font* pFont = m_pFontMgr->GetDefFontByUnicode( - wUnicode, GetFontStyles(), (const FX_WCHAR*)wsFamily); + IFX_Font* pFont = m_pFontMgr->GetDefFontByUnicode(wUnicode, GetFontStyles(), + wsFamily.c_str()); #else IFX_Font* pFont = m_pFontMgr->GetFontByUnicode(wUnicode, GetFontStyles(), - (const FX_WCHAR*)wsFamily); + wsFamily.c_str()); if (NULL == pFont) { pFont = m_pFontMgr->GetFontByUnicode(wUnicode, GetFontStyles(), NULL); } diff --git a/xfa/fgas/font/fgas_stdfontmgr.cpp b/xfa/fgas/font/fgas_stdfontmgr.cpp index 89087aacf8..6e707bf9cf 100644 --- a/xfa/fgas/font/fgas_stdfontmgr.cpp +++ b/xfa/fgas/font/fgas_stdfontmgr.cpp @@ -1504,7 +1504,7 @@ void CFX_FontMgrImp::GetUSBCSB(FXFT_Face pFace, uint32_t* USB, uint32_t* CSB) { } int32_t CFX_FontMgrImp::IsPartName(const CFX_WideString& Name1, const CFX_WideString& Name2) { - if (Name1.Find((const FX_WCHAR*)Name2) != -1) { + if (Name1.Find(Name2.c_str()) != -1) { return 1; } return 0; |