fixed a minor bug in the computation of the vertical
metrics top-side bearing
This commit is contained in:
parent
fdc225b153
commit
3b925ef744
|
@ -727,7 +727,6 @@
|
||||||
TT_UShort index;
|
TT_UShort index;
|
||||||
TT_UShort u;
|
TT_UShort u;
|
||||||
TT_Long count;
|
TT_Long count;
|
||||||
TT_Long Top;
|
|
||||||
|
|
||||||
TT_Long glyph_offset, offset;
|
TT_Long glyph_offset, offset;
|
||||||
|
|
||||||
|
@ -896,7 +895,6 @@
|
||||||
TT_Short left_bearing;
|
TT_Short left_bearing;
|
||||||
TT_UShort advance_width;
|
TT_UShort advance_width;
|
||||||
|
|
||||||
|
|
||||||
Get_HMetrics( face, index, TRUE,
|
Get_HMetrics( face, index, TRUE,
|
||||||
&left_bearing,
|
&left_bearing,
|
||||||
&advance_width );
|
&advance_width );
|
||||||
|
@ -1328,8 +1326,10 @@
|
||||||
glyph->outline.second_pass = TRUE;
|
glyph->outline.second_pass = TRUE;
|
||||||
|
|
||||||
/* translate array so that (0,0) is the glyph's origin */
|
/* translate array so that (0,0) is the glyph's origin */
|
||||||
translate_array( num_points + 2, glyph->outline.points,
|
translate_array( (TT_UShort)(num_points + 2),
|
||||||
-subglyph->pp1.x, 0 );
|
glyph->outline.points,
|
||||||
|
-subglyph->pp1.x,
|
||||||
|
0 );
|
||||||
|
|
||||||
FT_Get_Outline_CBox( &glyph->outline, &bbox );
|
FT_Get_Outline_CBox( &glyph->outline, &bbox );
|
||||||
|
|
||||||
|
@ -1378,6 +1378,7 @@
|
||||||
TT_UShort advance_height; /* vertical advance height (EM units) */
|
TT_UShort advance_height; /* vertical advance height (EM units) */
|
||||||
|
|
||||||
TT_Pos left; /* scaled vertical left side bearing */
|
TT_Pos left; /* scaled vertical left side bearing */
|
||||||
|
TT_Pos Top; /* scaled original vertical top side bearing */
|
||||||
TT_Pos top; /* scaled vertical top side bearing */
|
TT_Pos top; /* scaled vertical top side bearing */
|
||||||
TT_Pos advance; /* scaled vertical advance height */
|
TT_Pos advance; /* scaled vertical advance height */
|
||||||
|
|
||||||
|
@ -1433,7 +1434,7 @@
|
||||||
{
|
{
|
||||||
Top = SCALE_Y( top_bearing );
|
Top = SCALE_Y( top_bearing );
|
||||||
top = SCALE_Y( top_bearing + subglyph->bbox.yMax ) - bbox.yMax;
|
top = SCALE_Y( top_bearing + subglyph->bbox.yMax ) - bbox.yMax;
|
||||||
advance = SCALE_X( advance_height );
|
advance = SCALE_Y( advance_height );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue