Amebis/cld2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MSVC "value may be truncated" warnings. (by pkasting@)

Browse Source 
git-svn-id: https://cld2.googlecode.com/svn/trunk@168 b252ecd4-b096-bf77-eb8e-91563289f87e
This commit is contained in:
hajimehoshi@google.com
2014-09-17 07:11:37 +00:00
parent bb5c092e8c
commit c9f9d40322
5 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/getonescriptspan.cc
View File

@@ -253,13 +253,13 @@ int runetochar(char *str, const char32 *rune) {
// 1 char 00-7F
c = *rune;
if(c <= 0x7F) {
str[0] = c;
str[0] = static_cast<char>(c);
return 1;
}
// 2 char 0080-07FF
if(c <= 0x07FF) {
str[0] = 0xC0 | (c >> 1*6);
str[0] = 0xC0 | static_cast<char>(c >> 1*6);
str[1] = 0x80 | (c & 0x3F);
return 2;
}
@@ -271,14 +271,14 @@ int runetochar(char *str, const char32 *rune) {
// 3 char 0800-FFFF
if (c <= 0xFFFF) {
str[0] = 0xE0 | (c >> 2*6);
str[0] = 0xE0 | static_cast<char>(c >> 2*6);
str[1] = 0x80 | ((c >> 1*6) & 0x3F);
str[2] = 0x80 | (c & 0x3F);
str[2] = 0x80 | (c & 0x3F);
return 3;
}
// 4 char 10000-1FFFFF
str[0] = 0xF0 | (c >> 3*6);
str[0] = 0xF0 | static_cast<char>(c >> 3*6);
str[1] = 0x80 | ((c >> 2*6) & 0x3F);
str[2] = 0x80 | ((c >> 1*6) & 0x3F);
str[3] = 0x80 | (c & 0x3F);