summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-05-08 08:27:24 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-05-08 08:27:24 +0200
commit4f7523a3a29297079aac404f4f5021dec6ddbe97 (patch)
tree96456b3a3676bc4f4ca81d29e62f71479960508b
parent353233a27e57c6f1b5ac13bac95b191a2b5f556b (diff)
downloadvdr-4f7523a3a29297079aac404f4f5021dec6ddbe97.tar.gz
vdr-4f7523a3a29297079aac404f4f5021dec6ddbe97.tar.bz2
Fixed character comparisons in cSubtitleObject::DecodeCharacterString()
-rw-r--r--CONTRIBUTORS4
-rw-r--r--HISTORY4
-rw-r--r--dvbsubtitle.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 19573528..324b37ab 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2873,3 +2873,7 @@ Ralf Schueler <dl4mw@schueler.ws>
Marcus Roscher <dad401@gmx.de>
for reporting a problem with cDevice::StillPicture(), which called the derived class's
function even if no buffer has been allocated
+
+Reinhard Mantey <geronimo013@gmx.de>
+ for reporting a problem with character comparisons in
+ cSubtitleObject::DecodeCharacterString()
diff --git a/HISTORY b/HISTORY
index b494fd05..6800e091 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7052,7 +7052,7 @@ Video Disk Recorder Revision History
- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
Schmirler).
-2012-05-06: Version 1.7.28
+2012-05-08: Version 1.7.28
- Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
- Fixed getting the maximum short channel name length in case there are no short names
@@ -7094,3 +7094,5 @@ Video Disk Recorder Revision History
- The new functions cControl::GetRecording() and cControl::GetHeader() can be used
to retrieve information about what the current player is playing.
- Fixed a possible high CPU load when pausing replay (thanks to Reinhard Nissl).
+- Fixed character comparisons in cSubtitleObject::DecodeCharacterString() (reported
+ by Reinhard Mantey).
diff --git a/dvbsubtitle.c b/dvbsubtitle.c
index ab755c4b..99550697 100644
--- a/dvbsubtitle.c
+++ b/dvbsubtitle.c
@@ -7,7 +7,7 @@
* Original author: Marco Schluessler <marco@lordzodiac.de>
* With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi>
*
- * $Id: dvbsubtitle.c 2.31 2012/03/16 11:56:56 kls Exp $
+ * $Id: dvbsubtitle.c 2.32 2012/05/08 08:17:17 kls Exp $
*/
@@ -217,7 +217,7 @@ void cSubtitleObject::DecodeCharacterString(const uchar *Data, int NumberOfCodes
char txt[NumberOfCodes + 1];
char *p = txt;
for (int i = 2; i < NumberOfCodes; ++i) {
- char c = Data[i * 2 + 1] & 0xFF;
+ uchar c = Data[i * 2 + 1] & 0xFF;
if (c == 0)
break;
if (' ' <= c && c <= '~' || c == '\n' || 0xA0 <= c)