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

[kern] Scale kern pairs before applying 

Fixes https://github.com/harfbuzz/harfbuzz/issues/1255
Fixes https://github.com/harfbuzz/harfbuzz/issues/1252
This commit is contained in:
Behdad Esfahbod 2018-10-16 13:24:29 -07:00
parent de0b9a4664
commit 661340c475
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-ot-kern-table.hh
View File

@ -38,9 +38,10 @@ struct hb_kern_machine_t
hb_kern_machine_t (const Driver &driver_) : driver (driver_) {} hb_kern_machine_t (const Driver &driver_) : driver (driver_) {}
HB_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW HB_NO_SANITIZE_SIGNED_INTEGER_OVERFLOW
inline void kern (hb_font_t *font, inline void kern (hb_font_t *font,
hb_buffer_t *buffer, hb_buffer_t *buffer,
hb_mask_t kern_mask) const hb_mask_t kern_mask,
bool scale = true) const
{ {
OT::hb_ot_apply_context_t c (1, font, buffer); OT::hb_ot_apply_context_t c (1, font, buffer);
c.set_lookup_mask (kern_mask); c.set_lookup_mask (kern_mask);
@ -69,7 +70,6 @@ struct hb_kern_machine_t
unsigned int i = idx; unsigned int i = idx;
unsigned int j = skippy_iter.idx; unsigned int j = skippy_iter.idx;
hb_position_t kern1, kern2;
hb_position_t kern = driver.get_kerning (info[i].codepoint, hb_position_t kern = driver.get_kerning (info[i].codepoint,
info[j].codepoint); info[j].codepoint);
@ -78,17 +78,23 @@ struct hb_kern_machine_t
if (likely (!kern)) if (likely (!kern))
goto skip; goto skip;
kern1 = kern >> 1;
kern2 = kern - kern1;
if (horizontal) if (horizontal)
{ {
if (scale)
kern = font->em_scale_x (kern);
hb_position_t kern1 = kern >> 1;
hb_position_t kern2 = kern - kern1;
pos[i].x_advance += kern1; pos[i].x_advance += kern1;
pos[j].x_advance += kern2; pos[j].x_advance += kern2;
pos[j].x_offset += kern2; pos[j].x_offset += kern2;
} }
else else
{ {
if (scale)
kern = font->em_scale_y (kern);
hb_position_t kern1 = kern >> 1;
hb_position_t kern2 = kern - kern1;
pos[i].y_advance += kern1; pos[i].y_advance += kern1;
pos[j].y_advance += kern2; pos[j].y_advance += kern2;
pos[j].y_offset += kern2; pos[j].y_offset += kern2;

2
src/hb-ot-shape-fallback.cc
View File

@ -466,7 +466,7 @@ _hb_ot_shape_fallback_kern (const hb_ot_shape_plan_t *plan,
return; return;
hb_ot_shape_fallback_kern_driver_t driver (font, buffer); hb_ot_shape_fallback_kern_driver_t driver (font, buffer);
hb_kern_machine_t<hb_ot_shape_fallback_kern_driver_t> machine (driver); hb_kern_machine_t<hb_ot_shape_fallback_kern_driver_t> machine (driver);
machine.kern (font, buffer, plan->kern_mask); machine.kern (font, buffer, plan->kern_mask, false);
} }