From 2a04c23a332ccd7a049144aeb1ebfffb1106d3ef Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 25 Aug 2007 11:54:17 +0000 Subject: [PATCH] futzing around with tilan's mono font issue - some commented otu debugging - use the all caps enum for bitmap fonts now... SVN revision: 31496 --- .../evas/src/lib/engines/common/evas_font_draw.c | 2 +- .../evas/src/lib/engines/common/evas_font_query.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/legacy/evas/src/lib/engines/common/evas_font_draw.c b/legacy/evas/src/lib/engines/common/evas_font_draw.c index 319f36427a..6b89f2e883 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_draw.c +++ b/legacy/evas/src/lib/engines/common/evas_font_draw.c @@ -37,7 +37,7 @@ evas_common_font_int_cache_glyph_get(RGBA_Font_Int *fi, FT_UInt index) free(fg); return NULL; } - if (fg->glyph->format != ft_glyph_format_bitmap) + if (fg->glyph->format != FT_GLYPH_FORMAT_BITMAP) { error = FT_Glyph_To_Bitmap(&(fg->glyph), ft_render_mode_normal, 0, 1); if (error) diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/legacy/evas/src/lib/engines/common/evas_font_query.c index 4ff9741a7f..4595874124 100644 --- a/legacy/evas/src/lib/engines/common/evas_font_query.c +++ b/legacy/evas/src/lib/engines/common/evas_font_query.c @@ -96,6 +96,20 @@ evas_common_font_query_inset(RGBA_Font *fn, const char *text) index = evas_common_font_glyph_search(fn, &fi, gl); fg = evas_common_font_int_cache_glyph_get(fi, index); if (!fg) return 0; +/* + printf("fg->glyph_out->left = %i\n" + "fi->src->ft.face->glyph->bitmap_left = %i\n" + "fi->src->ft.face->glyph->metrics.horiBearingX = %i\n" + "fi->src->ft.face->glyph->metrics.horiBearingY = %i\n" + "fi->src->ft.face->glyph->metrics.horiAdvance = %i\n" + , + (int)fg->glyph_out->left, + (int)fi->src->ft.face->glyph->bitmap_left, + (int)fi->src->ft.face->glyph->metrics.horiBearingX >> 6, + (int)fi->src->ft.face->glyph->metrics.horiBearingY >> 6, + (int)fi->src->ft.face->glyph->metrics.horiAdvance >> 6 + ); + */ return fg->glyph_out->left; }