diff options
| author | Parth Wazurkar <parthwazurkar@gmail.com> | 2018-08-07 19:38:26 +0530 |
|---|---|---|
| committer | Parth Wazurkar <parthwazurkar@gmail.com> | 2018-08-08 09:22:04 +0530 |
| commit | 2f59a4c8a94d81c78a84c7a2b2b724d7ca0fc8aa (patch) | |
| tree | 5e7140bb3ed376cbfe326f1fb724d7e8467dee66 | |
| parent | a6bb748265c636976abec200103124f007705123 (diff) | |
| download | freetype2-2f59a4c8a94d81c78a84c7a2b2b724d7ca0fc8aa.tar.gz | |
[gf, pk] Resolve *glyph jumping* error.
* src/gf/gfdrivr.c(GF_Load_Glyph): Modify glyph metric values
to resolve the *glyph jumping* error and make the glyphs to
properly sit on baseline.
* src/pk/pkdrivr.c(PK_Glyph_Load): Ditto.
| -rw-r--r-- | src/gf/gfdrivr.c | 6 | ||||
| -rw-r--r-- | src/pk/pkdrivr.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/gf/gfdrivr.c b/src/gf/gfdrivr.c index 5cebaee23..13a571712 100644 --- a/src/gf/gfdrivr.c +++ b/src/gf/gfdrivr.c @@ -369,7 +369,6 @@ FT_Bitmap* bitmap = &slot->bitmap; GF_BitmapRec bm; GF_Glyph go; - FT_Int ascent; go = gf->gf_glyph; @@ -427,14 +426,13 @@ /* we can simply point to it */ ft_glyphslot_set_bitmap( slot, bm.bitmap ); - ascent = (bm.bbx_height + bm.off_y); slot->format = FT_GLYPH_FORMAT_BITMAP; slot->bitmap_left = bm.off_x ; - slot->bitmap_top = ascent ; + slot->bitmap_top = bm.off_y ; slot->metrics.horiAdvance = (FT_Pos) (bm.mv_x ) * 64; slot->metrics.horiBearingX = (FT_Pos) (bm.off_x ) * 64; - slot->metrics.horiBearingY = (FT_Pos) ascent * 64; + slot->metrics.horiBearingY = (FT_Pos) (bm.bbx_height) * 64; slot->metrics.width = (FT_Pos) ( bitmap->width * 64 ); slot->metrics.height = (FT_Pos) ( bitmap->rows * 64 ); diff --git a/src/pk/pkdrivr.c b/src/pk/pkdrivr.c index 44f64a094..a5bc6397e 100644 --- a/src/pk/pkdrivr.c +++ b/src/pk/pkdrivr.c @@ -367,7 +367,6 @@ FT_Bitmap* bitmap = &slot->bitmap; PK_BitmapRec bm; PK_Glyph go; - FT_Int ascent; go = pk->pk_glyph; @@ -425,14 +424,13 @@ /* we can simply point to it */ ft_glyphslot_set_bitmap( slot, bm.bitmap ); - ascent = (bm.bbx_height + bm.off_y); slot->format = FT_GLYPH_FORMAT_BITMAP; slot->bitmap_left = bm.off_x ; - slot->bitmap_top = ascent ; + slot->bitmap_top = bm.off_y ; slot->metrics.horiAdvance = (FT_Pos) (bm.mv_x ) * 64; slot->metrics.horiBearingX = (FT_Pos) (bm.off_x ) * 64; - slot->metrics.horiBearingY = (FT_Pos) ascent * 64; + slot->metrics.horiBearingY = (FT_Pos) (bm.bbx_height) * 64; slot->metrics.width = (FT_Pos) ( bitmap->width * 64 ); slot->metrics.height = (FT_Pos) ( bitmap->rows * 64 ); |