promote scale to fp.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@35920 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/canvas/evas_object_text.c b/src/lib/canvas/evas_object_text.c
index 32912e3..78b7cbf 100644 (file)
--- a/src/lib/canvas/evas_object_text.c
+++ b/src/lib/canvas/evas_object_text.c
@@ -191,7 +191,7 @@ evas_object_text_font_set(Evas_Object *obj, const char *font, Evas_Font_Size siz
        evas_font_free(obj->layer->evas, o->engine_data);
        o->engine_data = NULL;
      }
-   o->engine_data = evas_font_load(obj->layer->evas, font, o->cur.source, size * obj->cur.scale);
+   o->engine_data = evas_font_load(obj->layer->evas, font, o->cur.source, (int)(((double)size) * obj->cur.scale));
    if (!same_font)
      {
        if (o->cur.font) evas_stringshare_del(o->cur.font);

diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c
index a044056..66c240a 100644 (file)
--- a/src/lib/canvas/evas_object_textblock.c
+++ b/src/lib/canvas/evas_object_textblock.c
@@ -1170,7 +1170,7 @@ _format_command(Evas_Object *obj, Evas_Object_Textblock_Format *fmt, const char
          buf = strdup(fmt->font.name);
        fmt->font.font = evas_font_load(obj->layer->evas, 
                                        buf, fmt->font.source, 
-                                       fmt->font.size * obj->cur.scale);
+                                       (int)(((double)fmt->font.size) * obj->cur.scale));
        if (buf) free(buf);
        if (of) evas_font_free(obj->layer->evas, of);
      }
@@ -1291,7 +1291,7 @@ _format_dup(Evas_Object *obj, Evas_Object_Textblock_Format *fmt)
      buf = strdup(fmt2->font.name);
    fmt2->font.font = evas_font_load(obj->layer->evas, 
                                   buf, fmt2->font.source,
-                                  fmt2->font.size * obj->cur.scale);
+                                   (int)(((double)fmt2->font.size) * obj->cur.scale));
    if (buf) free(buf);
    return fmt2;
 }