actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

utf-8 fixes

Browse Source
This commit is contained in:
Glenn Maynard
2004-05-18 03:15:13 +00:00
parent ae8f98a9de
commit a5fd0fc48e
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil.cpp
+3 -6
View File
@@ -780,7 +780,7 @@ bool utf8_to_wchar_ec( const CString &s, unsigned &start, wchar_t &ch )
const int first_byte_mask[] = { -1, 0x7F, 0x1F, 0x0F, 0x07, 0x03, 0x01 }; const int first_byte_mask[] = { -1, 0x7F, 0x1F, 0x0F, 0x07, 0x03, 0x01 };
ch = s[start] & first_byte_mask[len]; ch = wchar_t(s[start] & first_byte_mask[len]);
for( int i = 1; i < len; ++i ) for( int i = 1; i < len; ++i )
{ {
@@ -792,7 +792,7 @@ bool utf8_to_wchar_ec( const CString &s, unsigned &start, wchar_t &ch )
return false; return false;
} }
int byte = s[start+i]; char byte = s[start+i];
if( !is_utf8_continuation_byte(byte) ) if( !is_utf8_continuation_byte(byte) )
{ {
/* We expected a continuation byte, but didn't get one. Return error, and point /* We expected a continuation byte, but didn't get one. Return error, and point
@@ -930,10 +930,7 @@ void utf8_sanitize( CString &s )
{ {
wchar_t ch; wchar_t ch;
if( !utf8_to_wchar_ec( s, start, ch ) ) if( !utf8_to_wchar_ec( s, start, ch ) )
{ ch = INVALID_CHAR;
ret += INVALID_CHAR;
continue;
}
wchar_to_utf8( ch, ret ); wchar_to_utf8( ch, ret );
} }