walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

bump simplecpp (fixed unicode problem)

This commit is contained in:
Daniel Marjamäki 2016-08-06 15:50:40 +02:00
parent 0ae163db69
commit 3e509fb561
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
externals/simplecpp/simplecpp.cpp vendored
View File

@ -266,17 +266,16 @@ static unsigned char peekChar(std::istream &istr, unsigned int bom) {
// For UTF-16 encoded files the BOM is 0xfeff/0xfffe. If the // For UTF-16 encoded files the BOM is 0xfeff/0xfffe. If the
// character is non-ASCII character then replace it with 0xff // character is non-ASCII character then replace it with 0xff
if (bom == 0xfeff || bom == 0xfffe) { if (bom == 0xfeff || bom == 0xfffe) {
(void)istr.get();
const unsigned char ch2 = (unsigned char)istr.peek(); const unsigned char ch2 = (unsigned char)istr.peek();
istr.unget();
const int ch16 = (bom == 0xfeff) ? (ch<<8 | ch2) : (ch2<<8 | ch); const int ch16 = (bom == 0xfeff) ? (ch<<8 | ch2) : (ch2<<8 | ch);
ch = (unsigned char)((ch16 >= 0x80) ? 0xff : ch16); ch = (unsigned char)((ch16 >= 0x80) ? 0xff : ch16);
} }
// Handling of newlines.. // Handling of newlines..
if (ch == '\r') { if (ch == '\r')
ch = '\n'; ch = '\n';
if (bom != 0)
(void)istr.peek();
}
return ch; return ch;
} }