bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

SVN revision: 59403
This commit is contained in:
Tom Hacohen 2011-05-15 11:59:58 +00:00
parent 726d37b782
commit 44b8ca79a4
4 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
legacy/evas/src/lib/engines/common/evas_font_load.c
View File

@ -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;

18
legacy/evas/src/lib/engines/common/evas_font_ot.c
View File

@ -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

6
legacy/evas/src/lib/engines/common/evas_font_ot.h
View File

@ -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);

5
legacy/evas/src/lib/include/evas_common.h
View File

@ -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