X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/3d97c574dfd44ddad287578b19ee8baaecbefd30..e366c245644f158ea862b85deb78b731dc8f008a:/lib/base/estring.cpp

diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp
index 18b277ab..77746299 100644
--- a/lib/base/estring.cpp
+++ b/lib/base/estring.cpp
@@ -334,9 +334,9 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
 
 	switch(data[0])
 	{
-		case 1 ... 12:
+		case 1 ... 11:
 			table=data[i++]+4;
-//			eDebug("(1..12)text encoded in ISO-8859-%d",table);
+//			eDebug("(1..11)text encoded in ISO-8859-%d",table);
 			break;
 		case 0x10:
 		{
@@ -348,6 +348,7 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
 			{
 				case 12:
 					eDebug("unsup. ISO8859-12 enc.", n);
+					break;
 				default:
 					table=n;
 					break;
@@ -370,9 +371,11 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
 			++i;
 			eDebug("unsup. Big5 subset of ISO/IEC 10646-1 enc.");
 			break;
+		case 0x15: // UTF-8 encoding of ISO/IEC 10646-1
+			return std::string((char*)data+1, len-1);
 		case 0x0:
-		case 0xD ... 0xF:
-		case 0x15 ... 0x1F:
+		case 0xC ... 0xF:
+		case 0x16 ... 0x1F:
 			eDebug("reserved %d", data[0]);
 			++i;
 			break;
@@ -522,7 +525,7 @@ std::string convertLatin1UTF8(const std::string &string)
 
 	while (i < len)
 	{
-		unsigned long code=string[i++];
+		unsigned long code=(unsigned char)string[i++];
 				// Unicode->UTF8 encoding
 		if (code < 0x80) // identity latin <-> utf8 mapping
 			res[t++]=char(code);