Evas font-engine: Remove the useless RGBA_Font_Source hb.face.

SVN revision: 59403

diff --git a/legacy/evas/src/lib/engines/common/evas_font_load.c b/legacy/evas/src/lib/engines/common/evas_font_load.c
index 079771f934f44e21842b63a938a50a81a87336c9..48d3df02ff47c4b85b62b582b34ada3fb523aede 100644 (file)
--- a/legacy/evas/src/lib/engines/common/evas_font_load.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_load.c
@@ -52,9 +52,6 @@ _evas_common_font_source_free(RGBA_Font_Source *fs)
    FTLOCK();
    FT_Done_Face(fs->ft.face);
    FTUNLOCK();
-#ifdef OT_SUPPORT
-   evas_common_font_ot_unload_face(fs);
-#endif
    if (fs->name) eina_stringshare_del(fs->name);
    if (fs->file) eina_stringshare_del(fs->file);
    free(fs);
@@ -143,9 +140,6 @@ evas_common_font_source_memory_load(const char *name, const void *data, int data
       free(fs);
       return NULL;
     }
-#ifdef OT_SUPPORT
-  evas_common_font_ot_load_face(fs);
-#endif
    FTUNLOCK();
    fs->ft.orig_upem = fs->ft.face->units_per_EM;
    fs->references = 1;
@@ -179,9 +173,6 @@ evas_common_font_source_unload(RGBA_Font_Source *fs)
    FTLOCK();
    FT_Done_Face(fs->ft.face);
    fs->ft.face = NULL;
-#ifdef OT_SUPPORT
-   evas_common_font_ot_unload_face(fs);
-#endif
    FTUNLOCK();
 }
 
@@ -231,9 +222,6 @@ evas_common_font_source_load_complete(RGBA_Font_Source *fs)
        fs->ft.face = NULL;
        return error;
      }
-#ifdef OT_SUPPORT
-   evas_common_font_ot_load_face(fs);
-#endif
    FTUNLOCK();
    fs->ft.orig_upem = fs->ft.face->units_per_EM;
    return error;

diff --git a/legacy/evas/src/lib/engines/common/evas_font_ot.c b/legacy/evas/src/lib/engines/common/evas_font_ot.c
index c3e4c866023ecf977f871b5ebe8879e821c342e2..edeb6cdd74ae6d6c1b9cae22f3805aaefdd33feb 100644 (file)
--- a/legacy/evas/src/lib/engines/common/evas_font_ot.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_ot.c
@@ -178,24 +178,6 @@ evas_common_font_ot_cluster_size_get(const Evas_Text_Props *props, size_t char_i
    return (items > 0) ? items : 1;
 }
 
-EAPI void
-evas_common_font_ot_load_face(void *_font)
-{
-   RGBA_Font_Source *font = (RGBA_Font_Source *) _font;
-   /* Unload the face if by any chance it's already loaded */
-   evas_common_font_ot_unload_face(font);
-   font->hb.face = hb_ft_face_create(font->ft.face, NULL);
-}
-
-EAPI void
-evas_common_font_ot_unload_face(void *_font)
-{
-   RGBA_Font_Source *font = (RGBA_Font_Source *) _font;
-   if (!font->hb.face) return;
-   hb_face_destroy(font->hb.face);
-   font->hb.face = NULL;
-}
-
 /* Harfbuzz font functions */
 
 static void

diff --git a/legacy/evas/src/lib/engines/common/evas_font_ot.h b/legacy/evas/src/lib/engines/common/evas_font_ot.h
index 9cf0148f90e77d357e9ef18e1398440656c0e2a4..adbe54d5fd9e1a9cbf2fafb798cd1690151c8b7e 100644 (file)
--- a/legacy/evas/src/lib/engines/common/evas_font_ot.h
+++ b/legacy/evas/src/lib/engines/common/evas_font_ot.h
@@ -34,12 +34,6 @@ struct _Evas_Font_OT_Info
 #  define EVAS_FONT_OT_POS_GET(a)   ((a).source_cluster)
 # endif
 
-EAPI void
-evas_common_font_ot_load_face(void *_font);
-
-EAPI void
-evas_common_font_ot_unload_face(void *_font);
-
 # include "evas_text_utils.h"
 EAPI int
 evas_common_font_ot_cluster_size_get(const Evas_Text_Props *props, size_t char_index);

diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h
index fb022cb747623fc92ecf3d498fcc5d9d569c5eac..2ca80269def0ec8c6815cc1fbf11d4d0529a8f61 100644 (file)
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@@ -906,11 +906,6 @@ struct _RGBA_Font_Source
       int            orig_upem;
       FT_Face        face;
    } ft;
-#ifdef OT_SUPPORT
-   struct {
-      void *face;
-   } hb;
-#endif
 };
 
 struct _RGBA_Font_Glyph