Minor fixes to font drawing with metric caching enabled.

SVN revision: 50632
This commit is contained in:
Brett Nash 2010-07-29 03:34:30 +00:00
parent fae76ddd77
commit 2df94e37ff
1 changed files with 17 additions and 13 deletions

View File

@ -464,20 +464,24 @@ evas_common_font_draw_internal(RGBA_Image *dst, RGBA_Draw_Context *dc, RGBA_Font
for (ind = 0 ; ind < len ; ind ++){
// FIXME Do we need to draw?
struct cinfo *ci = word->cinfo + ind;
if ((ci->fg->ext_dat) && (dc->font_ext.func.gl_draw))
for (j = rowstart ; j < rowend ; j ++)
{
/* ext glyph draw */
dc->font_ext.func.gl_draw(dc->font_ext.data,
(void *)dst,
dc, ci->fg,
x + ci->pos.x,
y - ci->bm.h
);
}
else
{
func(NULL, word->im + (word->roww * j) + xstart, dc->col.col, im + ((y + j) * im_w) + x, xrun);
}
if ((ci->fg->ext_dat) && (dc->font_ext.func.gl_draw))
{
/* ext glyph draw */
dc->font_ext.func.gl_draw(dc->font_ext.data,
(void *)dst,
dc, ci->fg,
x + ci->pos.x,
y - ci->bm.h + j
);
}
else
{
func(NULL, word->im + (word->roww * j) + xstart,
dc->col.col, im + ((y + j) * im_w) + x, xrun);
}
}
}
return;
#endif