luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-02 15:46:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 520914 - win_iconv doesn't support UCS-2

Browse Source 
2008-03-12  Tor Lillqvist  <tml@novell.com>

	Bug 520914 - win_iconv doesn't support UCS-2
	
	* glib/win_iconv.c: Make UCS-2 just an alias for
	UTF-16. Technically this is wrong of course, but shouldn't matter
	an awful lot in practice.


svn path=/trunk/; revision=6686
This commit is contained in:
Tor Lillqvist 2008-03-12 00:04:52 +00:00 committed by Tor Lillqvist
parent 971cacb4ed
commit fb72653abc
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-03-12 Tor Lillqvist <tml@novell.com>
Bug 520914 - win_iconv doesn't support UCS-2
* glib/win_iconv.c: Make UCS-2 just an alias for
UTF-16. Technically this is wrong of course, but shouldn't matter
an awful lot in practice.
2008-03-11 Murray Cumming <murrayc@murrayc.com> 2008-03-11 Murray Cumming <murrayc@murrayc.com>
Bug 521591 – g_markup_parse_context_parse() creates GError message that Bug 521591 – g_markup_parse_context_parse() creates GError message that

7
glib/win_iconv.c
View File

@ -178,10 +178,12 @@ static struct {
{1200, "CP1200"}, {1200, "CP1200"},
{1200, "UTF16LE"}, {1200, "UTF16LE"},
{1200, "UTF-16LE"}, {1200, "UTF-16LE"},
{1200, "UCS-2LE"},
{1201, "CP1201"}, {1201, "CP1201"},
{1201, "UTF16BE"}, {1201, "UTF16BE"},
{1201, "UTF-16BE"}, {1201, "UTF-16BE"},
{1201, "UCS-2BE"},
{1201, "unicodeFFFE"}, {1201, "unicodeFFFE"},
{12000, "CP12000"}, {12000, "CP12000"},
@ -205,6 +207,7 @@ static struct {
/* Default is little endian, because the platform is */ /* Default is little endian, because the platform is */
{1200, "UTF16"}, {1200, "UTF16"},
{1200, "UTF-16"}, {1200, "UTF-16"},
{1200, "UCS-2"},
{12000, "UTF32"}, {12000, "UTF32"},
{12000, "UTF-32"}, {12000, "UTF-32"},
#endif #endif
@ -891,7 +894,9 @@ make_csconv(const char *_name)
{ {
cv.mbtowc = utf16_mbtowc; cv.mbtowc = utf16_mbtowc;
cv.wctomb = utf16_wctomb; cv.wctomb = utf16_wctomb;
if (_stricmp(name, "UTF-16") == 0 || _stricmp(name, "UTF16") == 0) if (_stricmp(name, "UTF-16") == 0 ||
_stricmp(name, "UTF16") == 0 ||
_stricmp(name, "UCS-2") == 0)
cv.flags |= UNICODE_FLAG_USE_BOM_ENDIAN; cv.flags |= UNICODE_FLAG_USE_BOM_ENDIAN;
} }
else if (cv.codepage == 12000 || cv.codepage == 12001) else if (cv.codepage == 12000 || cv.codepage == 12001)