Merge branch 'var-subset' of https://github.com/harfbuzz/harfbuzz into var-subset
This commit is contained in:
commit
3236623e1f
|
@ -0,0 +1 @@
|
||||||
|
libtool
|
|
@ -191,7 +191,7 @@ struct glyf
|
||||||
point2 = p[1];
|
point2 = p[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void transform_points (contour_point_vector_t &points) const
|
void transform_points (contour_point_vector_t &points) const
|
||||||
{
|
{
|
||||||
float matrix[4];
|
float matrix[4];
|
||||||
|
@ -219,7 +219,7 @@ struct glyf
|
||||||
{
|
{
|
||||||
matrix[0] = matrix[3] = 1.f;
|
matrix[0] = matrix[3] = 1.f;
|
||||||
matrix[1] = matrix[2] = 0.f;
|
matrix[1] = matrix[2] = 0.f;
|
||||||
|
|
||||||
int tx, ty;
|
int tx, ty;
|
||||||
const HBINT8 *p = &StructAfter<const HBINT8> (glyphIndex);
|
const HBINT8 *p = &StructAfter<const HBINT8> (glyphIndex);
|
||||||
if (flags & ARG_1_AND_2_ARE_WORDS)
|
if (flags & ARG_1_AND_2_ARE_WORDS)
|
||||||
|
@ -625,7 +625,7 @@ struct glyf
|
||||||
|
|
||||||
/* Apply component transformation & translation */
|
/* Apply component transformation & translation */
|
||||||
composite.current->transform_points (comp_points);
|
composite.current->transform_points (comp_points);
|
||||||
|
|
||||||
/* Apply translatation from gvar */
|
/* Apply translatation from gvar */
|
||||||
comp_points.translate (points[comp_index]);
|
comp_points.translate (points[comp_index]);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue