[gvar] Take coords in instead of font in apply_deltas_to_points
This commit is contained in:
parent
3caa42a4a7
commit
8e46870093
|
@ -276,7 +276,9 @@ struct Glyph
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef HB_NO_VAR
|
#ifndef HB_NO_VAR
|
||||||
glyf_accelerator.gvar->apply_deltas_to_points (gid, font, points.as_array ());
|
glyf_accelerator.gvar->apply_deltas_to_points (gid,
|
||||||
|
hb_array (font->coords, font->num_coords),
|
||||||
|
points.as_array ());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// mainly used by CompositeGlyph calculating new X/Y offset value so no need to extend it
|
// mainly used by CompositeGlyph calculating new X/Y offset value so no need to extend it
|
||||||
|
|
|
@ -548,10 +548,11 @@ struct gvar
|
||||||
{ return (i >= end) ? start : (i + 1); }
|
{ return (i >= end) ? start : (i + 1); }
|
||||||
|
|
||||||
public:
|
public:
|
||||||
bool apply_deltas_to_points (hb_codepoint_t glyph, hb_font_t *font,
|
bool apply_deltas_to_points (hb_codepoint_t glyph,
|
||||||
|
hb_array_t<int> coords,
|
||||||
const hb_array_t<contour_point_t> points) const
|
const hb_array_t<contour_point_t> points) const
|
||||||
{
|
{
|
||||||
if (!font->num_coords) return true;
|
if (!coords) return true;
|
||||||
|
|
||||||
if (unlikely (glyph >= table->glyphCount)) return true;
|
if (unlikely (glyph >= table->glyphCount)) return true;
|
||||||
|
|
||||||
|
@ -578,7 +579,6 @@ struct gvar
|
||||||
if (points.arrayZ[i].is_end_point)
|
if (points.arrayZ[i].is_end_point)
|
||||||
end_points.push (i);
|
end_points.push (i);
|
||||||
|
|
||||||
auto coords = hb_array (font->coords, font->num_coords);
|
|
||||||
unsigned num_coords = table->axisCount;
|
unsigned num_coords = table->axisCount;
|
||||||
hb_array_t<const F2DOT14> shared_tuples = (table+table->sharedTuples).as_array (table->sharedTupleCount * table->axisCount);
|
hb_array_t<const F2DOT14> shared_tuples = (table+table->sharedTuples).as_array (table->sharedTupleCount * table->axisCount);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue