[Emacs-diffs] Changes to emacs/src/w32font.c,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/04/04 23:05:43

Index: w32font.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32font.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- w32font.c   3 Apr 2008 13:10:57 -0000       1.19
+++ w32font.c   4 Apr 2008 23:05:43 -0000       1.20
@@ -378,8 +378,8 @@
       transform.eM11.value = 1;
       transform.eM22.value = 1;
       metrics->width = 0;
-      metrics->ascent = 0;
-      metrics->descent = 0;
+      metrics->ascent = font->ascent;
+      metrics->descent = font->descent;
       metrics->lbearing = 0;
 
       for (i = 0; i < nglyphs; i++)
@@ -399,8 +399,6 @@
               metrics->rbearing = max (metrics->rbearing,
                                        metrics->width + char_metric->rbearing);
               metrics->width += char_metric->width;
-              metrics->ascent = max (metrics->ascent, char_metric->ascent);
-              metrics->descent = max (metrics->descent, char_metric->descent);
             }
           else
             {
@@ -422,11 +420,6 @@
                   new_val = metrics->width + gm.gmptGlyphOrigin.x;
                   metrics->lbearing = min (metrics->lbearing, new_val);
                   metrics->width += gm.gmCellIncX;
-                  new_val = gm.gmBlackBoxY;
-                  metrics->ascent = max (metrics->ascent, new_val);
-                  new_val = (gm.gmCellIncY - gm.gmptGlyphOrigin.y
-                            - gm.gmBlackBoxY);
-                  metrics->descent = max (metrics->descent, new_val);
                 }
               else
                 {
@@ -505,8 +498,6 @@
   if (metrics)
     {
       metrics->width = total_width;
-      metrics->ascent = font->ascent;
-      metrics->descent = font->descent;
       metrics->lbearing = 0;
       metrics->rbearing = total_width
         + ((struct w32font_info *) font)->metrics.tmOverhang;
@@ -1842,9 +1833,6 @@
           char_metric->lbearing = gm.gmptGlyphOrigin.x;
           char_metric->rbearing = gm.gmBlackBoxX + gm.gmptGlyphOrigin.x;
           char_metric->width = gm.gmCellIncX;
-          char_metric->ascent = gm.gmBlackBoxY;
-          char_metric->descent = (gm.gmCellIncY - gm.gmptGlyphOrigin.y
-                                 - gm.gmBlackBoxY);
         }
       else
         char_metric->width = 0;