From: Tom Hacohen <tom@stosb.com>
Date: Wed, 18 May 2011 13:47:37 +0000 (+0000)
Subject: Evas font-engine: Remove useless if, it's never a bitmap.
X-Git-Tag: submit/devel/efl/20131022.203902~9517
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ad5cdfb892e43adb300aac0c1664326bd6fded2;p=platform%2Fupstream%2Fefl.git

Evas font-engine: Remove useless if, it's never a bitmap.

SVN revision: 59506
---

diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/legacy/evas/src/lib/engines/common/evas_font_main.c
index 159b0a9..51223be 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_main.c
@@ -389,21 +389,20 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt index)
         if (fi->fash) _fash_gl_add(fi->fash, index, (void *)(-1));
 	return NULL;
      }
-   if (fg->glyph->format != FT_GLYPH_FORMAT_BITMAP)
+
+   FTLOCK();
+   error = FT_Glyph_To_Bitmap(&(fg->glyph), FT_RENDER_MODE_NORMAL, 0, 1);
+   if (error)
      {
-        FTLOCK();
-	error = FT_Glyph_To_Bitmap(&(fg->glyph), FT_RENDER_MODE_NORMAL, 0, 1);
-	if (error)
-	  {
-	     FT_Done_Glyph(fg->glyph);
-             FTUNLOCK();
-	     free(fg);
-             if (!fi->fash) fi->fash = _fash_gl_new();
-             if (fi->fash) _fash_gl_add(fi->fash, index, (void *)(-1));
-	     return NULL;
-	  }
+        FT_Done_Glyph(fg->glyph);
         FTUNLOCK();
+        free(fg);
+        if (!fi->fash) fi->fash = _fash_gl_new();
+        if (fi->fash) _fash_gl_add(fi->fash, index, (void *)(-1));
+        return NULL;
      }
+   FTUNLOCK();
+
    fg->glyph_out = (FT_BitmapGlyph)fg->glyph;
    fg->index = hindex;
    fg->fi = fi;