--- deliantra/Deliantra-Client/pango-render.c 2006/07/04 23:23:32 1.1 +++ deliantra/Deliantra-Client/pango-render.c 2006/07/04 23:44:23 1.2 @@ -102,6 +102,8 @@ static void font_render_glyph (Glyph *glyph, PangoFont *font, int glyph_index) { + FT_Face face; + if (glyph_index & PANGO_GLYPH_UNKNOWN_FLAG) { PangoFontMetrics *metrics; @@ -122,7 +124,7 @@ return; } - FT_Face face = pango_opengl_font_get_face (font); + face = pango_opengl_font_get_face (font); if (face) { @@ -159,6 +161,8 @@ draw_glyph (PangoRenderer *renderer_, PangoFont *font, PangoGlyph glyph, double x, double y) { PangoOpenGLRenderer *renderer = PANGO_OPENGL_RENDERER (renderer_); + glyph_info *g; + float x1, y1, x2, y2; if (glyph & PANGO_GLYPH_UNKNOWN_FLAG) { @@ -168,7 +172,7 @@ glyph = PANGO_GLYPH_UNKNOWN_FLAG; } - glyph_info *g = _pango_opengl_font_get_cache_glyph_data (font, glyph); + g = _pango_opengl_font_get_cache_glyph_data (font, glyph); if (!g) { @@ -202,10 +206,10 @@ x += g->left; y -= g->top; - float x1 = g->tex.x * (1. / TC_WIDTH ); - float y1 = g->tex.y * (1. / TC_HEIGHT); - float x2 = g->tex.w * (1. / TC_WIDTH ) + x1; - float y2 = g->tex.h * (1. / TC_HEIGHT) + y1; + x1 = g->tex.x * (1. / TC_WIDTH ); + y1 = g->tex.y * (1. / TC_HEIGHT); + x2 = g->tex.w * (1. / TC_WIDTH ) + x1; + y2 = g->tex.h * (1. / TC_HEIGHT) + y1; if (g->tex.name != renderer->curtex) {