Fix new line in utf8 conversion

This commit is contained in:
Eduardo Bart 2013-02-26 18:31:09 -03:00
parent 406c7bdae6
commit ef20f59a98
1 changed files with 2 additions and 2 deletions

View File

@ -144,7 +144,7 @@ std::string utf8_to_latin1(const std::string& src)
std::string out; std::string out;
for(uint i=0;i<src.length();) { for(uint i=0;i<src.length();) {
uchar c = src[i++]; uchar c = src[i++];
if(c >= 32 && c < 128) if((c >= 32 && c < 128) || c == 0x0d || c == 0x0a || c == 0x09)
out += c; out += c;
else if(c == 0xc2 || c == 0xc3) { else if(c == 0xc2 || c == 0xc3) {
uchar c2 = src[i++]; uchar c2 = src[i++];
@ -167,7 +167,7 @@ std::string latin1_to_utf8(const std::string& src)
{ {
std::string out; std::string out;
for(uchar c : src) { for(uchar c : src) {
if(c >= 32 && c < 128) if((c >= 32 && c < 128) || c == 0x0d || c == 0x0a || c == 0x09)
out += c; out += c;
else { else {
out += 0xc2 + (c > 0xbf); out += 0xc2 + (c > 0xbf);