mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 12:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #415 from Oberon00/utf-stl-copy

Browse Source 
Replaced explicit assignment loops with std::copy in sf::Utf functions.
This commit is contained in:
Laurent Gomila 2013-06-23 22:53:35 -07:00
commit 41cbb818ad
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/SFML/System/Utf.inl
View File

@ -104,7 +104,7 @@ Out Utf<8>::encode(Uint32 input, Out output, Uint8 replacement)
// Valid character // Valid character
// Get the number of bytes to write // Get the number of bytes to write
int bytestoWrite = 1; std::size_t bytestoWrite = 1;
if (input < 0x80) bytestoWrite = 1; if (input < 0x80) bytestoWrite = 1;
else if (input < 0x800) bytestoWrite = 2; else if (input < 0x800) bytestoWrite = 2;
else if (input < 0x10000) bytestoWrite = 3; else if (input < 0x10000) bytestoWrite = 3;
@ -121,14 +121,7 @@ Out Utf<8>::encode(Uint32 input, Out output, Uint8 replacement)
} }
// Add them to the output // Add them to the output
const Uint8* currentByte = bytes; output = std::copy(bytes, bytes + bytestoWrite, output);
switch (bytestoWrite)
{
case 4 : *output++ = *currentByte++;
case 3 : *output++ = *currentByte++;
case 2 : *output++ = *currentByte++;
case 1 : *output++ = *currentByte++;
}
} }
return output; return output;
@ -251,10 +244,7 @@ Out Utf<8>::toLatin1(In begin, In end, Out output, char replacement)
template <typename In, typename Out> template <typename In, typename Out>
Out Utf<8>::toUtf8(In begin, In end, Out output) Out Utf<8>::toUtf8(In begin, In end, Out output)
{ {
while (begin < end) return std::copy(begin, end, output);
*output++ = *begin++;
return output;
} }
@ -423,10 +413,7 @@ Out Utf<16>::fromLatin1(In begin, In end, Out output)
{ {
// Latin-1 is directly compatible with Unicode encodings, // Latin-1 is directly compatible with Unicode encodings,
// and can thus be treated as (a sub-range of) UTF-32 // and can thus be treated as (a sub-range of) UTF-32
while (begin < end) return std::copy(begin, end, output);
*output++ = *begin++;
return output;
} }
@ -495,10 +482,7 @@ Out Utf<16>::toUtf8(In begin, In end, Out output)
template <typename In, typename Out> template <typename In, typename Out>
Out Utf<16>::toUtf16(In begin, In end, Out output) Out Utf<16>::toUtf16(In begin, In end, Out output)
{ {
while (begin < end) return std::copy(begin, end, output);
*output++ = *begin++;
return output;
} }
@ -579,10 +563,7 @@ Out Utf<32>::fromLatin1(In begin, In end, Out output)
{ {
// Latin-1 is directly compatible with Unicode encodings, // Latin-1 is directly compatible with Unicode encodings,
// and can thus be treated as (a sub-range of) UTF-32 // and can thus be treated as (a sub-range of) UTF-32
while (begin < end) return std::copy(begin, end, output);
*output++ = *begin++;
return output;
} }
@ -649,10 +630,7 @@ Out Utf<32>::toUtf16(In begin, In end, Out output)
template <typename In, typename Out> template <typename In, typename Out>
Out Utf<32>::toUtf32(In begin, In end, Out output) Out Utf<32>::toUtf32(In begin, In end, Out output)
{ {
while (begin < end) return std::copy(begin, end, output);
*output++ = *begin++;
return output;
} }