rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #121 from cuviper/barrier-fromUTF8 

Fix data indexes in Unicode::fromUTF8
This commit is contained in:
walker0643 2018-09-08 19:05:13 -04:00 committed by GitHub
parent e65ea3c545 7a0bc3abb7
commit f203a7f49e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/base/Unicode.cpp
View File

@ -628,25 +628,25 @@ Unicode::fromUTF8(const UInt8*& data, UInt32& n)
case 4: case 4:
c = ((static_cast<UInt32>(data[0]) & 0x07) << 18) | c = ((static_cast<UInt32>(data[0]) & 0x07) << 18) |
((static_cast<UInt32>(data[1]) & 0x3f) << 12) | ((static_cast<UInt32>(data[1]) & 0x3f) << 12) |
((static_cast<UInt32>(data[1]) & 0x3f) << 6) | ((static_cast<UInt32>(data[2]) & 0x3f) << 6) |
((static_cast<UInt32>(data[1]) & 0x3f) ); ((static_cast<UInt32>(data[3]) & 0x3f) );
break; break;
case 5: case 5:
c = ((static_cast<UInt32>(data[0]) & 0x03) << 24) | c = ((static_cast<UInt32>(data[0]) & 0x03) << 24) |
((static_cast<UInt32>(data[1]) & 0x3f) << 18) | ((static_cast<UInt32>(data[1]) & 0x3f) << 18) |
((static_cast<UInt32>(data[1]) & 0x3f) << 12) | ((static_cast<UInt32>(data[2]) & 0x3f) << 12) |
((static_cast<UInt32>(data[1]) & 0x3f) << 6) | ((static_cast<UInt32>(data[3]) & 0x3f) << 6) |
((static_cast<UInt32>(data[1]) & 0x3f) ); ((static_cast<UInt32>(data[4]) & 0x3f) );
break; break;
case 6: case 6:
c = ((static_cast<UInt32>(data[0]) & 0x01) << 30) | c = ((static_cast<UInt32>(data[0]) & 0x01) << 30) |
((static_cast<UInt32>(data[1]) & 0x3f) << 24) | ((static_cast<UInt32>(data[1]) & 0x3f) << 24) |
((static_cast<UInt32>(data[1]) & 0x3f) << 18) | ((static_cast<UInt32>(data[2]) & 0x3f) << 18) |
((static_cast<UInt32>(data[1]) & 0x3f) << 12) | ((static_cast<UInt32>(data[3]) & 0x3f) << 12) |
((static_cast<UInt32>(data[1]) & 0x3f) << 6) | ((static_cast<UInt32>(data[4]) & 0x3f) << 6) |
((static_cast<UInt32>(data[1]) & 0x3f) ); ((static_cast<UInt32>(data[5]) & 0x3f) );
break; break;
default: default: