organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-04 13:05:04 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

[util] Fix --glyphs output with negative numbers

Browse source
This commit is contained in:
Behdad Esfahbod 2025-03-28 16:25:58 -06:00
parent cb44134cbf
commit ea08b04752
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
util/shape-options.hh
View file

@ -145,18 +145,21 @@ struct shape_options_t
/* Scale positions. */ /* Scale positions. */
int x_scale, y_scale; int x_scale, y_scale;
hb_font_get_scale (font, &x_scale, &y_scale); hb_font_get_scale (font, &x_scale, &y_scale);
unsigned upem = hb_face_get_upem (hb_font_get_face (font)); signed upem = (int) hb_face_get_upem (hb_font_get_face (font));
unsigned count; unsigned count;
auto *positions = hb_buffer_get_glyph_positions (buffer, &count); if (x_scale != upem || y_scale != upem)
for (unsigned i = 0; i < count; i++)
{ {
auto &pos = positions[i]; auto *positions = hb_buffer_get_glyph_positions (buffer, &count);
pos.x_offset = pos.x_offset * x_scale / upem; for (unsigned i = 0; i < count; i++)
pos.y_offset = pos.y_offset * y_scale / upem;
if (scale_advances)
{ {
pos.x_advance = pos.x_advance * x_scale / upem; auto &pos = positions[i];
pos.y_advance = pos.y_advance * y_scale / upem; pos.x_offset = pos.x_offset * x_scale / upem;
pos.y_offset = pos.y_offset * y_scale / upem;
if (scale_advances)
{
pos.x_advance = pos.x_advance * x_scale / upem;
pos.y_advance = pos.y_advance * y_scale / upem;
}
} }
} }
} }