walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hb-font: Fix scale_glyph_extents() again 

And better fix this time.
This commit is contained in:
Behdad Esfahbod 2023-01-09 11:54:44 -07:00
parent 6c1a4bed4a
commit 30adbc22d9
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-font.hh
View File

@ -182,14 +182,20 @@ struct hb_font_t
void scale_glyph_extents (hb_glyph_extents_t *extents) void scale_glyph_extents (hb_glyph_extents_t *extents)
{ {
extents->x_bearing = em_scale_x (extents->x_bearing); float x1 = em_fscale_x (extents->x_bearing);
extents->y_bearing = em_scale_y (extents->y_bearing); float y1 = em_fscale_y (extents->y_bearing);
extents->width = em_scale_x (extents->x_bearing + extents->width) - extents->x_bearing; float x2 = em_fscale_x (extents->x_bearing + extents->width);
extents->height = em_scale_y (extents->y_bearing + extents->height) - extents->y_bearing; float y2 = em_fscale_y (extents->y_bearing + extents->height);
/* Apply slant. */ /* Apply slant. */
extents->x_bearing += roundf (extents->y_bearing * slant_xy); x1 += hb_min (y1 * slant_xy, y2 * slant_xy);
extents->width += roundf (extents->height * slant_xy); x2 += hb_max (y1 * slant_xy, y2 * slant_xy);
extents->x_bearing = floorf (x1);
extents->y_bearing = floorf (y1);
extents->width = ceilf (x2) - extents->x_bearing;
extents->height = ceilf (y2) - extents->y_bearing;
} }