summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2002-03-29 18:11:25 +0000
committerWerner Lemberg <wl@gnu.org>2002-03-29 18:11:25 +0000
commit19ee6dfe892e93c0534f318618c7983251765d89 (patch)
tree8c4c67f93a3768bcc441f4b2391aa486ed67f5e8
parent28cc3ef157f04b17a4f2005aa976c9b030d4de9c (diff)
downloadfreetype2-19ee6dfe892e93c0534f318618c7983251765d89.tar.gz
* src/sfnt/sfobjs.c (Get_Name): Handle (3,0) name entries similar to
(3,1).
-rw-r--r--ChangeLog5
-rw-r--r--src/sfnt/sfobjs.c23
2 files changed, 12 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index cf0ea7191..72791b24e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-29 KUSANO Takayuki <AE5T-KSN@asahi-net.or.jp>
+
+ * src/sfnt/sfobjs.c (Get_Name): Handle (3,0) name entries similar to
+ (3,1).
+
2002-03-28 KUSANO Takayuki <AE5T-KSN@asahi-net.or.jp>
* src/sfnt/sfdriver.c (get_sfnt_postscript_name): Fix serious typos.
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index c5f80d8af..880b58f83 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -231,23 +231,14 @@
rec = face->name_table.names + found_win;
switch ( rec->encodingID )
{
- case TT_MS_ID_UNICODE_CS:
- {
- result = tt_name_entry_ascii_from_utf16( rec, memory );
- break;
- }
+ case TT_MS_ID_UNICODE_CS:
+ case TT_MS_ID_SYMBOL_CS:
+ result = tt_name_entry_ascii_from_utf16( rec, memory );
+ break;
- case TT_MS_ID_SYMBOL_CS:
- {
- result = tt_name_entry_ascii_from_other( rec, memory );
- break;
- }
-
- case TT_MS_ID_UCS_4:
- {
- result = tt_name_entry_ascii_from_ucs4( rec, memory );
- break;
- }
+ case TT_MS_ID_UCS_4:
+ result = tt_name_entry_ascii_from_ucs4( rec, memory );
+ break;
}
}
else if ( found_apple >= 0 )