Commit 60e0a4d5db5703bfa2c2dc7efaab6269d0fbc895

Werner Lemberg 2004-03-22T09:25:04

* src/bdf/bdfdrivr.c (BDF_Glyph_Load): Fix left side bearing.

diff --git a/ChangeLog b/ChangeLog
index 13cc16b..07643b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-21  Werner Lemberg  <wl@gnu.org>
+
+	* src/bdf/bdfdrivr.c (BDF_Glyph_Load): Fix left side bearing.
+
 2004-03-20  Steve Hartwell  <shspamsink@comcast.net>
 
 	* src/cache/ftcmru.c (FTC_MruList_RemoveSelection): Handle a NULL
diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c
index 7358615..d757cba 100644
--- a/src/bdf/bdfdrivr.c
+++ b/src/bdf/bdfdrivr.c
@@ -720,14 +720,13 @@ THE SOFTWARE.
       }
     }
 
-    slot->bitmap_left = 0;
+    slot->bitmap_left = glyph.bbx.x_offset;
     slot->bitmap_top  = glyph.bbx.ascent;
 
     /* FZ XXX: TODO: vertical metrics */
     slot->metrics.horiAdvance  = glyph.dwidth << 6;
     slot->metrics.horiBearingX = glyph.bbx.x_offset << 6;
-    slot->metrics.horiBearingY = ( glyph.bbx.y_offset +
-                                   glyph.bbx.height ) << 6;
+    slot->metrics.horiBearingY = glyph.bbx.ascent << 6;
     slot->metrics.width        = bitmap->width << 6;
     slot->metrics.height       = bitmap->rows << 6;