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
This commit is contained in:
ctguil@chromium.org 2011-05-16 22:00:05 +00:00
Родитель f2d91557b2
Коммит f4c2622a1a
1 изменённых файлов: 4 добавлений и 2 удалений

Просмотреть файл

@ -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);