rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* src/autofit/aflatin.c (af_latin_compute_stem_width): Optimize.

This commit is contained in:
Werner Lemberg 2016-03-15 07:55:05 +01:00
parent 1865575a71
commit da86b73f03
2 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2016-03-15 Werner Lemberg <wl@gnu.org>
* src/autofit/aflatin.c (af_latin_compute_stem_width): Optimize.
2016-03-14 Alexei Podtelezhnikov <apodtele@gmail.com>
[smooth] Temporarily revert 6eb6158dd787 (#47114).

59
src/autofit/aflatin.c
View File

@ -2511,7 +2511,6 @@
AF_LatinMetrics metrics = (AF_LatinMetrics)hints->metrics;
AF_LatinAxis axis = &metrics->axis[dim];
FT_Pos dist = width;
FT_Pos bdelta = 0;
FT_Int sign = 0;
FT_Int vertical = ( dim == AF_DIMENSION_VERT );
@ -2526,32 +2525,6 @@
sign = 1;
}
/* A stem's end position depends on two values: the start position */
/* and the stem length. The former gets usually rounded to the grid, */
/* while the latter gets rounded also if it exceeds a certain length */
/* (see below in this function). This `double rounding' can lead to */
/* a great difference to the original, unhinted position; this */
/* normally doesn't matter for large PPEM values, but for small sizes */
/* it can easily make outlines collide. For this reason, we adjust */
/* the stem length by a small amount depending on the PPEM value in */
/* case the former and latter rounding both point into the same */
/* direction. */
if ( ( ( width > 0 ) && ( base_delta > 0 ) ) ||
( ( width < 0 ) && ( base_delta < 0 ) ) )
{
FT_UInt ppem = metrics->root.scaler.face->size->metrics.x_ppem;
if ( ppem < 10 )
bdelta = base_delta;
else if ( ppem < 30 )
bdelta = ( base_delta * (FT_Pos)( 30 - ppem ) ) / 20;
if ( bdelta < 0 )
bdelta = -bdelta;
}
if ( ( vertical && !AF_LATIN_HINTS_DO_VERT_SNAP( hints ) ) ||
( !vertical && !AF_LATIN_HINTS_DO_HORZ_SNAP( hints ) ) )
{
@ -2609,7 +2582,39 @@
dist += delta;
}
else
{
/* A stem's end position depends on two values: the start */
/* position and the stem length. The former gets usually */
/* rounded to the grid, while the latter gets rounded also if it */
/* exceeds a certain length (see below in this function). This */
/* `double rounding' can lead to a great difference to the */
/* original, unhinted position; this normally doesn't matter for */
/* large PPEM values, but for small sizes it can easily make */
/* outlines collide. For this reason, we adjust the stem length */
/* by a small amount depending on the PPEM value in case the */
/* former and latter rounding both point into the same */
/* direction. */
FT_Pos bdelta = 0;
if ( ( ( width > 0 ) && ( base_delta > 0 ) ) ||
( ( width < 0 ) && ( base_delta < 0 ) ) )
{
FT_UInt ppem = metrics->root.scaler.face->size->metrics.x_ppem;
if ( ppem < 10 )
bdelta = base_delta;
else if ( ppem < 30 )
bdelta = ( base_delta * (FT_Pos)( 30 - ppem ) ) / 20;
if ( bdelta < 0 )
bdelta = -bdelta;
}
dist = ( dist - bdelta + 32 ) & ~63;
}
}
}
else