From cbcc40e364d043bc2c258963564a82326629f51c Mon Sep 17 00:00:00 2001 From: raster Date: Wed, 10 Oct 2012 07:05:34 +0000 Subject: [PATCH] ok and METRIC then! :) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/evas-1.7@77696 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/engines/common/evas_font_load.c | 4 ++-- src/lib/engines/common/evas_font_main.c | 4 ++-- src/lib/engines/common/evas_font_private.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/engines/common/evas_font_load.c b/src/lib/engines/common/evas_font_load.c index 11b46f9..3e0cf1c 100644 --- a/src/lib/engines/common/evas_font_load.c +++ b/src/lib/engines/common/evas_font_load.c @@ -455,7 +455,7 @@ evas_common_font_int_load_complete(RGBA_Font_Int *fi) if (fi->src->ft.face->units_per_EM != 0) { dv = (fi->src->ft.orig_upem * 2048) / fi->src->ft.face->units_per_EM; - ret = FONT_MERTIC_CONV(val, dv, fi->src->ft.face->size->metrics.y_scale); + ret = FONT_METRIC_CONV(val, dv, fi->src->ft.face->size->metrics.y_scale); } else { @@ -470,7 +470,7 @@ evas_common_font_int_load_complete(RGBA_Font_Int *fi) if (fi->src->ft.face->units_per_EM != 0) { dv = (fi->src->ft.orig_upem * 2048) / fi->src->ft.face->units_per_EM; - ret = FONT_MERTIC_CONV(val, dv, fi->src->ft.face->size->metrics.y_scale); + ret = FONT_METRIC_CONV(val, dv, fi->src->ft.face->size->metrics.y_scale); } else { diff --git a/src/lib/engines/common/evas_font_main.c b/src/lib/engines/common/evas_font_main.c index 1154bd7..d577d43 100644 --- a/src/lib/engines/common/evas_font_main.c +++ b/src/lib/engines/common/evas_font_main.c @@ -172,7 +172,7 @@ evas_common_font_max_ascent_get(RGBA_Font *fn) if (fi->src->ft.face->units_per_EM == 0) return val; dv = (fi->src->ft.orig_upem * 2048) / fi->src->ft.face->units_per_EM; - ret = FONT_MERTIC_CONV(val, dv, fi->src->ft.face->size->metrics.y_scale); + ret = FONT_METRIC_CONV(val, dv, fi->src->ft.face->size->metrics.y_scale); return ret; } @@ -202,7 +202,7 @@ evas_common_font_max_descent_get(RGBA_Font *fn) if (fi->src->ft.face->units_per_EM == 0) return val; dv = (fi->src->ft.orig_upem * 2048) / fi->src->ft.face->units_per_EM; - ret = FONT_MERTIC_CONV(val, dv, fi->src->ft.face->size->metrics.y_scale); + ret = FONT_METRIC_CONV(val, dv, fi->src->ft.face->size->metrics.y_scale); return ret; } diff --git a/src/lib/engines/common/evas_font_private.h b/src/lib/engines/common/evas_font_private.h index c50cbb0..bbc4675 100644 --- a/src/lib/engines/common/evas_font_private.h +++ b/src/lib/engines/common/evas_font_private.h @@ -48,14 +48,14 @@ void evas_common_font_int_reload(RGBA_Font_Int *fi); # if 1 // do proper round (up or down like 1.4 -> 1 and 1.6 -> 2 etc -# define FONT_MERTIC_CONV(val, dv, scale) \ +# define FONT_METRIC_CONV(val, dv, scale) \ (((long long)((val) * (scale)) + (long long)((dv) * (dv) / 2LL)) \ / (long long)((dv) * (dv))) # define FONT_METRIC_ROUNDUP(val) \ (((val) + 31) >> 6) # else // truncate/round down -# define FONT_MERTIC_CONV(val, dv, scale) \ +# define FONT_METRIC_CONV(val, dv, scale) \ (((val) * (scale)) / ((dv) * (dv))) # define FONT_METRIC_ROUNDUP(val) \ ((val) >> 6) -- 2.7.4