diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-13 15:41:21 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-13 15:41:21 -0700 |
| commit | b4c9f3f04673753da30011e9f1282cd5d1fa0f40 (patch) | |
| tree | 9890d43409c8d60b1041de921c961067907419fb /core/fxge/win32 | |
| parent | cdce75706de7e76e73550a0582e1fd28af324fd0 (diff) | |
| download | pdfium-b4c9f3f04673753da30011e9f1282cd5d1fa0f40.tar.xz | |
Remove implicit cast from CFX_ByteString to (const char*).
BUG=
Review URL: https://codereview.chromium.org/1885973002
Diffstat (limited to 'core/fxge/win32')
| -rw-r--r-- | core/fxge/win32/fx_win32_device.cpp | 7 | ||||
| -rw-r--r-- | core/fxge/win32/fx_win32_gdipext.cpp | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp index 60ae57c767..f8057e7d5d 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) { diff --git a/core/fxge/win32/fx_win32_gdipext.cpp b/core/fxge/win32/fx_win32_gdipext.cpp index 4e52a8941a..15f0972bba 100644 --- a/core/fxge/win32/fx_win32_gdipext.cpp +++ b/core/fxge/win32/fx_win32_gdipext.cpp @@ -686,7 +686,7 @@ void CGdiplusExt::Load() { strPlusPath += buf; strPlusPath += "\\"; strPlusPath += "GDIPLUS.DLL"; - m_hModule = LoadLibraryA(strPlusPath); + m_hModule = LoadLibraryA(strPlusPath.c_str()); if (!m_hModule) { return; } |