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

[glyf] Move contour_bounds_t into scope it is actually used

This commit is contained in:
Ebrahim Byagowi 2020-02-18 15:38:57 +03:30
parent 8bb47fa17d
commit dcd2729e71
1 changed files with 40 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -784,40 +784,6 @@ struct glyf
phantoms[PHANTOM_BOTTOM].y = v_orig - (int) v_adv; phantoms[PHANTOM_BOTTOM].y = v_orig - (int) v_adv;
} }
struct contour_bounds_t
{
contour_bounds_t () { min_x = min_y = FLT_MAX; max_x = max_y = -FLT_MAX; }
void add (const contour_point_t &p)
{
min_x = hb_min (min_x, p.x);
min_y = hb_min (min_y, p.y);
max_x = hb_max (max_x, p.x);
max_y = hb_max (max_y, p.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 (unlikely (empty ()))
{
extents->width = 0;
extents->x_bearing = 0;
extents->height = 0;
extents->y_bearing = 0;
return;
}
extents->x_bearing = font->em_scalef_x (min_x);
extents->width = font->em_scalef_x (max_x - min_x);
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;
};
/* Note: Recursively calls itself. /* Note: Recursively calls itself.
* all_points includes phantom points * all_points includes phantom points
*/ */
@ -925,13 +891,47 @@ struct glyf
return true; return true;
} }
public:
#ifndef HB_NO_VAR #ifndef HB_NO_VAR
struct points_aggregator_t struct points_aggregator_t
{ {
hb_font_t *font; hb_font_t *font;
hb_glyph_extents_t *extents; hb_glyph_extents_t *extents;
contour_point_t *phantoms; contour_point_t *phantoms;
contour_bounds_t bounds;
struct contour_bounds_t
{
contour_bounds_t () { min_x = min_y = FLT_MAX; max_x = max_y = -FLT_MAX; }
void add (const contour_point_t &p)
{
min_x = hb_min (min_x, p.x);
min_y = hb_min (min_y, p.y);
max_x = hb_max (max_x, p.x);
max_y = hb_max (max_y, p.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 (unlikely (empty ()))
{
extents->width = 0;
extents->x_bearing = 0;
extents->height = 0;
extents->y_bearing = 0;
return;
}
extents->x_bearing = font->em_scalef_x (min_x);
extents->width = font->em_scalef_x (max_x - min_x);
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;
} bounds;
points_aggregator_t (hb_font_t *font_, hb_glyph_extents_t *extents_, contour_point_t *phantoms_) points_aggregator_t (hb_font_t *font_, hb_glyph_extents_t *extents_, contour_point_t *phantoms_)
{ {
@ -947,12 +947,9 @@ struct glyf
bool is_consuming_contour_points () { return extents; } bool is_consuming_contour_points () { return extents; }
contour_point_t *get_phantoms_sink () { return phantoms; } contour_point_t *get_phantoms_sink () { return phantoms; }
}; };
#endif
public: unsigned int
#ifndef HB_NO_VAR get_advance_var (hb_font_t *font, hb_codepoint_t gid, bool is_vertical) const
unsigned int get_advance_var (hb_font_t *font, hb_codepoint_t gid,
bool is_vertical) const
{ {
bool success = false; bool success = false;
@ -961,7 +958,9 @@ struct glyf
success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms)); success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms));
if (unlikely (!success)) if (unlikely (!success))
return is_vertical ? face->table.vmtx->get_advance (gid) : face->table.hmtx->get_advance (gid); return is_vertical
? face->table.vmtx->get_advance (gid)
: face->table.hmtx->get_advance (gid);
if (is_vertical) if (is_vertical)
return roundf (phantoms[PHANTOM_TOP].y - phantoms[PHANTOM_BOTTOM].y); return roundf (phantoms[PHANTOM_TOP].y - phantoms[PHANTOM_BOTTOM].y);