From fb96e2b77f41126d88a7c72a24dc199fef9a4c73 Mon Sep 17 00:00:00 2001 From: rachytski Date: Fri, 28 Oct 2011 16:15:36 +0300 Subject: [PATCH] closes #375 --- yg/glyph_cache.cpp | 10 ++++++---- yg/glyph_cache_impl.cpp | 1 + yg/glyph_cache_impl.hpp | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/yg/glyph_cache.cpp b/yg/glyph_cache.cpp index 9d946280a4..2f590f8a51 100644 --- a/yg/glyph_cache.cpp +++ b/yg/glyph_cache.cpp @@ -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); diff --git a/yg/glyph_cache_impl.cpp b/yg/glyph_cache_impl.cpp index 2d072fce0b..88f73f0a24 100644 --- a/yg/glyph_cache_impl.cpp +++ b/yg/glyph_cache_impl.cpp @@ -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 diff --git a/yg/glyph_cache_impl.hpp b/yg/glyph_cache_impl.hpp index e283b1e873..8d479e9f9f 100644 --- a/yg/glyph_cache_impl.hpp +++ b/yg/glyph_cache_impl.hpp @@ -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