jypark pushed a commit to branch master.
commit 810f1ca9723de19c0ea6d9baa879b91c573a8ba6
Author: Jiyoun Park <[email protected]>
Date: Fri Apr 5 13:05:25 2013 +0900
Evas font: fix font source have wrong current size.
---
ChangeLog | 4 ++++
NEWS | 2 ++
src/lib/evas/common/evas_font_load.c | 3 +++
3 files changed, 9 insertions(+)
diff --git a/ChangeLog b/ChangeLog
index 86a88dd..0191b26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-04 Jiyoun Park
+
+ * Evas font: fix font source have wrong current size.
+
2013-04-04 Tom Hacohen
* Evas font: If OS/2 table is available and the font is demi-bold,
diff --git a/NEWS b/NEWS
index a1cda47..8b3fd69 100644
--- a/NEWS
+++ b/NEWS
@@ -222,3 +222,5 @@ Fixes:
* Fix evas buffer engine allocation with non alpha output
* Evas font: click on left/right half of char does matter now.
* Evas font: If OS/2 table is available and the font is demi-bold, don't
do runtime emboldment.
+ * Evas font: fix font source have wrong current size.
+
diff --git a/src/lib/evas/common/evas_font_load.c
b/src/lib/evas/common/evas_font_load.c
index 9bdb10f..97dfb17 100644
--- a/src/lib/evas/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -75,7 +75,9 @@ _evas_common_font_source_free(RGBA_Font_Source *fs)
static void
_evas_common_font_int_free(RGBA_Font_Int *fi)
{
+ FTLOCK();
FT_Done_Size(fi->ft.size);
+ FTUNLOCK();
evas_common_font_int_modify_cache_by(fi, -1);
_evas_common_font_int_clear(fi);
@@ -265,6 +267,7 @@ EAPI void
evas_common_font_source_free(RGBA_Font_Source *fs)
{
fs->references--;
+ fs->current_size = 0;
if (fs->references > 0) return;
eina_hash_del(fonts_src, fs->name, fs);
}
--
------------------------------------------------------------------------------
Minimize network downtime and maximize team effectiveness.
Reduce network management and security costs.Learn how to hire
the most talented Cisco Certified professionals. Visit the
Employer Resources Portal
http://www.cisco.com/web/learning/employer_resources/index.html
