From: Victor Cebollada <v.cebollada@samsung.com>
Date: Fri, 17 Feb 2017 16:07:56 +0000 (+0000)
Subject: [3.0] Use IsGlyphColor().
X-Git-Tag: accepted/tizen/3.0/common/20170228.061425~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F116051%2F2;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[3.0] Use IsGlyphColor().

* It uses the IsGlyphColor() method instead
  creating a new bitmap and check if it's a
  color one.

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

diff --git a/dali-toolkit/internal/text/multi-language-support-impl.cpp b/dali-toolkit/internal/text/multi-language-support-impl.cpp
index c803c1d..ab4b388 100644
--- a/dali-toolkit/internal/text/multi-language-support-impl.cpp
+++ b/dali-toolkit/internal/text/multi-language-support-impl.cpp
@@ -594,10 +594,8 @@ void MultilanguageSupport::ValidateFonts( const Vector<Character>& text,
           if( isValidFont &&
               isEmojiScript )
           {
-            const PixelData bitmap = fontClient.CreateBitmap( fontId, glyphIndex );
-
-            // For color emojis, the font is valid if the bitmap is RGBA.
-            isValidFont = bitmap && ( Pixel::BGRA8888 == bitmap.GetPixelFormat() );
+            // For color emojis, the font is valid if the glyph is a color glyph (the bitmap is RGBA).
+            isValidFont = fontClient.IsColorGlyph( fontId, glyphIndex );
           }
 
           // If there is a valid font, cache it.