diff options
| author | Jungshik Shin <jungshik@google.com> | 2016-01-15 16:18:25 -0800 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2016-02-24 13:20:13 -0800 |
| commit | f720f0dbcf012d6c984dbbefa0875ef9840458c6 (patch) | |
| tree | bdb1068e64623c623100071dc586117aba4a2417 /src/base/ftglyph.c | |
| parent | ec62c527eb34ee4481a0153ceb42dfd35d7e1d26 (diff) | |
| download | android_external_freetype-f720f0dbcf012d6c984dbbefa0875ef9840458c6.tar.gz android_external_freetype-f720f0dbcf012d6c984dbbefa0875ef9840458c6.tar.bz2 android_external_freetype-f720f0dbcf012d6c984dbbefa0875ef9840458c6.zip | |
[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0
1. Update to a512b0fe7a (several patches past 2.6.2).
Major changes include
- stem-darkening is OFF for CFF fonts by default
- general code tightening
- header file location is back to include/freetype (used be include/)
2. A bit more details are added to README.android for the reference.
This CL requires a pdfium change (the way it includes FT header
files : https://googleplex-android-review.git.corp.google.com/#/c/846889
An AOSP master CL
(https://android-review.googlesource.com/#/c/196504/) is ported
to mnc-dev.
Bug: 24296662
Change-Id: Iec6784838d89098f332e6d1ed79663efd91a8441
Signed-off-by: Jungshik Shin <jungshik@google.com>
Diffstat (limited to 'src/base/ftglyph.c')
| -rw-r--r-- | src/base/ftglyph.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index cb7fc37..2778743 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -125,10 +125,10 @@ FT_BitmapGlyph glyph = (FT_BitmapGlyph)bitmap_glyph; - cbox->xMin = glyph->left << 6; - cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width << 6 ); - cbox->yMax = glyph->top << 6; - cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows << 6 ); + cbox->xMin = glyph->left * 64; + cbox->xMax = cbox->xMin + (FT_Pos)( glyph->bitmap.width * 64 ); + cbox->yMax = glyph->top * 64; + cbox->yMin = cbox->yMax - (FT_Pos)( glyph->bitmap.rows * 64 ); } @@ -403,9 +403,9 @@ if ( error ) goto Exit; - /* copy advance while converting it to 16.16 format */ - glyph->advance.x = slot->advance.x << 10; - glyph->advance.y = slot->advance.y << 10; + /* copy advance while converting 26.6 to 16.16 format */ + glyph->advance.x = slot->advance.x * 1024; + glyph->advance.y = slot->advance.y * 1024; /* now import the image from the glyph slot */ error = clazz->glyph_init( glyph, slot ); |