diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-22 05:06:49 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-22 05:06:49 +0000 |
| commit | b1613071e3098ebd29fb329f36b6575dd1bdf8c5 (patch) | |
| tree | 3014835e7762034ccfd2f08057262f8cf515720e /webkit | |
| parent | e1333fb588b0a520a1e9a10c9545503cef6f7717 (diff) | |
| download | chromium_src-b1613071e3098ebd29fb329f36b6575dd1bdf8c5.zip chromium_src-b1613071e3098ebd29fb329f36b6575dd1bdf8c5.tar.gz chromium_src-b1613071e3098ebd29fb329f36b6575dd1bdf8c5.tar.bz2 | |
Fix the windows build by casting for ICU.
TEST=none
BUG=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/pepper_char_set.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/glue/plugins/pepper_char_set.cc b/webkit/glue/plugins/pepper_char_set.cc index f2cedb3..c23c34b 100644 --- a/webkit/glue/plugins/pepper_char_set.cc +++ b/webkit/glue/plugins/pepper_char_set.cc @@ -97,7 +97,8 @@ char* UTF16ToCharSet(const uint16_t* utf16, uint32_t utf16_len, // ucnv_fromUChars returns size not including terminating null. char* encoded = static_cast<char*>(malloc(encoded_max_length + 1)); int actual_size = ucnv_fromUChars(converter, encoded, - encoded_max_length, utf16, utf16_len, &status); + encoded_max_length, reinterpret_cast<const UChar*>(utf16), utf16_len, + &status); ucnv_close(converter); if (!U_SUCCESS(status)) { free(encoded); |