ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Simplify the code for charmap selection.

Browse Source
This commit is contained in:
Huw Davies 2012-10-26 14:04:04 +01:00 committed by Alexandre Julliard
parent 79a30a4e0a
commit 8ef70039d3
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/gdi32/freetype.c
View File

@ -4408,6 +4408,21 @@ static BOOL freetype_DeleteDC( PHYSDEV dev )
return TRUE; return TRUE;
} }
static FT_Encoding pick_charmap( FT_Face face, int charset )
{
static const FT_Encoding regular_order[] = { FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 };
static const FT_Encoding symbol_order[] = { FT_ENCODING_MS_SYMBOL, FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 };
const FT_Encoding *encs = regular_order;
if (charset == SYMBOL_CHARSET) encs = symbol_order;
while (*encs != 0)
{
if (select_charmap( face, *encs )) break;
encs++;
}
return *encs;
}
/************************************************************* /*************************************************************
* freetype_SelectFont * freetype_SelectFont
@ -4824,16 +4839,7 @@ found_face:
ret->ntmFlags = face->ntmFlags; ret->ntmFlags = face->ntmFlags;
if (ret->charset == SYMBOL_CHARSET && pick_charmap( ret->ft_face, ret->charset );
select_charmap(ret->ft_face, FT_ENCODING_MS_SYMBOL)) {
/* No ops */
}
else if (select_charmap(ret->ft_face, FT_ENCODING_UNICODE)) {
/* No ops */
}
else {
select_charmap(ret->ft_face, FT_ENCODING_APPLE_ROMAN);
}
ret->orientation = FT_IS_SCALABLE(ret->ft_face) ? lf.lfOrientation : 0; ret->orientation = FT_IS_SCALABLE(ret->ft_face) ? lf.lfOrientation : 0;
ret->name = psub ? strdupW(psub->from.name) : strdupW(family->FamilyName); ret->name = psub ? strdupW(psub->from.name) : strdupW(family->FamilyName);