From cb6c2f4667666b349f5eeb4f4fff978f3212d406 Mon Sep 17 00:00:00 2001 From: "bungeman@google.com" Date: Thu, 20 Oct 2011 22:23:38 +0000 Subject: Just use ExtTextOutW for glyphs. http://codereview.appspot.com/5308047/ git-svn-id: http://skia.googlecode.com/svn/trunk@2512 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkFontHost_win.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index fdd522d253..480321f512 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -406,11 +406,7 @@ const void* HDCOffscreen::draw(const SkGlyph& glyph, bool isBW, SetWorldTransform(fDC, &xform); uint16_t glyphID = glyph.getGlyphID(); -#if defined(UNICODE) - ExtTextOut(fDC, 0, 0, ETO_GLYPH_INDEX, NULL, (LPCWSTR)&glyphID, 1, NULL); -#else - ExtTextOut(fDC, 0, 0, ETO_GLYPH_INDEX, NULL, (LPCSTR)&glyphID, 1, NULL); -#endif + ExtTextOutW(fDC, 0, 0, ETO_GLYPH_INDEX, NULL, reinterpret_cast(&glyphID), 1, NULL); GdiFlush(); *srcRBPtr = srcRB; -- cgit v1.2.3