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

evas/text: remove misleading comments on glyphs array refs 

SVN revision: 82665
This commit is contained in:
Ulisses Furquim 2013-01-11 19:56:49 +00:00
parent b9f05341c3
commit f0f9f7b7a6
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/evas/common/evas_font_draw.c
View File

@ -299,13 +299,7 @@ evas_common_font_draw_prepare(Evas_Text_Props *text_props)
if (!reused_glyphs) if (!reused_glyphs)
{ {
/* if (text_props->glyphs) evas_common_font_glyphs_unref(text_props->glyphs);
* Clearing the reference to the glyph array is fine, since this
* reference is only used to use this from another thread, which is now
* holding the reference.
*/
if (text_props->glyphs)
evas_common_font_glyphs_unref(text_props->glyphs);
text_props->glyphs = malloc(sizeof(*text_props->glyphs)); text_props->glyphs = malloc(sizeof(*text_props->glyphs));
if (!text_props->glyphs) goto error; if (!text_props->glyphs) goto error;

6
src/lib/evas/common/evas_text_utils.c
View File

@ -68,10 +68,8 @@ evas_common_text_props_content_nofree_unref(Evas_Text_Props *props)
} }
evas_common_font_glyphs_unref(props->glyphs); evas_common_font_glyphs_unref(props->glyphs);
/* After unreferencing the glyph array, a thread will still hold
* a reference, so this can be safely set to NULL. */
props->glyphs = NULL; props->glyphs = NULL;
if (props->info->glyph) if (props->info->glyph)
free(props->info->glyph); free(props->info->glyph);
#ifdef OT_SUPPORT #ifdef OT_SUPPORT
@ -91,8 +89,6 @@ evas_common_text_props_content_unref(Evas_Text_Props *props)
return; return;
if (props->glyphs) evas_common_font_glyphs_unref(props->glyphs); if (props->glyphs) evas_common_font_glyphs_unref(props->glyphs);
/* After unreferencing the glyph array, a thread will still hold
* a reference, so this can be safely set to NULL. */
props->glyphs = NULL; props->glyphs = NULL;
if (--(props->info->refcount) == 0) if (--(props->info->refcount) == 0)