King_DuckZ/utfcpp
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix for the bug [ID: 2906315]: < instead != in utf8to32

Browse source 
git-svn-id: http://svn.code.sf.net/p/utfcpp/code@107 a809a056-fc17-0410-9590-b4f493f8b08e
This commit is contained in:
ntrifunovic 2009-12-07 01:34:23 +00:00 • committed by King_DuckZ
parent 4878ddc7e5
commit 7c41f51d56
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/utf8/checked.h
View file

@ -249,7 +249,7 @@ namespace utf8
template <typename octet_iterator, typename u32bit_iterator> template <typename octet_iterator, typename u32bit_iterator>
u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result) u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
{ {
while (start < end) while (start != end)
(*result++) = next(start, end); (*result++) = next(start, end);
return result; return result;

2
source/utf8/unchecked.h
View file

@ -144,7 +144,7 @@ namespace utf8
template <typename u16bit_iterator, typename octet_iterator> template <typename u16bit_iterator, typename octet_iterator>
u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result) u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
{ {
while (start != end) { while (start < end) {
uint32_t cp = next(start); uint32_t cp = next(start);
if (cp > 0xffff) { //make a surrogate pair if (cp > 0xffff) { //make a surrogate pair
*result++ = static_cast<uint16_t>((cp >> 10) + internal::LEAD_OFFSET); *result++ = static_cast<uint16_t>((cp >> 10) + internal::LEAD_OFFSET);