xfa/fgas/font/fgas_gefont.cpp - Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: xfa/fgas/font/fgas_gefont.cpp

Issue 1882043004: Remove implicit cast from CFX_WideString to (const wchar_t*) (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: win error #2 Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: xfa/fgas/font/fgas_gefont.cpp

diff --git a/xfa/fgas/font/fgas_gefont.cpp b/xfa/fgas/font/fgas_gefont.cpp

index 0ef80a307562a9328be8c15a43756eb8c5bba593..ed410765351a24561e65aac29224c845040ed587 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);

}

« no previous file with comments | « xfa/fgas/font/fgas_fontutils.cpp ('k') | xfa/fgas/font/fgas_stdfontmgr.cpp » ('j') | no next file with comments »