summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-11-29 05:36:56 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-11-29 05:36:56 +0000
commitcbb6b39466070bde79d713221691c5b8f52a1ac8 (patch)
treeff1d3735ba1dcf1199c102f551666ebb85d29ed8 /src
parent06b9a559b4651e85ba7a5041fce68afc0dd48a57 (diff)
evas: only destroy font instance when we don't reference font anymore.
SVN revision: 79806
Diffstat (limited to 'src')
-rw-r--r--src/lib/evas/common/evas_text_utils.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c
index 7abf07fa6f..0134bd8170 100644
--- a/src/lib/evas/common/evas_text_utils.c
+++ b/src/lib/evas/common/evas_text_utils.c
@@ -89,12 +89,6 @@ evas_common_text_props_content_unref(Evas_Text_Props *props)
89 /* No content in this case */ 89 /* No content in this case */
90 if (!props->info) 90 if (!props->info)
91 return; 91 return;
92
93 if (props->font_instance)
94 {
95 evas_common_font_int_unref(props->font_instance);
96 props->font_instance = NULL;
97 }
98 92
99 free(props->glyphs); 93 free(props->glyphs);
100 props->glyphs = NULL; 94 props->glyphs = NULL;
@@ -102,6 +96,12 @@ evas_common_text_props_content_unref(Evas_Text_Props *props)
102 96
103 if (--(props->info->refcount) == 0) 97 if (--(props->info->refcount) == 0)
104 { 98 {
99 if (props->font_instance)
100 {
101 evas_common_font_int_unref(props->font_instance);
102 props->font_instance = NULL;
103 }
104
105 if (props->info->glyph) 105 if (props->info->glyph)
106 free(props->info->glyph); 106 free(props->info->glyph);
107#ifdef OT_SUPPORT 107#ifdef OT_SUPPORT