small bug-fix, the linearHoriBearing value was not

loaded not computed correctly
This commit is contained in:
David Turner 2000-09-15 17:17:17 +00:00
parent c9ce9e4e3f
commit b8817177a0
3 changed files with 12 additions and 4 deletions

View File

@ -1970,13 +1970,16 @@
/* copy the _unscaled_ advance width */ /* copy the _unscaled_ advance width */
metrics->horiAdvance = decoder.glyph_width; metrics->horiAdvance = decoder.glyph_width;
glyph->root.linearHoriAdvance = decoder.glyph_width;
/* make up vertical metrics */ /* make up vertical metrics */
metrics->vertBearingX = 0; metrics->vertBearingX = 0;
metrics->vertBearingY = 0; metrics->vertBearingY = 0;
metrics->vertAdvance = 0; metrics->vertAdvance = 0;
glyph->root.linearVertAdvance = 0;
glyph->root.format = ft_glyph_format_outline; glyph->root.format = ft_glyph_format_outline;
glyph->root.outline.flags = 0; glyph->root.outline.flags = 0;

View File

@ -274,13 +274,15 @@
/* copy the _unscaled_ advance width */ /* copy the _unscaled_ advance width */
metrics->horiAdvance = decoder.builder.advance.x; metrics->horiAdvance = decoder.builder.advance.x;
glyph->root.linearHoriAdvance = decoder.builder.advance.x;
/* make up vertical metrics */ /* make up vertical metrics */
metrics->vertBearingX = 0; metrics->vertBearingX = 0;
metrics->vertBearingY = 0; metrics->vertBearingY = 0;
metrics->vertAdvance = 0; metrics->vertAdvance = 0;
glyph->root.linearVertAdvance = 0;
glyph->root.format = ft_glyph_format_outline; glyph->root.format = ft_glyph_format_outline;
if ( size && size->root.metrics.y_ppem < 24 ) if ( size && size->root.metrics.y_ppem < 24 )

View File

@ -168,7 +168,7 @@
glyph->root.outline.n_points = 0; glyph->root.outline.n_points = 0;
glyph->root.outline.n_contours = 0; glyph->root.outline.n_contours = 0;
hinting = ( load_flags & FT_LOAD_NO_SCALE ) == 0 && hinting = ( load_flags & FT_LOAD_NO_SCALE ) == 0 &&
( load_flags & FT_LOAD_NO_HINTING ) == 0; ( load_flags & FT_LOAD_NO_HINTING ) == 0;
@ -224,13 +224,16 @@
/* copy the _unscaled_ advance width */ /* copy the _unscaled_ advance width */
metrics->horiAdvance = decoder.builder.advance.x; metrics->horiAdvance = decoder.builder.advance.x;
glyph->root.linearHoriAdvance = decoder.builder.advance.x;
/* make up vertical metrics */ /* make up vertical metrics */
metrics->vertBearingX = 0; metrics->vertBearingX = 0;
metrics->vertBearingY = 0; metrics->vertBearingY = 0;
metrics->vertAdvance = 0; metrics->vertAdvance = 0;
glyph->root.linearVertAdvance = 0;
glyph->root.format = ft_glyph_format_outline; glyph->root.format = ft_glyph_format_outline;
if ( size && size->root.metrics.y_ppem < 24 ) if ( size && size->root.metrics.y_ppem < 24 )