diff options
| author | Sebastian Rasmussen <sebras@hotmail.com> | 2010-06-26 16:25:23 +0200 |
|---|---|---|
| committer | Sebastian Rasmussen <sebras@hotmail.com> | 2010-06-26 16:25:23 +0200 |
| commit | 2ebdfc49479cc18b79aa4dec4a488c9b6b7ba65f (patch) | |
| tree | 15646ca6b89e183360a7f71fb6dbee4f1685020a /fitz/dev_text.c | |
| parent | 4341bdcb126dd4f5ab29fbf31482b3a67da0f0ef (diff) | |
| download | mupdf-2ebdfc49479cc18b79aa4dec4a488c9b6b7ba65f.tar.xz | |
When computing advance width, use fontsize 64 instead of 1000.
Diffstat (limited to 'fitz/dev_text.c')
| -rw-r--r-- | fitz/dev_text.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fitz/dev_text.c b/fitz/dev_text.c index 42f9393a..e23479e9 100644 --- a/fitz/dev_text.c +++ b/fitz/dev_text.c @@ -18,9 +18,9 @@ FT_Get_Advance(FT_Face face, int gid, int masks, FT_Fixed *out) if (err) return err; if (masks & FT_LOAD_VERTICAL_LAYOUT) - *out = (face->glyph->metrics.vertAdvance << 16) / 1000; + *out = face->glyph->metrics.vertAdvance << 10; else - *out = (face->glyph->metrics.horiAdvance << 16) / 1000; + *out = face->glyph->metrics.horiAdvance << 10; return 0; } @@ -252,7 +252,7 @@ fz_textextractspan(fz_textspan **last, fz_text *text, fz_matrix ctm, fz_point *p if (font->ftface) { - err = FT_Set_Char_Size(font->ftface, 1000, 1000, 72, 72); + err = FT_Set_Char_Size(font->ftface, 64, 64, 72, 72); if (err) fz_warn("freetype set character size: %s", ft_errorstring(err)); ascender = (float)face->ascender / face->units_per_EM; @@ -341,7 +341,7 @@ fz_textextractspan(fz_textspan **last, fz_text *text, fz_matrix ctm, fz_point *p if (text->wmode) mask |= FT_LOAD_VERTICAL_LAYOUT; FT_Get_Advance(font->ftface, text->els[i].gid, mask, &ftadv); - adv = ftadv / 1024000.0f; + adv = ftadv / 65536.0f; if (text->wmode) { adv = -1; /* TODO: freetype returns broken vertical metrics */ |