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

Comparing deliantra/Deliantra-Client/pango-render.c (file contents):
Revision 1.12 by root, Mon Aug 13 15:31:21 2007 UTC vs.
Revision 1.14 by root, Sun Jan 13 08:22:33 2008 UTC

   if (!g || g->generation != tc_generation)
     {
       Glyph bm;
       font_render_glyph (&bm, font, glyph);
-      if (g)
+      if (!g)
-        g->generation = tc_generation;
-      else
         {
           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);
         }
+      g->generation = tc_generation;
       tc_get (&g->tex, bm.width, bm.height);
       g->left = bm.left;
       g->top  = bm.top;
+      if (bm.width && bm.height)
+        {
-      glBindTexture (GL_TEXTURE_2D, g->tex.name);
+          glBindTexture (GL_TEXTURE_2D, g->tex.name);
-      glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
+          glPixelStorei (GL_UNPACK_ROW_LENGTH, bm.stride);
-      glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+          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);
+          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_ROW_LENGTH, 0);
-      glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
+          glPixelStorei (GL_UNPACK_ALIGNMENT, 4);
+        }
     }
   x += g->left;
   y -= g->top;

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