[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/pango-render.c

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.2 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.3 by root, Tue Jul 4 23:56:34 2006 UTC

 }
 typedef struct glyph_info {
   tc_area tex;
   int left, top;
+  int generation;
 } glyph_info;
 static void
 free_glyph_info (glyph_info *g)
 {
 	glyph = PANGO_GLYPH_UNKNOWN_FLAG;
     }
   g = _pango_opengl_font_get_cache_glyph_data (font, glyph);
-  if (!g)
+  if (!g || g->generation != tc_generation)
     {
       Glyph bm;
       font_render_glyph (&bm, font, glyph);
+      if (g)
+        g->generation = tc_generation;
+      else
+        {
-      g = g_slice_new (glyph_info);
+          g = g_slice_new (glyph_info);
+          _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
+          _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
+        }
       tc_get (&g->tex, bm.width, bm.height);
       g->left = bm.left;
       g->top  = bm.top;
       glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
       glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
       glTexSubImage2D (GL_TEXTURE_2D, 0, g->tex.x, g->tex.y, bm.width, bm.height, GL_ALPHA, GL_UNSIGNED_BYTE, bm.bitmap);
       glPixelStorei (GL_UNPACK_ROW_LENGTH, 0);
       glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
-      _pango_opengl_font_set_glyph_cache_destroy (font, (GDestroyNotify)free_glyph_info);
-      _pango_opengl_font_set_cache_glyph_data (font, glyph, g);
     }
   x += g->left;
   y -= g->top;

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