diff options
| author | Makoto Onuki <omakoto@google.com> | 2015-06-09 16:35:08 -0700 |
|---|---|---|
| committer | Abhisek Devkota <ciwrl@cyanogenmod.com> | 2015-08-19 11:42:11 -0700 |
| commit | a3a6685e80688af254c5c23a62a2f3b0bcef5e5f (patch) | |
| tree | 7e67208cafc4572557e8d10469fb5dc173ca2edf /src/sfnt/ttmtx.c | |
| parent | 6bb07037be23a1523b3af5b1be5432bd4ccf22b7 (diff) | |
| download | android_external_freetype-stable/cm-11.0-XNG3C.tar.gz android_external_freetype-stable/cm-11.0-XNG3C.tar.bz2 android_external_freetype-stable/cm-11.0-XNG3C.zip | |
Update to freetype 2.6.0stable/cm-11.0-XNG3C
Bug 18751561
RM-154
Change-Id: Ia8c081f8fd38a1f78c72d30234c5ace8cfffe6a9
(cherry picked from commit c341565733345bef8ebe68db3c175301afe4ec97)
Diffstat (limited to 'src/sfnt/ttmtx.c')
| -rw-r--r-- | src/sfnt/ttmtx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c index a8cc63a..58309aa 100644 --- a/src/sfnt/ttmtx.c +++ b/src/sfnt/ttmtx.c @@ -4,7 +4,7 @@ /* */ /* Load the metrics tables common to TTF and OTF fonts (body). */ /* */ -/* Copyright 2006-2009, 2011-2013 by */ +/* Copyright 2006-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -201,7 +201,7 @@ /* aadvance :: The advance width or advance height, depending on */ /* the `vertical' flag. */ /* */ - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL_DEF( void ) tt_face_get_metrics( TT_Face face, FT_Bool vertical, FT_UInt gindex, @@ -274,8 +274,6 @@ *abearing = 0; *aadvance = 0; } - - return FT_Err_Ok; } |