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

dwrite: Use right charmap for symbol encoding.

This commit is contained in:
Nikolay Sivov 2015-08-06 18:03:12 +03:00 committed by Alexandre Julliard
parent ab7c65ae43
commit 8133684816
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dwrite/dwrite_private.h
View File

@ -190,7 +190,7 @@ extern void freetype_notify_cacheremove(IDWriteFontFace2*) DECLSPEC_HIDDEN;
extern BOOL freetype_is_monospaced(IDWriteFontFace2*) DECLSPEC_HIDDEN;
extern HRESULT freetype_get_glyph_outline(IDWriteFontFace2*,FLOAT,UINT16,USHORT,struct glyph_outline**) DECLSPEC_HIDDEN;
extern UINT16 freetype_get_glyphcount(IDWriteFontFace2*) DECLSPEC_HIDDEN;
extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32) DECLSPEC_HIDDEN;
extern UINT16 freetype_get_glyphindex(IDWriteFontFace2*,UINT32,INT) DECLSPEC_HIDDEN;
extern BOOL freetype_has_kerning_pairs(IDWriteFontFace2*) DECLSPEC_HIDDEN;
extern INT32 freetype_get_kerning_pair_adjustment(IDWriteFontFace2*,UINT16,UINT16) DECLSPEC_HIDDEN;
extern void freetype_get_glyph_bbox(IDWriteFontFace2*,FLOAT,UINT16,BOOL,RECT*) DECLSPEC_HIDDEN;

2
dlls/dwrite/font.c
View File

@ -469,7 +469,7 @@ static HRESULT WINAPI dwritefontface_GetGlyphIndices(IDWriteFontFace2 *iface, UI
}
for (i = 0; i < count; i++)
glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i]);
glyph_indices[i] = freetype_get_glyphindex(iface, codepoints[i], This->charmap);
return S_OK;
}

14
dlls/dwrite/freetype.c
View File

@ -437,12 +437,20 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface)
return count;
}
UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint)
UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint, INT charmap)
{
UINT16 glyph;
EnterCriticalSection(&freetype_cs);
glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, -1, codepoint);
if (charmap == -1)
glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, charmap, codepoint);
else {
/* special handling for symbol fonts */
if (codepoint < 0x100) codepoint += 0xf000;
glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, charmap, codepoint);
if (!glyph)
glyph = pFTC_CMapCache_Lookup(cmap_cache, fontface, charmap, codepoint - 0xf000);
}
LeaveCriticalSection(&freetype_cs);
return glyph;
@ -627,7 +635,7 @@ UINT16 freetype_get_glyphcount(IDWriteFontFace2 *fontface)
return 0;
}
UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint)
UINT16 freetype_get_glyphindex(IDWriteFontFace2 *fontface, UINT32 codepoint, INT charmap)
{
return 0;
}