From f5c67f500f98a760a0d0cecce519d3d70b65a066 Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Thu, 27 Jan 2011 20:41:33 +0200
Subject: [PATCH] "God's Rainbow" Fixes

---
 yg/geometry_batcher.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/yg/geometry_batcher.cpp b/yg/geometry_batcher.cpp
index acb104c8ea..311188262e 100644
--- a/yg/geometry_batcher.cpp
+++ b/yg/geometry_batcher.cpp
@@ -752,15 +752,15 @@ namespace yg
      }
 
      size_t const count = text.size();
-     vector<CharStyle const *> glyphs(count);
+
+     vector<GlyphMetrics> glyphs(count);
 
      // get vector of glyphs and calculate string length
      double strLength = 0.0;
      for (size_t i = 0; i < count; ++i)
      {
-       uint32_t const glyphID = m_skin->mapGlyph(GlyphKey(text[i], fontSize, fromMask), isFixedFont);
-       glyphs[i] = static_cast<CharStyle const *>(m_skin->fromID(glyphID));
-       strLength += glyphs[i]->m_xAdvance;
+       glyphs[i] = resourceManager()->getGlyphMetrics(GlyphKey(text[i], fontSize, fromMask));
+       strLength += glyphs[i].m_xAdvance;
      }
 
      // offset of the text from path's start
@@ -772,7 +772,7 @@ namespace yg
      // find first visible glyph
      size_t i = 0;
      while (offset < 0 && i < count)
-       offset += glyphs[i++]->m_xAdvance;
+       offset += glyphs[i++].m_xAdvance;
 
      size_t ind = 0;
      m2::PointD ptOrg = arrPath[0];
@@ -784,9 +784,12 @@ namespace yg
        if (!CalcPointAndAngle(arrPath, offset, ind, ptOrg, angle))
          break;
 
-       drawGlyph(ptOrg, m2::PointD(0.0, 0.0), angle, blOffset, glyphs[i], depth);
+       uint32_t const glyphID = m_skin->mapGlyph(GlyphKey(text[i], fontSize, fromMask), isFixedFont);
+       CharStyle const * charStyle = static_cast<CharStyle const *>(m_skin->fromID(glyphID));
 
-       offset = glyphs[i]->m_xAdvance;
+       drawGlyph(ptOrg, m2::PointD(0.0, 0.0), angle, blOffset, charStyle, depth);
+
+       offset = glyphs[i].m_xAdvance;
      }
 
      return true;