From 78c74266c0206b939cd0578f3b4b413f10ba1a1f Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Thu, 24 Nov 2011 16:16:07 +0400
Subject: [PATCH] using new StrokedImageCache.

---
 yg/glyph_cache.cpp      | 23 +++--------------------
 yg/glyph_cache_impl.cpp |  2 +-
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/yg/glyph_cache.cpp b/yg/glyph_cache.cpp
index 21bcdad7f9..1449314207 100644
--- a/yg/glyph_cache.cpp
+++ b/yg/glyph_cache.cpp
@@ -75,19 +75,6 @@ namespace yg
     }
   };
 
-  struct FTStrokedGlyphInfo : GlyphInfo
-  {
-    FT_Glyph m_glyph;
-
-    FTStrokedGlyphInfo(FT_Glyph glyph) : m_glyph(glyph)
-    {}
-
-    ~FTStrokedGlyphInfo()
-    {
-      FT_Done_Glyph(m_glyph);
-    }
-  };
-
   GlyphCache::Params::Params(string const & blocksFile, string const & whiteListFile, string const & blackListFile, size_t maxSize)
     : m_blocksFile(blocksFile), m_whiteListFile(whiteListFile), m_blackListFile(blackListFile), m_maxSize(maxSize)
   {}
@@ -224,19 +211,18 @@ namespace yg
 
     if (key.m_isMask)
     {
-      FTCHECK(FTC_ImageCache_LookupScaler(
+      FTCHECK(FTC_StrokedImageCache_LookupScaler(
           m_impl->m_strokedGlyphCache,
           &fontScaler,
+          m_impl->m_stroker,
           FT_LOAD_DEFAULT,
           charIDX.second,
           &glyph,
           0
           //&node
           ));
-      FTCHECK(FT_Glyph_Stroke(&glyph, m_impl->m_stroker, 0));
-      FTCHECK(FT_Glyph_To_Bitmap(&glyph, FT_RENDER_MODE_NORMAL, 0, 1));
 
-//      info = new FTStrokedGlyphInfo(glyph);
+//      info = new FTGlyphInfo(node, m_impl->m_manager);
     }
     else
     {
@@ -279,9 +265,6 @@ namespace yg
       memcpy(info->m_bitmapData, bitmapGlyph->bitmap.buffer, info->m_bitmapPitch * info->m_metrics.m_height);
     }
 
-    if (key.m_isMask)
-      FT_Done_Glyph(glyph);
-
     return make_shared_ptr(info);
   }
 
diff --git a/yg/glyph_cache_impl.cpp b/yg/glyph_cache_impl.cpp
index e18796b6c1..bb54a432a7 100644
--- a/yg/glyph_cache_impl.cpp
+++ b/yg/glyph_cache_impl.cpp
@@ -392,7 +392,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_StrokedImageCache_New(m_manager, &m_strokedGlyphCache));
     FTCHECK(FTC_ImageCache_New(m_manager, &m_glyphMetricsCache));
 
     /// Initializing stroker