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

[coretext] Fix positioning of out-of-order glyphs 

Unfortunately this now generates negative advances. To be fixed...
This commit is contained in:
Behdad Esfahbod 2022-06-28 15:43:57 -06:00
parent 58d2e93099
commit 4499ae0225
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-coretext.cc
View File

@ -1075,7 +1075,8 @@ resize_and_retry:
advance = positions[j + 1].x - positions[j].x; advance = positions[j + 1].x - positions[j].x;
else /* last glyph */ else /* last glyph */
advance = run_advance - (positions[j].x - positions[0].x); advance = run_advance - (positions[j].x - positions[0].x);
info->mask = round (advance * x_mult); /* int cast necessary to pass through negative values. */
info->mask = (int) round (advance * x_mult);
info->var1.i32 = x_offset; info->var1.i32 = x_offset;
info->var2.i32 = round (positions[j].y * y_mult); info->var2.i32 = round (positions[j].y * y_mult);
info++; info++;
@ -1091,7 +1092,8 @@ resize_and_retry:
advance = positions[j + 1].y - positions[j].y; advance = positions[j + 1].y - positions[j].y;
else /* last glyph */ else /* last glyph */
advance = run_advance - (positions[j].y - positions[0].y); advance = run_advance - (positions[j].y - positions[0].y);
info->mask = round (advance * y_mult); /* int cast necessary to pass through negative values. */
info->mask = (int) round (advance * y_mult);
info->var1.i32 = round (positions[j].x * x_mult); info->var1.i32 = round (positions[j].x * x_mult);
info->var2.i32 = y_offset; info->var2.i32 = y_offset;
info++; info++;
@ -1167,6 +1169,10 @@ resize_and_retry:
} }
} }
/* TODO: Sometimes the above positioning code generates negative
* advance values. Fix them up. Example, with NotoNastaliqUrdu
* font and sequence ابهد. */
buffer->clear_glyph_flags (); buffer->clear_glyph_flags ();
buffer->unsafe_to_break (); buffer->unsafe_to_break ();