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

[glyf] Minor, don't pass accelerator_t to points_aggregator_t 

No need to pass it to aggregator itself
This commit is contained in:
ebraminio 2020-08-10 07:39:36 +04:30 committed by GitHub
parent 2b9927f7e1
commit e5fe363aa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -905,7 +905,6 @@ struct glyf
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;
const accelerator_t *accelerator;
struct contour_bounds_t struct contour_bounds_t
{ {
@ -941,10 +940,9 @@ struct glyf
float min_x, min_y, max_x, max_y; float min_x, min_y, max_x, max_y;
} bounds; } bounds;
points_aggregator_t (hb_font_t *font_, const accelerator_t *accelerator_, 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_)
{ {
font = font_; font = font_;
accelerator = accelerator_;
extents = extents_; extents = extents_;
phantoms = phantoms_; phantoms = phantoms_;
if (extents) bounds = contour_bounds_t (); if (extents) bounds = contour_bounds_t ();
@ -967,7 +965,7 @@ struct glyf
contour_point_t phantoms[PHANTOM_COUNT]; contour_point_t phantoms[PHANTOM_COUNT];
if (likely (font->num_coords == gvar->get_axis_count ())) if (likely (font->num_coords == gvar->get_axis_count ()))
success = get_points (font, gid, points_aggregator_t (font, this, nullptr, phantoms)); success = get_points (font, gid, points_aggregator_t (font, nullptr, phantoms));
if (unlikely (!success)) if (unlikely (!success))
return is_vertical ? vmtx->get_advance (gid) : hmtx->get_advance (gid); return is_vertical ? vmtx->get_advance (gid) : hmtx->get_advance (gid);
@ -985,7 +983,7 @@ struct glyf
hb_glyph_extents_t extents; hb_glyph_extents_t extents;
contour_point_t phantoms[PHANTOM_COUNT]; contour_point_t phantoms[PHANTOM_COUNT];
if (unlikely (!get_points (font, gid, points_aggregator_t (font, this, &extents, phantoms)))) if (unlikely (!get_points (font, gid, points_aggregator_t (font, &extents, phantoms))))
return is_vertical ? vmtx->get_side_bearing (gid) : hmtx->get_side_bearing (gid); return is_vertical ? vmtx->get_side_bearing (gid) : hmtx->get_side_bearing (gid);
return is_vertical return is_vertical
@ -1001,7 +999,7 @@ struct glyf
#ifndef HB_NO_VAR #ifndef HB_NO_VAR
if (font->num_coords && font->num_coords == gvar->get_axis_count ()) if (font->num_coords && font->num_coords == gvar->get_axis_count ())
return get_points (font, gid, points_aggregator_t (font, this, extents, nullptr)); return get_points (font, gid, points_aggregator_t (font, extents, nullptr));
#endif #endif
return glyph_for_gid (gid).get_extents (font, *this, extents); return glyph_for_gid (gid).get_extents (font, *this, extents);
} }