ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apply patch #827 : Fix "non-constant-expression cannot be narrowed from type" compile error

This commit is contained in:
zeromus 2018-05-31 12:52:38 -04:00
parent c5bb44a37f
commit 4245280271
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/xstring.cpp
View File

@ -231,8 +231,8 @@ std::string BytesToString(const void* data, int len)
{ {
Base64Table[ input[0] >> 2 ], Base64Table[ input[0] >> 2 ],
Base64Table[ ((input[0] & 0x03) << 4) | (input[1] >> 4) ], Base64Table[ ((input[0] & 0x03) << 4) | (input[1] >> 4) ],
n<2 ? '=' : Base64Table[ ((input[1] & 0x0F) << 2) | (input[2] >> 6) ], static_cast<unsigned char> (n<2 ? '=' : Base64Table[ ((input[1] & 0x0F) << 2) | (input[2] >> 6) ]),
n<3 ? '=' : Base64Table[ input[2] & 0x3F ] static_cast<unsigned char> (n<3 ? '=' : Base64Table[ input[2] & 0x3F ])
}; };
ret.append(output, output+4); ret.append(output, output+4);
} }
@ -296,9 +296,9 @@ bool StringToBytes(const std::string& str, void* data, int len)
} }
unsigned char outpacket[3] = unsigned char outpacket[3] =
{ {
(converted[0] << 2) | (converted[1] >> 4), static_cast<unsigned char>((converted[0] << 2) | (converted[1] >> 4)),
(converted[1] << 4) | (converted[2] >> 2), static_cast<unsigned char>((converted[1] << 4) | (converted[2] >> 2)),
(converted[2] << 6) | (converted[3]) static_cast<unsigned char>((converted[2] << 6) | (converted[3]))
}; };
int outlen = (input[2] == '=') ? 1 : (input[3] == '=' ? 2 : 3); int outlen = (input[2] == '=') ? 1 : (input[3] == '=' ? 2 : 3);
if(outlen > len) outlen = len; if(outlen > len) outlen = len;