From 3f0411265a8c539bd5f26af45d1bd49b875ca98c Mon Sep 17 00:00:00 2001
From: Tom Hacohen <tom@stosb.com>
Date: Tue, 3 May 2011 16:18:17 +0000
Subject: [PATCH] Evas font-engine: Fix size activation of fi in
 content_create.

SVN revision: 59153
---
 .../evas/src/lib/engines/common/evas_text_utils.c  | 32 +++++++---------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/legacy/evas/src/lib/engines/common/evas_text_utils.c b/legacy/evas/src/lib/engines/common/evas_text_utils.c
index f49eb9a..adec51d 100644
--- a/legacy/evas/src/lib/engines/common/evas_text_utils.c
+++ b/legacy/evas/src/lib/engines/common/evas_text_utils.c
@@ -188,16 +188,6 @@ evas_common_text_props_content_create(void *_fn, const Eina_Unicode *text,
    text_props->info = calloc(1, sizeof(Evas_Text_Props_Info));
 
    fi = fn->fonts->data;
-   /* evas_common_font_size_use(fn); */
-   evas_common_font_int_reload(fi);
-   if (fi->src->current_size != fi->size)
-     {
-        FTLOCK();
-        FT_Activate_Size(fi->ft.size);
-        FTUNLOCK();
-        fi->src->current_size = fi->size;
-     }
-
    /* Load the glyph according to the first letter of the script, pretty
     * bad, but will have to do */
      {
@@ -210,11 +200,21 @@ evas_common_text_props_content_create(void *_fn, const Eina_Unicode *text,
              base_char++)
            ;
         if (!*base_char && (base_char > text)) base_char--;
+
         evas_common_font_glyph_search(fn, &fi, *base_char);
      }
 
    text_props->font_instance = fi;
 
+   evas_common_font_int_reload(fi);
+   if (fi->src->current_size != fi->size)
+     {
+        FTLOCK();
+        FT_Activate_Size(fi->ft.size);
+        FTUNLOCK();
+        fi->src->current_size = fi->size;
+     }
+
 #ifdef OT_SUPPORT
    size_t char_index;
    Evas_Font_Glyph_Info *gl_itr;
@@ -332,18 +332,6 @@ evas_common_text_props_content_create(void *_fn, const Eina_Unicode *text,
              index = evas_common_get_char_index(fi, REPLACEMENT_CHAR);
           }
 
-        /* Should we really set the size per fi? This fixes a bug for Korean
-         * because for some reason different fis are chosen for different
-         * chars in some cases. But we should find the source of the problem
-         * and not just fix the symptom. */
-        if (fi->src->current_size != fi->size)
-          {
-             FTLOCK();
-             FT_Activate_Size(fi->ft.size);
-             FTUNLOCK();
-             fi->src->current_size = fi->size;
-          }
-
         LKL(fi->ft_mutex);
         fg = evas_common_font_int_cache_glyph_get(fi, index);
         if (!fg)
-- 
2.7.4