Shaping implementation fix.

Sets the font id to the glyphs when they are retrieved.

Change-Id: I50312207d0c4a6a0d7caa921263016ff523c2dbc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

diff --git a/text/dali/internal/text-abstraction/shaping-impl.cpp b/text/dali/internal/text-abstraction/shaping-impl.cpp
index 2a3001f..49c93b2 100644 (file)
--- a/text/dali/internal/text-abstraction/shaping-impl.cpp
+++ b/text/dali/internal/text-abstraction/shaping-impl.cpp
@@ -73,7 +73,8 @@ struct Shaping::Plugin
   : mFreeTypeLibrary( NULL ),
     mIndices(),
     mAdvance(),
-    mCharacterMap()
+    mCharacterMap(),
+    mFontId( 0u )
   {
   }
 
@@ -100,6 +101,7 @@ struct Shaping::Plugin
     mIndices.Clear();
     mAdvance.Clear();
     mCharacterMap.Clear();
+    mFontId = fontId;
 
     TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get();
 
@@ -172,6 +174,7 @@ struct Shaping::Plugin
       GlyphInfo& glyph = *( glyphInfo + index );
       CharacterIndex& glyphToCharacter = *( glyphToCharacterMap + index );
 
+      glyph.fontId = mFontId;
       glyph.index = *( indicesIt + index );
       glyph.advance = *( advanceIt + index );
 
@@ -184,6 +187,7 @@ struct Shaping::Plugin
   Vector<CharacterIndex> mIndices;
   Vector<float>          mAdvance;
   Vector<CharacterIndex> mCharacterMap;
+  FontId                 mFontId;
 };
 
 Shaping::Shaping()