summaryrefslogtreecommitdiff
path: root/src/sfnt/ttload.c
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2017-01-25 15:08:41 +0100
committerWerner Lemberg <wl@gnu.org>2017-01-25 15:08:41 +0100
commitf4e569664332b30eca48643ed5194d0da91b0560 (patch)
tree52b073efbc8041d6aacb43c1861c36cfc45641ff /src/sfnt/ttload.c
parentd66c3645fc7b87f5d02f658d394107221ce01713 (diff)
downloadfreetype2-f4e569664332b30eca48643ed5194d0da91b0560.tar.gz
[sfnt] s/TT_NameEntry/TT_Name/.
* include/freetype/internal/tttypes.h (TT_NameEntryRec): Renamed to... (TT_NameRec): This. (TT_NameTableRec): Updated. * src/base/ftsnames.c (FT_Get_Sfnt_Name): Updated. * src/sfnt/sfdriver.c (sfnt_get_ps_name): Updated. * src/sfnt/sfobjs.c (tt_name_entry_ascii_from_utf16, tt_name_entry_ascii_from_other): Renamed to... (tt_name_ascii_from_utf16, tt_name_entry_ascii_from_other): This, respectively. (TT_NameEntry_ConvertFunc): Renamed to... (TT_Name_ConvertFunc): This. (tt_face_get_name): Updated. * src/sfnt/ttload.c (tt_face_load_name, tt_face_free_names): Updated.
Diffstat (limited to 'src/sfnt/ttload.c')
-rw-r--r--src/sfnt/ttload.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index 53837c7c1..3ab211cd0 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -826,7 +826,7 @@
static const FT_Frame_Field name_record_fields[] =
{
#undef FT_STRUCTURE
-#define FT_STRUCTURE TT_NameEntryRec
+#define FT_STRUCTURE TT_NameRec
/* no FT_FRAME_START */
FT_FRAME_USHORT( platformID ),
@@ -880,7 +880,7 @@
/* Load the name records and determine how much storage is needed */
/* to hold the strings themselves. */
{
- TT_NameEntryRec* entry = table->names;
+ TT_Name entry = table->names;
for ( ; count > 0; count-- )
@@ -935,7 +935,7 @@
{
FT_Memory memory = face->root.driver->root.memory;
TT_NameTable table = &face->name_table;
- TT_NameEntry entry = table->names;
+ TT_Name entry = table->names;
FT_UInt count = table->numNameRecords;