ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/cf.schmorp.de/Deliantra-Client/pango-render.c
(Generate patch)

Comparing cf.schmorp.de/Deliantra-Client/pango-render.c (file contents):
Revision 1.14 by root, Sun Jan 13 08:22:33 2008 UTC vs.
Revision 1.15 by root, Sun Jan 13 08:31:45 2008 UTC

189 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info); 189 _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
190 _pango_opengl_font_set_cache_glyph_data (font, glyph, g); 190 _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
191 } 191 }
192 192
193 g->generation = tc_generation; 193 g->generation = tc_generation;
194 tc_get (&g->tex, bm.width, bm.height);
195 194
196 g->left = bm.left; 195 g->left = bm.left;
197 g->top = bm.top; 196 g->top = bm.top;
197
198 tc_get (&g->tex, bm.width, bm.height);
198 199
199 if (bm.width && bm.height) 200 if (bm.width && bm.height)
200 { 201 {
201 glBindTexture (GL_TEXTURE_2D, g->tex.name); 202 glBindTexture (GL_TEXTURE_2D, g->tex.name);
202 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride); 203 glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
278 int x, int y, 279 int x, int y,
279 float r, float g, float b, float a, 280 float r, float g, float b, float a,
280 int flags) 281 int flags)
281{ 282{
282 pango_opengl_render_layout_subpixel ( 283 pango_opengl_render_layout_subpixel (
283 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags 284 layout, rc, x * PANGO_SCALE, y * PANGO_SCALE, r, g, b, a, flags
284 ); 285 );
285} 286}
286 287
287static void 288static void
288pango_opengl_renderer_init (PangoOpenGLRenderer *renderer) 289pango_opengl_renderer_init (PangoOpenGLRenderer *renderer)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines