From 4eb2427c047f8de971867c18383b64fa0dc3207a Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 18 Aug 2002 22:02:03 +0000 Subject: [PATCH] * src/pcf/pcfdriver.c (PCF_Glyph_Load): Fix computation of horiBearingX. * src/bdf/bdfdrivr.c (BDF_GlyphLoad): Fix computation of horiBearingY. --- ChangeLog | 7 +++++++ src/bdf/bdfdrivr.c | 3 ++- src/pcf/pcfdriver.c | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 206f0b22f..de0b40470 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-08-18 Werner Lemberg + + * src/pcf/pcfdriver.c (PCF_Glyph_Load): Fix computation of + horiBearingX. + * src/bdf/bdfdrivr.c (BDF_GlyphLoad): Fix computation of + horiBearingY. + 2002-08-16 George Williams Add support for Apple composite glyphs. diff --git a/src/bdf/bdfdrivr.c b/src/bdf/bdfdrivr.c index 377343224..391dec869 100644 --- a/src/bdf/bdfdrivr.c +++ b/src/bdf/bdfdrivr.c @@ -617,7 +617,8 @@ THE SOFTWARE. /* 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 << 6; + slot->metrics.horiBearingY = ( glyph.bbx.y_offset + + glyph.bbx.height ) << 6; slot->metrics.width = bitmap->width << 6; slot->metrics.height = bitmap->rows << 6; diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c index 812e2be13..ac9dda3c9 100644 --- a/src/pcf/pcfdriver.c +++ b/src/pcf/pcfdriver.c @@ -388,7 +388,7 @@ THE SOFTWARE. goto Exit; if ( PCF_BIT_ORDER( face->bitmapsFormat ) != MSBFirst ) - BitOrderInvert( bitmap->buffer,bytes ); + BitOrderInvert( bitmap->buffer, bytes ); if ( ( PCF_BYTE_ORDER( face->bitmapsFormat ) != PCF_BIT_ORDER( face->bitmapsFormat ) ) ) @@ -412,7 +412,7 @@ THE SOFTWARE. slot->bitmap_top = metric->ascent; slot->metrics.horiAdvance = metric->characterWidth << 6 ; - slot->metrics.horiBearingX = metric->rightSideBearing << 6 ; + slot->metrics.horiBearingX = metric->leftSideBearing << 6 ; slot->metrics.horiBearingY = metric->ascent << 6 ; slot->metrics.width = metric->characterWidth << 6 ; slot->metrics.height = bitmap->rows << 6;