generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-24 17:30:44 +02:00
Code Issues Projects Releases Wiki Activity

fixed GH# 254

Browse Source
This commit is contained in:
Guenter Obiltschnig
2013-09-14 10:35:46 +02:00
parent cdbebdf487
commit cff19367b3
1 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Foundation/src/UTF8String.cpp
View File

@@ -1,7 +1,7 @@
// //
// UTF8String.cpp // UTF8String.cpp
// //
// $Id: //poco/1.4/Foundation/src/UTF8String.cpp#1 $ // $Id: //poco/1.4/Foundation/src/UTF8String.cpp#2 $
// //
// Library: Foundation // Library: Foundation
// Package: Text // Package: Text
@@ -62,19 +62,19 @@ int UTF8::icompare(const std::string& str, std::string::size_type pos, std::stri
TextIterator uend2(end2); TextIterator uend2(end2);
while (uit1 != uend1 && uit2 != uend2) while (uit1 != uend1 && uit2 != uend2)
{ {
int c1 = Unicode::toLower(*uit1); int c1 = Unicode::toLower(*uit1);
int c2 = Unicode::toLower(*uit2); int c2 = Unicode::toLower(*uit2);
if (c1 < c2) if (c1 < c2)
return -1; return -1;
else if (c1 > c2) else if (c1 > c2)
return 1; return 1;
++uit1; ++uit2; ++uit1; ++uit2;
} }
if (uit1 == uend1) if (uit1 == uend1)
return uit2 == uend2 ? 0 : -1; return uit2 == uend2 ? 0 : -1;
else else
return 1; return 1;
} }
@@ -125,26 +125,8 @@ int UTF8::icompare(const std::string& str1, std::string::size_type pos1, std::st
int UTF8::icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, const std::string::value_type* ptr) int UTF8::icompare(const std::string& str, std::string::size_type pos, std::string::size_type n, const std::string::value_type* ptr)
{ {
poco_check_ptr (ptr); poco_check_ptr (ptr);
std::string::size_type sz = str.size(); std::string str2(ptr); // TODO: optimize
if (pos > sz) pos = sz; return icompare(str, pos, n, str2.begin(), str2.end());
if (pos + n > sz) n = sz - pos;
TextIterator uit(str.begin() + pos, str.begin() + pos + n, utf8);
TextIterator uend(str.begin() + pos + n);
while (uit != uend && *ptr)
{
int c1 = Unicode::toLower(*uit);
int c2 = Unicode::toLower(*ptr);
if (c1 < c2)
return -1;
else if (c1 > c2)
return 1;
++uit; ++ptr;
}
if (uit == uend)
return *ptr == 0 ? 0 : -1;
else
return 1;
} }