aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2013-06-10 14:51:38 +0100
committerTom Hacohen <tom@stosb.com>2013-06-10 14:51:38 +0100
commitd7db12f196611acbcf5bbb923fed10621b68b1b8 (patch)
treeae9665c8236bdf5579ead3129a566b2ec4358611
parenteina_log: screen-256color also support colors (diff)
downloadefl-d7db12f196611acbcf5bbb923fed10621b68b1b8.tar.gz
Revert "fix slowdown as a result of fixing text ascent/descent for fontsets from tom."
-rw-r--r--src/lib/evas/common/evas_font_main.c12
-rw-r--r--src/lib/evas/include/evas_common.h5
2 files changed, 0 insertions, 17 deletions
diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c
index 1de4a56ee4..76247cd2be 100644
--- a/src/lib/evas/common/evas_font_main.c
+++ b/src/lib/evas/common/evas_font_main.c
@@ -185,14 +185,11 @@ evas_common_font_ascent_get(RGBA_Font *fn)
Eina_List *l;
RGBA_Font_Int *fi;
- if (fn->have_ascent) return fn->ascent;
EINA_LIST_FOREACH(fn->fonts, l, fi)
{
v = evas_common_font_instance_ascent_get(fi);
if (v > max) max = v;
}
- fn->ascent = max;
- fn->have_ascent = 1;
return max;
}
@@ -204,14 +201,11 @@ evas_common_font_descent_get(RGBA_Font *fn)
Eina_List *l;
RGBA_Font_Int *fi;
- if (fn->have_descent) return fn->descent;
EINA_LIST_FOREACH(fn->fonts, l, fi)
{
v = evas_common_font_instance_descent_get(fi);
if (v > max) max = v;
}
- fn->descent = max;
- fn->have_descent = 1;
return max;
}
@@ -223,14 +217,11 @@ evas_common_font_max_ascent_get(RGBA_Font *fn)
Eina_List *l;
RGBA_Font_Int *fi;
- if (fn->have_max_ascent) return fn->max_ascent;
EINA_LIST_FOREACH(fn->fonts, l, fi)
{
v = evas_common_font_instance_max_ascent_get(fi);
if (v > max) max = v;
}
- fn->max_ascent = max;
- fn->have_max_ascent = 1;
return max;
}
@@ -242,14 +233,11 @@ evas_common_font_max_descent_get(RGBA_Font *fn)
Eina_List *l;
RGBA_Font_Int *fi;
- if (fn->have_max_descent) return fn->max_descent;
EINA_LIST_FOREACH(fn->fonts, l, fi)
{
v = evas_common_font_instance_max_descent_get(fi);
if (v > max) max = v;
}
- fn->max_descent = max;
- fn->have_max_descent = 1;
return max;
}
diff --git a/src/lib/evas/include/evas_common.h b/src/lib/evas/include/evas_common.h
index c0ffda6083..4c9b68672b 100644
--- a/src/lib/evas/include/evas_common.h
+++ b/src/lib/evas/include/evas_common.h
@@ -894,13 +894,8 @@ struct _RGBA_Font
Fash_Int *fash;
Font_Hint_Flags hinting;
int references;
- short ascent, descent, max_ascent, max_descent;
LK(lock);
unsigned char sizeok : 1;
- unsigned char have_ascent : 1;
- unsigned char have_descent : 1;
- unsigned char have_max_ascent : 1;
- unsigned char have_max_descent : 1;
};
#include "../common/evas_font_ot.h"