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.3 by root, Sun Apr 5 19:28:54 2009 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
… …
134PangoContext * 131PangoContext *
135pango_opengl_font_map_create_context (PangoOpenGLFontMap *fontmap) 132pango_opengl_font_map_create_context (PangoOpenGLFontMap *fontmap)
136{ 133{
137 g_return_val_if_fail (PANGO_OPENGL_IS_FONT_MAP (fontmap), NULL); 134 g_return_val_if_fail (PANGO_OPENGL_IS_FONT_MAP (fontmap), NULL);
138 135
139 return pango_fc_font_map_create_context (PANGO_FC_FONT_MAP (fontmap)); 136 return pango_font_map_create_context (PANGO_FONT_MAP (fontmap));
140} 137}
141 138
142FT_Library 139FT_Library
143_pango_opengl_font_map_get_library (PangoFontMap *fontmap_) 140_pango_opengl_font_map_get_library (PangoFontMap *fontmap_)
144{ 141{
… …
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
… …
173 FcConfigSubstitute (NULL, pattern, FcMatchPattern); 170 FcConfigSubstitute (NULL, pattern, FcMatchPattern);
174 171
175 if (fontmap->substitute_func) 172 if (fontmap->substitute_func)
176 fontmap->substitute_func (pattern, fontmap->substitute_data); 173 fontmap->substitute_func (pattern, fontmap->substitute_data);
177 174
178#if 0
179 FcValue v;
180 if (FcPatternGet (pattern, FC_DPI, 0, &v) == FcResultNoMatch)
181 FcPatternAddDouble (pattern, FC_DPI, fontmap->dpi_y);
182#endif
183 FcDefaultSubstitute (pattern); 175 FcDefaultSubstitute (pattern);
184} 176}
185 177
186static PangoFcFont * 178static PangoFcFont *
187pango_opengl_font_map_new_font (PangoFcFontMap *fcfontmap, 179pango_opengl_font_map_new_font (PangoFcFontMap *fcfontmap,
… …
189{ 181{
190 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);
191} 183}
192 184
193static void 185static void
194pango_opengl_font_map_class_init (PangoOpenGLFontMapClass *class) 186pango_opengl_font_map_class_init (PangoOpenGLFontMapClass *klass)
195{ 187{
196 GObjectClass *gobject_class = G_OBJECT_CLASS (class); 188 GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
197 PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (class); 189 PangoFcFontMapClass *fcfontmap_class = PANGO_FC_FONT_MAP_CLASS (klass);
198 190
199 gobject_class->finalize = pango_opengl_font_map_finalize; 191 gobject_class->finalize = pango_opengl_font_map_finalize;
200 fcfontmap_class->default_substitute = pango_opengl_font_map_default_substitute; 192 fcfontmap_class->default_substitute = pango_opengl_font_map_default_substitute;
201 fcfontmap_class->new_font = pango_opengl_font_map_new_font; 193 fcfontmap_class->new_font = pango_opengl_font_map_new_font;
202} 194}

Diff Legend

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