aboutsummaryrefslogtreecommitdiff
path: root/lib/base
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-04-14 14:34:13 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-04-14 14:34:13 +0200
commitb7ac3cbe984d0ff249728587e60ebaa3e2b088c6 (patch)
tree284789284f81a59ae64b4211d9b99d3c92b26917 /lib/base
parent126e93d0f58bf3cadfe628549c4cdb7c0cd0167e (diff)
downloadenigma2-b7ac3cbe984d0ff249728587e60ebaa3e2b088c6.tar.gz
enigma2-b7ac3cbe984d0ff249728587e60ebaa3e2b088c6.zip
estring.cpp: use iso6397 when iso8859-5 is set in dvb texts and use two char byte encoding is enabled for this transponder
Diffstat (limited to 'lib/base')
-rw-r--r--lib/base/estring.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/base/estring.cpp b/lib/base/estring.cpp
index c5076a80..85bbcc69 100644
--- a/lib/base/estring.cpp
+++ b/lib/base/estring.cpp
@@ -383,9 +383,9 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
break;
case 0x10:
{
-// eDebug("(0x10)text encoded in ISO-8859-%d",n);
int n=(data[++i]<<8);
n |= (data[++i]);
+// eDebug("(0x10)text encoded in ISO-8859-%d",n);
++i;
switch(n)
{
@@ -427,8 +427,10 @@ std::string convertDVBUTF8(const unsigned char *data, int len, int table, int ts
bool useTwoCharMapping =
tsidonid && encodingHandler.getTransponderUseTwoCharMapping(tsidonid);
- if (useTwoCharMapping)
- table = 64;
+ if (useTwoCharMapping) {
+ if (table == 5)
+ table = 64;
+ }
unsigned char res[2048];
while (i < len)