summaryrefslogtreecommitdiffstats
path: root/src/sfnt/ttmtx.c
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2013-12-12 09:12:18 -0800
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2015-08-19 11:41:16 -0700
commit0e0d6b5b627150577c9f4486b3ba97f9778799ca (patch)
treebaa7eea792c50b86250831c67a9f2a6eb5be6a91 /src/sfnt/ttmtx.c
parent5b18c5874f85aa819ddef822b95a66ca070421dc (diff)
downloadandroid_external_freetype-0e0d6b5b627150577c9f4486b3ba97f9778799ca.tar.gz
android_external_freetype-0e0d6b5b627150577c9f4486b3ba97f9778799ca.tar.bz2
android_external_freetype-0e0d6b5b627150577c9f4486b3ba97f9778799ca.zip
Update freetype to 8bb09b0fe4d9747bcf452a777cabed7d7ef435e2
Integrated patches from freetype2 git repository, up to hashval 8bb09b0fe4d9747bcf452a777cabed7d7ef435e2, which is post-2.5.2. Most recent commit message from freetype git: [truetype] Simplify logic of rendering modes. Noteworthy patches included: [sfnt] Fix handling of embedded bitmap strikes. [truetype] Improve handling of buggy embedded bitmap strikes. Add FT_FACE_FLAG_COLOR and FT_HAS_COLOR. RM-154 Change-Id: I4a22d96c9443c7a587475ca0a9c684843e144b18 (cherry picked from commit 186452fd35238e2cd86e4e1494eaee211d7e4ccd)
Diffstat (limited to 'src/sfnt/ttmtx.c')
-rw-r--r--src/sfnt/ttmtx.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/sfnt/ttmtx.c b/src/sfnt/ttmtx.c
index 371a9ed..a8cc63a 100644
--- a/src/sfnt/ttmtx.c
+++ b/src/sfnt/ttmtx.c
@@ -183,20 +183,23 @@
/* tt_face_get_metrics */
/* */
/* <Description> */
- /* Returns the horizontal or vertical metrics in font units for a */
- /* given glyph. The metrics are the left side bearing (resp. top */
- /* side bearing) and advance width (resp. advance height). */
+ /* Return the horizontal or vertical metrics in font units for a */
+ /* given glyph. The values are the left side bearing (top side */
+ /* bearing for vertical metrics) and advance width (advance height */
+ /* for vertical metrics). */
/* */
/* <Input> */
- /* header :: A pointer to either the horizontal or vertical metrics */
- /* structure. */
+ /* face :: A pointer to the TrueType face structure. */
/* */
- /* idx :: The glyph index. */
+ /* vertical :: If set to TRUE, get vertical metrics. */
+ /* */
+ /* gindex :: The glyph index. */
/* */
/* <Output> */
- /* bearing :: The bearing, either left side or top side. */
+ /* abearing :: The bearing, either left side or top side. */
/* */
- /* advance :: The advance width resp. advance height. */
+ /* aadvance :: The advance width or advance height, depending on */
+ /* the `vertical' flag. */
/* */
FT_LOCAL_DEF( FT_Error )
tt_face_get_metrics( TT_Face face,