gdi32: Relax vertical face requirements.
This commit is contained in:
parent
142a0f7af0
commit
ebccff8225
|
@ -2148,6 +2148,9 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
|
||||||
#endif /* HAVE_CARBON_CARBON_H */
|
#endif /* HAVE_CARBON_CARBON_H */
|
||||||
|
|
||||||
do {
|
do {
|
||||||
|
const DWORD FS_DBCS_MASK = FS_JISJAPAN|FS_CHINESESIMP|FS_WANSUNG|FS_CHINESETRAD|FS_JOHAB;
|
||||||
|
FONTSIGNATURE fs;
|
||||||
|
|
||||||
ft_face = new_ft_face( file, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP );
|
ft_face = new_ft_face( file, font_data_ptr, font_data_size, face_index, flags & ADDFONT_ALLOW_BITMAP );
|
||||||
if (!ft_face) return 0;
|
if (!ft_face) return 0;
|
||||||
|
|
||||||
|
@ -2161,7 +2164,8 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_
|
||||||
AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags);
|
AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index, flags);
|
||||||
++ret;
|
++ret;
|
||||||
|
|
||||||
if (FT_HAS_VERTICAL(ft_face))
|
get_fontsig(ft_face, &fs);
|
||||||
|
if (fs.fsCsb[0] & FS_DBCS_MASK)
|
||||||
{
|
{
|
||||||
AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index,
|
AddFaceToList(ft_face, file, font_data_ptr, font_data_size, face_index,
|
||||||
flags | ADDFONT_VERTICAL_FONT);
|
flags | ADDFONT_VERTICAL_FONT);
|
||||||
|
|
Loading…
Reference in New Issue