From 63cf3e2c4e74b86fd0503f9ae4b19010e5676289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20B=C3=A9ron?= Date: Wed, 15 Sep 2004 18:03:32 +0000 Subject: [PATCH] Use the preferred FT_ENCODING values rather than ft_encoding. --- dlls/gdi/freetype.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/gdi/freetype.c b/dlls/gdi/freetype.c index 065e0b3a1e..3eaff3f876 100644 --- a/dlls/gdi/freetype.c +++ b/dlls/gdi/freetype.c @@ -139,6 +139,18 @@ MAKE_FUNCPTR(FcPatternGet); #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] ) @@ -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 */ for(i = 0; i < ft_face->num_charmaps; i++) { switch(ft_face->charmaps[i]->encoding) { - case ft_encoding_unicode: - case ft_encoding_apple_roman: + case FT_ENCODING_UNICODE: + case FT_ENCODING_APPLE_ROMAN: face->fs.fsCsb[0] |= 1; break; - case ft_encoding_symbol: + case FT_ENCODING_MS_SYMBOL: face->fs.fsCsb[0] |= 1L << 31; break; default: @@ -1858,14 +1870,14 @@ GdiFont WineEngCreateFontInstance(DC *dc, HFONT hfont) } 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 */ } - else if (!pFT_Select_Charmap(ret->ft_face, ft_encoding_unicode)) { + else if (!pFT_Select_Charmap(ret->ft_face, FT_ENCODING_UNICODE)) { /* No ops */ } 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;