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/base/ftsynth.c | |
| 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/base/ftsynth.c')
| -rw-r--r-- | src/base/ftsynth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c index ba3c633..d4ec0da 100644 --- a/src/base/ftsynth.c +++ b/src/base/ftsynth.c @@ -90,7 +90,7 @@ if ( slot->format != FT_GLYPH_FORMAT_OUTLINE && - slot->format != FT_GLYPH_FORMAT_BITMAP ) + slot->format != FT_GLYPH_FORMAT_BITMAP ) return; /* some reasonable strength */ @@ -108,7 +108,7 @@ xstr = xstr * 2; ystr = xstr; } - else if ( slot->format == FT_GLYPH_FORMAT_BITMAP ) + else /* slot->format == FT_GLYPH_FORMAT_BITMAP */ { /* round to full pixels */ xstr &= ~63; |