This commit is contained in:
rachytski 2011-10-28 16:15:36 +03:00 committed by Alex Zolotarev
parent 8443aba6be
commit fb96e2b77f
3 changed files with 8 additions and 4 deletions

View file

@ -218,19 +218,20 @@ namespace yg
};
FT_Glyph glyph = 0;
FTC_Node node;
// FTC_Node node;
GlyphInfo * info = 0;
if (key.m_isMask)
{
FTCHECK(FTC_ImageCache_LookupScaler(
m_impl->m_normalGlyphCache,
m_impl->m_strokedGlyphCache,
&fontScaler,
FT_LOAD_DEFAULT,
charIDX.second,
&glyph,
&node
0
//&node
));
FTCHECK(FT_Glyph_Stroke(&glyph, m_impl->m_stroker, 0));
FTCHECK(FT_Glyph_To_Bitmap(&glyph, FT_RENDER_MODE_NORMAL, 0, 1));
@ -245,7 +246,8 @@ namespace yg
FT_LOAD_DEFAULT | FT_LOAD_RENDER,
charIDX.second,
&glyph,
&node
0
//&node
));
// info = new FTGlyphInfo(node, m_impl->m_manager);

View file

@ -388,6 +388,7 @@ namespace yg
FTCHECK(FTC_Manager_New(m_lib, 3, 10, params.m_maxSize, &RequestFace, 0, &m_manager));
FTCHECK(FTC_ImageCache_New(m_manager, &m_normalGlyphCache));
FTCHECK(FTC_ImageCache_New(m_manager, &m_strokedGlyphCache));
FTCHECK(FTC_ImageCache_New(m_manager, &m_glyphMetricsCache));
/// Initializing stroker

View file

@ -62,6 +62,7 @@ namespace yg
FTC_ImageCache m_glyphMetricsCache; //< glyph metrics cache
FTC_ImageCache m_normalGlyphCache; //< cache of normal glyph images
FTC_ImageCache m_strokedGlyphCache; //< cache of stroked glyph images
FTC_CMapCache m_charMapCache; //< cache of glyphID -> glyphIdx mapping