diff options
| author | Victoria Lease <violets@google.com> | 2013-06-10 13:55:54 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2013-06-10 16:14:43 -0700 |
| commit | 727dee178a392d20eb050d0c446f2fcc29058fa1 (patch) | |
| tree | c3764963cd9267a20d27a3267af298e172529216 /src/base/fttype1.c | |
| parent | 8afe960626dbf326354b836fd4d63e05b6974195 (diff) | |
| download | android_external_freetype-727dee178a392d20eb050d0c446f2fcc29058fa1.tar.gz android_external_freetype-727dee178a392d20eb050d0c446f2fcc29058fa1.tar.bz2 android_external_freetype-727dee178a392d20eb050d0c446f2fcc29058fa1.zip | |
Update freetype to 5e094c6fb2ddd6e8901a5679e2cbb8fa476a38ee
Integrated patches from freetype2 git repository, up to hashval
5e094c6fb2ddd6e8901a5679e2cbb8fa476a38ee, which is post-2.4.12.
Most recent commit message from freetype git:
[truetype] Improve handling of broken sbit advance widths.
Noteworthy patches included:
[cff] Add a new Type 2 interpreter and hinter.
Add support for color embedded bitmaps (eg. color emoji).
Change-Id: Ia8b6a67bc18f841b24f44edf80f81f663185b598
Diffstat (limited to 'src/base/fttype1.c')
| -rw-r--r-- | src/base/fttype1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/base/fttype1.c b/src/base/fttype1.c index c30124f..1d17402 100644 --- a/src/base/fttype1.c +++ b/src/base/fttype1.c @@ -28,7 +28,7 @@ FT_Get_PS_Font_Info( FT_Face face,
PS_FontInfoRec* afont_info )
{
- FT_Error error = FT_Err_Invalid_Argument;
+ FT_Error error = FT_ERR( Invalid_Argument );
if ( face )
@@ -73,7 +73,7 @@ FT_Get_PS_Font_Private( FT_Face face,
PS_PrivateRec* afont_private )
{
- FT_Error error = FT_Err_Invalid_Argument;
+ FT_Error error = FT_ERR( Invalid_Argument );
if ( face )
|