--- deliantra/Deliantra-Client/pango-font.c 2009/04/26 20:59:41 1.4 +++ deliantra/Deliantra-Client/pango-font.c 2018/11/18 00:52:22 1.5 @@ -76,9 +76,9 @@ /* pango 1.24 is ABI-incompatible with 1.22, but distros */ /* usually package it under the same name, so a runtime check */ /* is required */ - /* unfortunately, pango fdoesn't sipport runtime checks in < 1.16 */ + /* unfortunately, pango doesn't support runtime checks in < 1.16 */ /* so there is no real way to ensure binary compatibility portably */ - /* greta move, pango */ + /* great move, pango */ if (pango_version () > PANGO_VERSION_ENCODE (1, 23, 0)) PANGO_FC_FONT (font)->fontmap = fontmap; #endif @@ -229,11 +229,11 @@ } static void -pango_opengl_font_class_init (PangoOpenGLFontClass *class) +pango_opengl_font_class_init (PangoOpenGLFontClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (class); - PangoFontClass *font_class = PANGO_FONT_CLASS (class); - PangoFcFontClass *fc_font_class = PANGO_FC_FONT_CLASS (class); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + PangoFontClass *font_class = PANGO_FONT_CLASS (klass); + PangoFcFontClass *fc_font_class = PANGO_FC_FONT_CLASS (klass); object_class->finalize = pango_opengl_font_finalize; @@ -250,7 +250,7 @@ PangoFcFont *fcfont = (PangoFcFont *)font; PangoOpenGLGlyphInfo *info; - info = g_hash_table_lookup (font->glyph_info, GUINT_TO_POINTER (glyph)); + info = (PangoOpenGLGlyphInfo *)g_hash_table_lookup (font->glyph_info, GUINT_TO_POINTER (glyph)); if ((info == NULL) && create) { @@ -390,7 +390,7 @@ pango_opengl_free_glyph_info_callback (gpointer key, gpointer value, gpointer data) { PangoOpenGLFont *font = PANGO_OPENGL_FONT (data); - PangoOpenGLGlyphInfo *info = value; + PangoOpenGLGlyphInfo *info = (PangoOpenGLGlyphInfo *)value; if (font->glyph_cache_destroy && info->cached_glyph) (*font->glyph_cache_destroy) (info->cached_glyph);