diff options
| author | Tor Lillqvist <tml@novell.com> | 2007-04-30 05:54:29 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2007-04-30 05:54:29 +0000 |
| commit | 69bcc7f2e5ca2c7135e7ba558c85fffbce2426cb (patch) | |
| tree | 9f66dccc1f8a0478a888598d982f5c81e5b0c19b /pango/pangowin32-fontmap.c | |
| parent | f5607a0bb157b9dc6339e6002fbcd94764b234ae (diff) | |
| download | pango-69bcc7f2e5ca2c7135e7ba558c85fffbce2426cb.tar.gz | |
A font name in encoding UCS4_ENCODING_ID actually is in UTF-16, not UCS-4.
2007-04-30 Tor Lillqvist <tml@novell.com>
* pango/pangowin32-fontmap.c (get_family_nameA, get_family_nameW):
A font name in encoding UCS4_ENCODING_ID actually is in UTF-16,
not UCS-4. (#429397, Akihiro Okamura)
svn path=/trunk/; revision=2237
Diffstat (limited to 'pango/pangowin32-fontmap.c')
| -rw-r--r-- | pango/pangowin32-fontmap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pango/pangowin32-fontmap.c b/pango/pangowin32-fontmap.c index 3c98e5c4..b9a5e055 100644 --- a/pango/pangowin32-fontmap.c +++ b/pango/pangowin32-fontmap.c @@ -690,7 +690,8 @@ get_family_nameA (const LOGFONTA *lfp) if (name_ix == microsoft_ix) if (record.encoding_id == SYMBOL_ENCODING_ID || - record.encoding_id == UNICODE_ENCODING_ID) + record.encoding_id == UNICODE_ENCODING_ID || + record.encoding_id == UCS4_ENCODING_ID) codeset = "UTF-16BE"; else codeset = "UCS-4BE"; @@ -884,7 +885,8 @@ get_family_nameW (const LOGFONTW *lfp) if (name_ix == microsoft_ix) if (record.encoding_id == SYMBOL_ENCODING_ID || - record.encoding_id == UNICODE_ENCODING_ID) + record.encoding_id == UNICODE_ENCODING_ID || + record.encoding_id == UCS4_ENCODING_ID) codeset = "UTF-16BE"; else codeset = "UCS-4BE"; |