mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-07 09:54:05 +00:00
dwrite: Recognize CFF2 table as CFF variant.
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
d8e42057e0
commit
c4d9176196
|
@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite);
|
|||
#define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e')
|
||||
#define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f')
|
||||
#define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ')
|
||||
#define MS_CFF2_TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F','2')
|
||||
#define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R')
|
||||
#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ')
|
||||
#define MS_SBIX_TAG DWRITE_MAKE_OPENTYPE_TAG('s','b','i','x')
|
||||
|
@ -2217,7 +2218,8 @@ UINT32 opentype_get_glyph_image_formats(IDWriteFontFace4 *fontface)
|
|||
if (opentype_has_font_table(fontface, MS_GLYF_TAG))
|
||||
ret |= DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE;
|
||||
|
||||
if (opentype_has_font_table(fontface, MS_CFF__TAG))
|
||||
if (opentype_has_font_table(fontface, MS_CFF__TAG) ||
|
||||
opentype_has_font_table(fontface, MS_CFF2_TAG))
|
||||
ret |= DWRITE_GLYPH_IMAGE_FORMATS_CFF;
|
||||
|
||||
if (opentype_has_font_table(fontface, MS_COLR_TAG))
|
||||
|
|
|
@ -44,6 +44,7 @@
|
|||
#define MS_KERN_TAG DWRITE_MAKE_OPENTYPE_TAG('k','e','r','n')
|
||||
#define MS_GLYF_TAG DWRITE_MAKE_OPENTYPE_TAG('g','l','y','f')
|
||||
#define MS_CFF__TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F',' ')
|
||||
#define MS_CFF2_TAG DWRITE_MAKE_OPENTYPE_TAG('C','F','F','2')
|
||||
#define MS_COLR_TAG DWRITE_MAKE_OPENTYPE_TAG('C','O','L','R')
|
||||
#define MS_SVG__TAG DWRITE_MAKE_OPENTYPE_TAG('S','V','G',' ')
|
||||
#define MS_SBIX_TAG DWRITE_MAKE_OPENTYPE_TAG('s','b','i','x')
|
||||
|
@ -8048,7 +8049,8 @@ static DWORD get_face_glyph_image_formats(IDWriteFontFace4 *fontface)
|
|||
if (face_has_table(fontface, MS_GLYF_TAG))
|
||||
ret |= DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE;
|
||||
|
||||
if (face_has_table(fontface, MS_CFF__TAG))
|
||||
if (face_has_table(fontface, MS_CFF__TAG) ||
|
||||
face_has_table(fontface, MS_CFF2_TAG))
|
||||
ret |= DWRITE_GLYPH_IMAGE_FORMATS_CFF;
|
||||
|
||||
if (face_has_table(fontface, MS_COLR_TAG))
|
||||
|
|
Loading…
Reference in a new issue