ok ok.. METRIC!

SVN revision: 77695

legacy/evas/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
      {

legacy/evas/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;
 }
 

legacy/evas/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)