| Index: third_party/freetype/src/sfnt/sfdriver.c
|
| diff --git a/third_party/freetype/src/sfnt/sfdriver.c b/third_party/freetype/src/sfnt/sfdriver.c
|
| index bd8dd2e57182d0c227b8206a2c51a83f17bf43f8..6a3f0d993334b801052774a72f5cbe1966797611 100644
|
| --- a/third_party/freetype/src/sfnt/sfdriver.c
|
| +++ b/third_party/freetype/src/sfnt/sfdriver.c
|
| @@ -4,7 +4,7 @@
|
| /* */
|
| /* High-level SFNT driver interface (body). */
|
| /* */
|
| -/* Copyright 1996-2007, 2009-2014 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, */
|
| @@ -266,7 +266,7 @@
|
| {
|
| FT_Stream stream = face->name_table.stream;
|
| FT_String* r = (FT_String*)result;
|
| - FT_Byte* p;
|
| + FT_Char* p;
|
|
|
|
|
| if ( FT_STREAM_SEEK( name->stringOffset ) ||
|
| @@ -280,11 +280,11 @@
|
| goto Exit;
|
| }
|
|
|
| - p = (FT_Byte*)stream->cursor;
|
| + p = (FT_Char*)stream->cursor;
|
|
|
| for ( ; len > 0; len--, p += 2 )
|
| {
|
| - if ( p[0] == 0 && p[1] >= 32 && p[1] < 128 )
|
| + if ( p[0] == 0 && p[1] >= 32 )
|
| *r++ = p[1];
|
| }
|
| *r = '\0';
|
| @@ -427,7 +427,7 @@
|
| sfnt_get_interface( FT_Module module,
|
| const char* module_interface )
|
| {
|
| - /* SFNT_SERVICES_GET derefers `library' in PIC mode */
|
| + /* SFNT_SERVICES_GET dereferences `library' in PIC mode */
|
| #ifdef FT_CONFIG_OPTION_PIC
|
| FT_Library library;
|
|
|
| @@ -505,7 +505,9 @@
|
| PUT_EMBEDDED_BITMAPS( tt_face_set_sbit_strike ),
|
| PUT_EMBEDDED_BITMAPS( tt_face_load_strike_metrics ),
|
|
|
| - tt_face_get_metrics
|
| + tt_face_get_metrics,
|
| +
|
| + tt_face_get_name
|
| )
|
|
|
|
|
|
|