frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

The isSingleByte parameter in the call to getCharacterTable() is deprecated and only present for backwards compatibility

This commit is contained in:
Klaus Schmidinger 2020-05-15 12:32:51 +02:00
parent aae02a43da
commit dd9dd76722
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@ -9441,3 +9441,5 @@ Video Disk Recorder Revision History
the result of a sample call to iconv(). the result of a sample call to iconv().
- Setting the override character table now checks and reports whether the given value - Setting the override character table now checks and reports whether the given value
is valid (suggested by Helmut Binder). is valid (suggested by Helmut Binder).
- The isSingleByte parameter in the call to getCharacterTable() is deprecated and only
present for backwards compatibility.

7
dvbsubtitle.c
View File

@ -7,7 +7,7 @@
* Original author: Marco Schluessler <marco@lordzodiac.de> * Original author: Marco Schluessler <marco@lordzodiac.de>
* With some input from the "subtitles plugin" by Pekka Virtanen <pekka.virtanen@sci.fi> * 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" #include "dvbsubtitle.h"
@ -479,11 +479,10 @@ void cSubtitleObject::DecodeCharacterString(const uchar *Data, int NumberOfCodes
for (int i = 0; i < NumberOfCodes; i++) for (int i = 0; i < NumberOfCodes; i++)
txt[i] = Data[i * 2 + 1]; txt[i] = Data[i * 2 + 1];
txt[NumberOfCodes] = 0; txt[NumberOfCodes] = 0;
bool singleByte;
const uchar *from = (uchar *)txt; const uchar *from = (uchar *)txt;
int len = NumberOfCodes; int len = NumberOfCodes;
const char *CharacterTable = SI::getCharacterTable(from, len, &singleByte); const char *CharacterTable = SI::getCharacterTable(from, len);
dbgobjects(" table %s single %d raw '%s'", CharacterTable, singleByte, from); dbgobjects(" table %s raw '%s'", CharacterTable, from);
cCharSetConv conv(CharacterTable, cCharSetConv::SystemCharacterTable()); cCharSetConv conv(CharacterTable, cCharSetConv::SystemCharacterTable());
const char *s = conv.Convert((const char *)from); const char *s = conv.Convert((const char *)from);
dbgobjects(" conv '%s'", s); dbgobjects(" conv '%s'", s);

3
libsi/si.h
View File

@ -6,7 +6,7 @@
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (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 // a string indicating that table. If no table can be determined, the
// default ISO6937 is returned. If a table can be determined, the buffer // default ISO6937 is returned. If a table can be determined, the buffer
// and length are adjusted accordingly. // 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); const char *getCharacterTable(const unsigned char *&buffer, int &length, bool *isSingleByte = NULL);
// Copies 'from' to 'to' and converts characters according to 'fromCode', if given. // Copies 'from' to 'to' and converts characters according to 'fromCode', if given.
// Returns the length of the resulting string. // Returns the length of the resulting string.