diff options
| author | Werner Lemberg <wl@gnu.org> | 2021-07-12 22:11:24 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2021-07-12 22:11:24 +0200 |
| commit | 825b7ea2f2740eacbda85c65d771da43ee399a6a (patch) | |
| tree | 523ecc7aa5615201b493e39077dd0cc28e050345 | |
| parent | 205d1ae43e63b7145ec13990de7fe6c189a0eb2a (diff) | |
| download | freetype2-825b7ea2f2740eacbda85c65d771da43ee399a6a.tar.gz | |
[autofit] More clean-ups.
* src/autofit/afhints.h (AF_GlyphHintsRec): Remove the no longer
needed fields `xmin_delta` and `xmax_delta`.
* src/autofit/afhints.c (af_glyph_hints_reload),
src/autofit/afloader.c (af_loader_load_glyph): Updated.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/autofit/afhints.c | 3 | ||||
| -rw-r--r-- | src/autofit/afhints.h | 3 | ||||
| -rw-r--r-- | src/autofit/afloader.c | 4 |
4 files changed, 12 insertions, 8 deletions
@@ -1,5 +1,15 @@ 2021-07-12 Werner Lemberg <wl@gnu.org> + [autofit] More clean-ups. + + * src/autofit/afhints.h (AF_GlyphHintsRec): Remove the no longer + needed fields `xmin_delta` and `xmax_delta`. + + * src/autofit/afhints.c (af_glyph_hints_reload), + src/autofit/afloader.c (af_loader_load_glyph): Updated. + +2021-07-12 Werner Lemberg <wl@gnu.org> + Small clean-ups for the last few commits. * include/freetype/fttrace.h (afwarp): Removed. diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c index 5976a6cf7..4bf6d66dd 100644 --- a/src/autofit/afhints.c +++ b/src/autofit/afhints.c @@ -953,9 +953,6 @@ hints->x_delta = x_delta; hints->y_delta = y_delta; - hints->xmin_delta = 0; - hints->xmax_delta = 0; - points = hints->points; if ( hints->num_points == 0 ) goto Exit; diff --git a/src/autofit/afhints.h b/src/autofit/afhints.h index 9f3639261..38d2847d7 100644 --- a/src/autofit/afhints.h +++ b/src/autofit/afhints.h @@ -362,9 +362,6 @@ FT_BEGIN_HEADER /* implementations */ AF_StyleMetrics metrics; - FT_Pos xmin_delta; /* used for warping */ - FT_Pos xmax_delta; - /* Two arrays to avoid allocation penalty. */ /* The `embedded' structure must be the last element! */ struct diff --git a/src/autofit/afloader.c b/src/autofit/afloader.c index b2cfd69e9..a06d49ad7 100644 --- a/src/autofit/afloader.c +++ b/src/autofit/afloader.c @@ -473,8 +473,8 @@ FT_Pos pp2x = loader->pp2.x; - loader->pp1.x = FT_PIX_ROUND( pp1x + hints->xmin_delta ); - loader->pp2.x = FT_PIX_ROUND( pp2x + hints->xmax_delta ); + loader->pp1.x = FT_PIX_ROUND( pp1x ); + loader->pp2.x = FT_PIX_ROUND( pp2x ); slot->lsb_delta = loader->pp1.x - pp1x; slot->rsb_delta = loader->pp2.x - pp2x; |