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

[glyf] Refactor contour_bounds_t use to make its fields protected

This commit is contained in:
Ebrahim Byagowi 2019-10-29 21:30:04 +03:30
parent 773ee8041e
commit d59ae5836d
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/hb-ot-glyf-table.hh
View File

@ -820,6 +820,31 @@ struct glyf
bool empty () const { return (min_x >= max_x) || (min_y >= max_y); } bool empty () const { return (min_x >= max_x) || (min_y >= max_y); }
void get_extents (hb_font_t *font, hb_glyph_extents_t *extents)
{
if (min_x > max_x)
{
extents->width = 0;
extents->x_bearing = 0;
}
else
{
extents->x_bearing = font->em_scalef_x (min_x);
extents->width = font->em_scalef_x (max_x - min_x);
}
if (min_y > max_y)
{
extents->height = 0;
extents->y_bearing = 0;
}
else
{
extents->y_bearing = font->em_scalef_y (max_y);
extents->height = font->em_scalef_y (min_y - max_y);
}
}
protected:
float min_x, min_y, max_x, max_y; float min_x, min_y, max_x, max_y;
}; };
@ -918,27 +943,7 @@ struct glyf
contour_bounds_t bounds; contour_bounds_t bounds;
for (unsigned int i = 0; i + PHANTOM_COUNT < all_points.length; i++) for (unsigned int i = 0; i + PHANTOM_COUNT < all_points.length; i++)
bounds.add (all_points[i]); bounds.add (all_points[i]);
bounds.get_extents (font, extents);
if (bounds.min_x > bounds.max_x)
{
extents->width = 0;
extents->x_bearing = 0;
}
else
{
extents->x_bearing = font->em_scalef_x (bounds.min_x);
extents->width = font->em_scalef_x (bounds.max_x - bounds.min_x);
}
if (bounds.min_y > bounds.max_y)
{
extents->height = 0;
extents->y_bearing = 0;
}
else
{
extents->y_bearing = font->em_scalef_y (bounds.max_y);
extents->height = font->em_scalef_y (bounds.min_y - bounds.max_y);
}
} }
if (phantoms) if (phantoms)
for (unsigned int i = 0; i < PHANTOM_COUNT; i++) for (unsigned int i = 0; i < PHANTOM_COUNT; i++)