From dd9dd76722fac5902b9237d836bb1b7bce9bcbae Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 15 May 2020 12:32:51 +0200
Subject: [PATCH] The isSingleByte parameter in the call to getCharacterTable()
 is deprecated and only present for backwards compatibility

---
 HISTORY       | 2 ++
 dvbsubtitle.c | 7 +++----
 libsi/si.h    | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/HISTORY b/HISTORY
index 22c2bd16..78a8bdab 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9441,3 +9441,5 @@ Video Disk Recorder Revision History
   the result of a sample call to iconv().
 - Setting the override character table now checks and reports whether the given value
   is valid (suggested by Helmut Binder).
+- The isSingleByte parameter in the call to getCharacterTable() is deprecated and only
+  present for backwards compatibility.
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index fff3f8b8..5e5139ff 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
  * Original author: Marco Schluessler <marco@lordzodiac.de>
  * With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
  *
- * $Id: dvbsubtitle.c 4.1 2015/03/25 12:37:08 kls Exp $
+ * $Id: dvbsubtitle.c 4.2 2020/05/15 12:32:51 kls Exp $
  */
 
 #include "dvbsubtitle.h"
@@ -479,11 +479,10 @@ void cSubtitleObject::DecodeCharacterString(const uchar *Data, int NumberOfCodes
      for (int i = 0; i < NumberOfCodes; i++)
          txt[i] = Data[i * 2 + 1];
      txt[NumberOfCodes] = 0;
-     bool singleByte;
      const uchar *from = (uchar *)txt;
      int len = NumberOfCodes;
-     const char *CharacterTable = SI::getCharacterTable(from, len, &singleByte);
-     dbgobjects(" table %s single %d raw '%s'", CharacterTable, singleByte, from);
+     const char *CharacterTable = SI::getCharacterTable(from, len);
+     dbgobjects(" table %s raw '%s'", CharacterTable, from);
      cCharSetConv conv(CharacterTable, cCharSetConv::SystemCharacterTable());
      const char *s = conv.Convert((const char *)from);
      dbgobjects(" conv '%s'", s);
diff --git a/libsi/si.h b/libsi/si.h
index aae43f01..02b9cd05 100644
--- a/libsi/si.h
+++ b/libsi/si.h
@@ -6,7 +6,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   $Id: si.h 4.2 2020/05/15 11:31:40 kls Exp $
+ *   $Id: si.h 4.3 2020/05/15 12:32:51 kls Exp $
  *                                                                         *
  ***************************************************************************/
 
@@ -538,6 +538,7 @@ bool SetSystemCharacterTable(const char *CharacterTable);
 // a string indicating that table. If no table can be determined, the
 // default ISO6937 is returned. If a table can be determined, the buffer
 // and length are adjusted accordingly.
+// The isSingleByte parameter is deprecated and only present for backwards compatibility.
 const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL);
 // Copies 'from' to 'to' and converts characters according to 'fromCode', if given.
 // Returns the length of the resulting string.