core/fxge/win32/fx_win32_device.cpp - Issue 1885973002: Remove implicit cast from CFX_ByteString to (const char*).

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: core/fxge/win32/fx_win32_device.cpp

Issue 1885973002: Remove implicit cast from CFX_ByteString to (const char*). (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Typo 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:

Index: core/fxge/win32/fx_win32_device.cpp

diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp

index 60ae57c767608eb0d5b9b5c32976a71e3904f41b..f8057e7d5d1e19d6c5d9a1c460a40694ae628750 100644

--- a/core/fxge/win32/fx_win32_device.cpp

+++ b/core/fxge/win32/fx_win32_device.cpp

@@ -350,7 +350,7 @@ void* CFX_Win32FontInfo::MapFont(int weight,

}

HFONT hFont =

::CreateFontA(-10, 0, 0, 0, weight, bItalic, 0, 0, charset,

- OUT_TT_ONLY_PRECIS, 0, 0, subst_pitch_family, face);

+ OUT_TT_ONLY_PRECIS, 0, 0, subst_pitch_family, face.c_str());

char facebuf[100];

HFONT hOldFont = (HFONT)::SelectObject(m_hDC, hFont);

::GetTextFaceA(m_hDC, 100, facebuf);

@@ -393,8 +393,9 @@ void* CFX_Win32FontInfo::MapFont(int weight,

}

break;

}

- hFont = ::CreateFontA(-10, 0, 0, 0, weight, bItalic, 0, 0, charset,

- OUT_TT_ONLY_PRECIS, 0, 0, subst_pitch_family, face);

+ hFont =

+ ::CreateFontA(-10, 0, 0, 0, weight, bItalic, 0, 0, charset,

+ OUT_TT_ONLY_PRECIS, 0, 0, subst_pitch_family, face.c_str());

return hFont;

}

void CFX_Win32FontInfo::DeleteFont(void* hFont) {

« no previous file with comments | « core/fxge/ge/fx_ge_fontmap.cpp ('k') | core/fxge/win32/fx_win32_gdipext.cpp » ('j') | no next file with comments »