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

Use the preferred FT_ENCODING values rather than ft_encoding.

This commit is contained in:
Vincent Béron 2004-09-15 18:03:32 +00:00 committed by Alexandre Julliard
parent ca27b29f92
commit 63cf3e2c4e
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/gdi/freetype.c
View File

@ -139,6 +139,18 @@ MAKE_FUNCPTR(FcPatternGet);
#undef MAKE_FUNCPTR #undef MAKE_FUNCPTR
#ifndef FT_ENCODING_NONE
#define FT_ENCODING_NONE ft_encoding_none
#endif
#ifndef FT_ENCODING_MS_SYMBOL
#define FT_ENCODING_MS_SYMBOL ft_encoding_symbol
#endif
#ifndef FT_ENCODING_UNICODE
#define FT_ENCODING_UNICODE ft_encoding_unicode
#endif
#ifndef FT_ENCODING_APPLE_ROMAN
#define FT_ENCODING_APPLE_ROMAN ft_encoding_apple_roman
#endif
#define GET_BE_WORD(ptr) MAKEWORD( ((BYTE *)(ptr))[1], ((BYTE *)(ptr))[0] ) #define GET_BE_WORD(ptr) MAKEWORD( ((BYTE *)(ptr))[1], ((BYTE *)(ptr))[0] )
@ -572,11 +584,11 @@ static BOOL AddFontFileToList(const char *file, char *fake_family, DWORD flags)
if(face->fs.fsCsb[0] == 0) { /* let's see if we can find any interesting cmaps */ if(face->fs.fsCsb[0] == 0) { /* let's see if we can find any interesting cmaps */
for(i = 0; i < ft_face->num_charmaps; i++) { for(i = 0; i < ft_face->num_charmaps; i++) {
switch(ft_face->charmaps[i]->encoding) { switch(ft_face->charmaps[i]->encoding) {
case ft_encoding_unicode: case FT_ENCODING_UNICODE:
case ft_encoding_apple_roman: case FT_ENCODING_APPLE_ROMAN:
face->fs.fsCsb[0] |= 1; face->fs.fsCsb[0] |= 1;
break; break;
case ft_encoding_symbol: case FT_ENCODING_MS_SYMBOL:
face->fs.fsCsb[0] |= 1L << 31; face->fs.fsCsb[0] |= 1L << 31;
break; break;
default: default:
@ -1858,14 +1870,14 @@ GdiFont WineEngCreateFontInstance(DC *dc, HFONT hfont)
} }
if (ret->charset == SYMBOL_CHARSET && if (ret->charset == SYMBOL_CHARSET &&
!pFT_Select_Charmap(ret->ft_face, ft_encoding_symbol)) { !pFT_Select_Charmap(ret->ft_face, FT_ENCODING_MS_SYMBOL)) {
/* No ops */ /* No ops */
} }
else if (!pFT_Select_Charmap(ret->ft_face, ft_encoding_unicode)) { else if (!pFT_Select_Charmap(ret->ft_face, FT_ENCODING_UNICODE)) {
/* No ops */ /* No ops */
} }
else { else {
pFT_Select_Charmap(ret->ft_face, ft_encoding_apple_roman); pFT_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;