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 /include/internal/tttypes.h | |
| 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 'include/internal/tttypes.h')
| -rw-r--r-- | include/internal/tttypes.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/internal/tttypes.h b/include/internal/tttypes.h index ad302b8..31dd0aa 100644 --- a/include/internal/tttypes.h +++ b/include/internal/tttypes.h @@ -5,7 +5,7 @@ /* Basic SFNT/TrueType type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2002, 2004-2008, 2012-2013 by */ +/* Copyright 1996-2015 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -614,8 +614,7 @@ FT_BEGIN_HEADER /* in use by other platforms (e.g. Newton). */ /* For details, please see */ /* */ - /* http://fonts.apple.com/ */ - /* TTRefMan/RM06/Chap6bloc.html */ + /* https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6bloc.html */ /* */ /* hori :: The line metrics for horizontal layouts. */ /* */ @@ -635,8 +634,7 @@ FT_BEGIN_HEADER /* flags :: Is this a vertical or horizontal strike? For */ /* details, please see */ /* */ - /* http://fonts.apple.com/ */ - /* TTRefMan/RM06/Chap6bloc.html */ + /* https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6bloc.html */ /* */ typedef struct TT_SBit_StrikeRec_ { @@ -1113,7 +1111,7 @@ FT_BEGIN_HEADER /* This field also contains the associated */ /* vertical metrics table (`vmtx'), if found. */ /* IMPORTANT: The contents of this field is */ - /* undefined if the `verticalInfo' field is */ + /* undefined if the `vertical_info' field is */ /* unset. */ /* */ /* num_names :: The number of name records within this */ @@ -1440,7 +1438,7 @@ FT_BEGIN_HEADER { FT_Memory memory; FT_UShort max_points; - FT_UShort max_contours; + FT_Short max_contours; FT_UShort n_points; /* number of points in zone */ FT_Short n_contours; /* number of contours */ |