diff options
author | David 'Digit' Turner <digit@google.com> | 2011-01-26 13:53:40 +0100 |
---|---|---|
committer | David 'Digit' Turner <digit@google.com> | 2011-01-26 13:53:40 +0100 |
commit | 7f08cbd7d6dcf19b8d8e4328e33032aee342e3b4 (patch) | |
tree | f9ed9e041d6830735eae3d4af62e9a602851faea /src/pshinter | |
parent | cb487e4c5295d0d9bb96ddd3a27372ffad41ae5b (diff) | |
download | android_external_freetype-7f08cbd7d6dcf19b8d8e4328e33032aee342e3b4.tar.gz android_external_freetype-7f08cbd7d6dcf19b8d8e4328e33032aee342e3b4.tar.bz2 android_external_freetype-7f08cbd7d6dcf19b8d8e4328e33032aee342e3b4.zip |
Upgrade to upstream 2.4.4
This is necessary to fix several security issues. See b/3344697
Change-Id: Ica5c6387fbd791008199f7994ed03978ed700a69
Diffstat (limited to 'src/pshinter')
-rw-r--r-- | src/pshinter/pshalgo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c index 4b08785..d798978 100644 --- a/src/pshinter/pshalgo.c +++ b/src/pshinter/pshalgo.c @@ -1862,12 +1862,10 @@ point->cur_u = hint->cur_pos + hint->cur_len + FT_MulFix( delta - hint->org_len, scale ); - else if ( hint->org_len > 0 ) + else /* hint->org_len > 0 */ point->cur_u = hint->cur_pos + FT_MulDiv( delta, hint->cur_len, hint->org_len ); - else - point->cur_u = hint->cur_pos; } psh_point_set_fitted( point ); } |