From b7ac3cbe984d0ff249728587e60ebaa3e2b088c6 Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 14 Apr 2009 14:34:13 +0200 Subject: [PATCH] estring.cpp: use iso6397 when iso8859-5 is set in dvb texts and use two char byte encoding is enabled for this transponder --- lib/base/estring.cpp | 8 +++++--- 1 file 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) -- 2.30.2