From f4c2622a1a3489988f2d85a81fdc132b17a92bdd Mon Sep 17 00:00:00 2001 From: "ctguil@chromium.org" Date: Mon, 16 May 2011 22:00:05 +0000 Subject: [PATCH] Use SkSetFourByteTag in SkFontHost_win.cpp. Review URL: http://codereview.appspot.com/4535075 git-svn-id: http://skia.googlecode.com/svn/trunk@1340 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/ports/SkFontHost_win.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index d9404f394..e274a9884 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -83,7 +83,8 @@ static inline FIXED SkScalarToFIXED(SkScalar x) { static unsigned calculateGlyphCount(HDC hdc) { // The 'maxp' table stores the number of glyphs at offset 4, in 2 bytes. - const DWORD maxpTag = *(DWORD*) "maxp"; + const DWORD maxpTag = + SkEndian_SwapBE32(SkSetFourByteTag('m', 'a', 'x', 'p')); uint16_t glyphs; if (GetFontData(hdc, maxpTag, 4, &glyphs, sizeof(glyphs)) != GDI_ERROR) { return SkEndian_SwapBE16(glyphs); @@ -790,7 +791,8 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) { } SkStream* SkFontHost::OpenStream(SkFontID uniqueID) { - const DWORD kTTCTag = *(DWORD*) "ttcf"; + const DWORD kTTCTag = + SkEndian_SwapBE32(SkSetFourByteTag('t', 't', 'c', 'f')); LOGFONT lf; GetLogFontByID(uniqueID, &lf);