ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/pango-fontmap.c
(Generate patch)

Comparing deliantra/Deliantra-Client/pango-fontmap.c (file contents):
Revision 1.5 by root, Sun Oct 7 17:54:24 2012 UTC vs.
Revision 1.6 by root, Sun Nov 18 00:52:22 2018 UTC

… …
73pango_opengl_font_map_new (void) 73pango_opengl_font_map_new (void)
74{ 74{
75 PangoOpenGLFontMap *fontmap; 75 PangoOpenGLFontMap *fontmap;
76 FT_Error error; 76 FT_Error error;
77 77
78 /* Make sure that the type system is initialized */
79 g_type_init ();
80
81 fontmap = g_object_new (PANGO_TYPE_OPENGL_FONT_MAP, NULL); 78 fontmap = (PangoOpenGLFontMap *)g_object_new (PANGO_TYPE_OPENGL_FONT_MAP, NULL);
82 79
83 error = FT_Init_FreeType (&fontmap->library); 80 error = FT_Init_FreeType (&fontmap->library);
84 if (error != FT_Err_Ok) 81 if (error != FT_Err_Ok)
85 g_critical ("pango_opengl_font_map_new: Could not initialize freetype"); 82 g_critical ("pango_opengl_font_map_new: Could not initialize freetype");
86 83
… …
157 **/ 154 **/
158PangoRenderer * 155PangoRenderer *
159_pango_opengl_font_map_get_renderer (PangoOpenGLFontMap *fontmap) 156_pango_opengl_font_map_get_renderer (PangoOpenGLFontMap *fontmap)
160{ 157{
161 if (!fontmap->renderer) 158 if (!fontmap->renderer)
162 fontmap->renderer = g_object_new (PANGO_TYPE_OPENGL_RENDERER, NULL); 159 fontmap->renderer = (PangoRenderer *)g_object_new (PANGO_TYPE_OPENGL_RENDERER, NULL);
163 160
164 return fontmap->renderer; 161 return fontmap->renderer;
165} 162}
166 163
167static void 164static void
… …
184{ 181{
185 return (PangoFcFont *)_pango_opengl_font_new (PANGO_OPENGL_FONT_MAP (fcfontmap), pattern); 182 return (PangoFcFont *)_pango_opengl_font_new (PANGO_OPENGL_FONT_MAP (fcfontmap), pattern);
186} 183}
187 184
188static void 185static void
189pango_opengl_font_map_class_init (PangoOpenGLFontMapClass *class) 186pango_opengl_font_map_class_init (PangoOpenGLFontMapClass *klass)
190{ 187{
191 GObjectClass *gobject_class = G_OBJECT_CLASS (class); 188 GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
192 PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (class); 189 PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass);
193 190
194 gobject_class->finalize = pango_opengl_font_map_finalize; 191 gobject_class->finalize = pango_opengl_font_map_finalize;
195 fcfontmap_class->default_substitute = pango_opengl_font_map_default_substitute; 192 fcfontmap_class->default_substitute = pango_opengl_font_map_default_substitute;
196 fcfontmap_class->new_font = pango_opengl_font_map_new_font; 193 fcfontmap_class->new_font = pango_opengl_font_map_new_font;
197} 194}

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines