summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2016-07-26 20:20:27 +0200
committerWerner Lemberg <wl@gnu.org>2016-07-26 20:20:27 +0200
commitd9c7f5aa6e5e9aa834ae574a45e157cbd97667a0 (patch)
treef9538cac68bcd48cf0bbc75ec2e7f561769532b3
parent3a528bbe5aec292598f655567ac48a06e3d2c137 (diff)
downloadfreetype2-d9c7f5aa6e5e9aa834ae574a45e157cbd97667a0.tar.gz
* src/autofit/aflatin.c (af_latin_metrics_scale_dim): Minor.
No functional change.
-rw-r--r--ChangeLog6
-rw-r--r--src/autofit/aflatin.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b206fdea..36ca399f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-26 Werner Lemberg <wl@gnu.org>
+
+ * src/autofit/aflatin.c (af_latin_metrics_scale_dim): Minor.
+
+ No functional change.
+
2016-07-22 Hin-Tak Leung <htl10@users.sourceforge.net>
[truetype] Record the end of IDEFs.
diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index da52cc43f..db7aaff7b 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -1076,7 +1076,7 @@
FT_UInt ppem;
- scaled = FT_MulFix( blue->shoot.org, scaler->y_scale );
+ scaled = FT_MulFix( blue->shoot.org, scale );
ppem = metrics->root.scaler.face->size->metrics.x_ppem;
limit = metrics->root.globals->increase_x_height;
threshold = 40;
@@ -1123,8 +1123,6 @@
if ( dist == 0 )
{
- scale = new_scale;
-
FT_TRACE5((
"af_latin_metrics_scale_dim:"
" x height alignment (style `%s'):\n"
@@ -1132,9 +1130,11 @@
" vertical scaling changed from %.4f to %.4f (by %d%%)\n"
"\n",
af_style_names[metrics->root.style_class->style],
- axis->org_scale / 65536.0,
scale / 65536.0,
+ new_scale / 65536.0,
( fitted - scaled ) * 100 / scaled ));
+
+ scale = new_scale;
}
#ifdef FT_DEBUG_LEVEL_TRACE
else