--- cf.schmorp.de/Deliantra-Client/pango-fontmap.c 2006/07/04 23:44:23 1.2 +++ cf.schmorp.de/Deliantra-Client/pango-fontmap.c 2012/10/07 17:54:24 1.5 @@ -89,9 +89,9 @@ void pango_opengl_font_map_set_default_substitute (PangoOpenGLFontMap *fontmap, - PangoOpenGLSubstituteFunc func, - gpointer data, - GDestroyNotify notify) + PangoOpenGLSubstituteFunc func, + gpointer data, + GDestroyNotify notify) { if (fontmap->substitute_destroy) fontmap->substitute_destroy (fontmap->substitute_data); @@ -136,7 +136,7 @@ { g_return_val_if_fail (PANGO_OPENGL_IS_FONT_MAP (fontmap), NULL); - return pango_fc_font_map_create_context (PANGO_FC_FONT_MAP (fontmap)); + return pango_font_map_create_context (PANGO_FONT_MAP (fontmap)); } FT_Library @@ -147,7 +147,6 @@ return fontmap->library; } - /** * _pango_opengl_font_map_get_renderer: * @fontmap: a #PangoOpenGLFontmap @@ -176,11 +175,6 @@ if (fontmap->substitute_func) fontmap->substitute_func (pattern, fontmap->substitute_data); -#if 0 - FcValue v; - if (FcPatternGet (pattern, FC_DPI, 0, &v) == FcResultNoMatch) - FcPatternAddDouble (pattern, FC_DPI, fontmap->dpi_y); -#endif FcDefaultSubstitute (pattern); }